FreeZbe
|
7e12c97317
|
French : update / fix stringtable
|
2015-05-01 23:09:09 +02:00 |
|
FreeZbe
|
d1da3a82d7
|
French : update / fix stringtable
|
2015-05-01 23:08:36 +02:00 |
|
Felix Wiegand
|
58a67a2f77
|
Merge pull request #962 from gienkov/patch-10
PL translation
|
2015-05-01 22:51:36 +02:00 |
|
KoffeinFlummi
|
cc627b4a92
|
Merge branch 'master' of https://github.com/acemod/ACE3
|
2015-05-01 22:50:11 +02:00 |
|
Dimaslg
|
339cd8febd
|
Add spanish translation for removing tournis
|
2015-05-01 22:49:52 +02:00 |
|
Glowbal
|
937b20f551
|
Merge branch 'master' of github.com:acemod/ACE3
|
2015-05-01 22:49:24 +02:00 |
|
Glowbal
|
09a0158fa4
|
This should not be 1
|
2015-05-01 22:49:13 +02:00 |
|
Grzegorz
|
3b321c7bf2
|
PL translation
laser
|
2015-05-01 22:46:51 +02:00 |
|
KoffeinFlummi
|
a002c796da
|
Merge branch 'patch-9' of https://github.com/gienkov/ACE3 into polish-merge
Conflicts:
addons/medical/stringtable.xml
|
2015-05-01 22:46:49 +02:00 |
|
KoffeinFlummi
|
d8299332e4
|
Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
addons/respawn/stringtable.xml
|
2015-05-01 22:44:42 +02:00 |
|
KoffeinFlummi
|
fb807cbb86
|
Merge branch 'master' into spanish-merge
Conflicts:
addons/interact_menu/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-01 22:44:10 +02:00 |
|
Dimaslg
|
6f2caec6ec
|
Last touches to Spanish translation
|
2015-05-01 22:42:09 +02:00 |
|
bux578
|
1a946acc30
|
German Translation / Typo
|
2015-05-01 22:33:26 +02:00 |
|
Grzegorz
|
8828704e76
|
PL translation
STR_ACE_Medical_RemovingTourniquet
|
2015-05-01 22:32:53 +02:00 |
|
Glowbal
|
0a300f3385
|
Merge pull request #960 from acemod/medicalMissingProgressText
Added missing progress bar display text
|
2015-05-01 22:31:41 +02:00 |
|
Glowbal
|
e8ccddfc2c
|
Added missing progress bar display text
|
2015-05-01 22:29:52 +02:00 |
|
adam3adam
|
f5303d455c
|
Translation of some stuff into czech language
adv. ballistics, atragmx, interaction menu, kestrel4500, laser pointer
and little part of medical
|
2015-05-01 22:23:03 +02:00 |
|
PabstMirror
|
bded34fa23
|
I suck at git
redo reverted stuff here
|
2015-05-01 15:03:05 -05:00 |
|
licht-im-Norden87
|
5e8096f29c
|
Update Stringtable: missileguidance
|
2015-05-01 21:29:49 +02:00 |
|
PabstMirror
|
e67e15c3fa
|
Merge branch 'master' into medicalFixVehAnimation
Conflicts:
addons/common/functions/fnc_getDeathAnim.sqf
addons/common/functions/fnc_loadPersonLocal.sqf
|
2015-05-01 14:29:21 -05:00 |
|
licht-im-Norden87
|
d12c7ff048
|
Update Stringtable: Rallypoint
Angleichung
|
2015-05-01 21:25:39 +02:00 |
|
KoffeinFlummi
|
c9ff497c83
|
Merge branch 'master' into polish-merge
Conflicts:
addons/respawn/stringtable.xml
|
2015-05-01 21:13:36 +02:00 |
|
Felix Wiegand
|
90275b272e
|
Merge pull request #950 from Tachii/patch-19
Added few missing ru strings
|
2015-05-01 21:11:37 +02:00 |
|
Felix Wiegand
|
b0094ff8e6
|
Merge pull request #949 from Tachii/patch-18
added 1 RU string
|
2015-05-01 21:11:17 +02:00 |
|
Felix Wiegand
|
3d45a26334
|
Merge pull request #957 from evromalarkey/master
Few Czech strings
|
2015-05-01 21:07:27 +02:00 |
|
jaynus
|
2bd0acb621
|
Revert "GetDeathAnim"
This reverts commit 0f736ae684.
|
2015-05-01 12:00:38 -07:00 |
|
jaynus
|
6603806c77
|
Revert "Save and replay valid awake animations"
This reverts commit 8d1ac26e24.
|
2015-05-01 12:00:21 -07:00 |
|
jaynus
|
c1ba4966f9
|
Test confirm no bouncy.
|
2015-05-01 11:53:55 -07:00 |
|
Lubomír Blažek
|
dcb3196e58
|
Czech strings
|
2015-05-01 20:52:41 +02:00 |
|
jaynus
|
5bf763a08e
|
quote, not var.
|
2015-05-01 11:47:49 -07:00 |
|
Tachii
|
bed298d5b3
|
Update stringtable.xml
|
2015-05-01 21:38:05 +03:00 |
|
jaynus
|
2ed05ed469
|
Merge remote-tracking branch 'origin/master' into laserCodeSelection
|
2015-05-01 11:35:11 -07:00 |
|
jaynus
|
dcf4f3b53e
|
Resolved. Conflicts:
addons/missileguidance/functions/fnc_onFired.sqf
|
2015-05-01 11:35:03 -07:00 |
|
jaynus
|
dfbfb4ace2
|
Laser code selection, hotkeys and locking. Turrets & designator, and gunner. Closes #751
|
2015-05-01 11:31:37 -07:00 |
|
Glowbal
|
e1d0ac4b9e
|
Added author
|
2015-05-01 20:16:34 +02:00 |
|
PabstMirror
|
d8a6dd1bbd
|
Stuff
|
2015-05-01 12:58:56 -05:00 |
|
Tachii
|
66eda924ac
|
Update stringtable.xml
|
2015-05-01 20:48:37 +03:00 |
|
Glowbal
|
722c459c1e
|
added APL pbo
|
2015-05-01 19:37:17 +02:00 |
|
Grzegorz
|
7e87c3a250
|
Update stringtable.xml
|
2015-05-01 19:32:59 +02:00 |
|
Grzegorz
|
e36fbe9da7
|
Update stringtable.xml
|
2015-05-01 19:32:43 +02:00 |
|
Grzegorz Sikora
|
4668869959
|
PL translation
|
2015-05-01 19:30:30 +02:00 |
|
Tachii
|
b1a23fd3c7
|
Update stringtable.xml
|
2015-05-01 20:29:57 +03:00 |
|
Tachii
|
43dea56ae6
|
Update stringtable.xml
|
2015-05-01 20:29:00 +03:00 |
|
Tachii
|
66818e0a74
|
Update stringtable.xml
|
2015-05-01 20:26:05 +03:00 |
|
Tachii
|
889275091e
|
Update stringtable.xml
|
2015-05-01 20:24:13 +03:00 |
|
Tachii
|
1771b61578
|
added 2 missing ru strings
|
2015-05-01 20:23:05 +03:00 |
|
Tachii
|
43655d0cec
|
Update stringtable.xml
|
2015-05-01 20:18:51 +03:00 |
|
Tachii
|
caf301ac99
|
Update stringtable.xml
Added 1 RU string
|
2015-05-01 20:15:35 +03:00 |
|
PabstMirror
|
8d1ac26e24
|
Save and replay valid awake animations
|
2015-05-01 12:12:13 -05:00 |
|
ulteq
|
ff2d7fdb72
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fcsInitSpeedFix
Conflicts:
addons/fcs/functions/fnc_firedEH.sqf
|
2015-05-01 19:00:27 +02:00 |
|
ulteq
|
aa21962f8b
|
Allowed positive weapon initSpeed values
|
2015-05-01 18:55:44 +02:00 |
|
Glowbal
|
80162627ec
|
Fixed spelling of enableUnconsciousnessAI
|
2015-05-01 18:49:59 +02:00 |
|
Felix Wiegand
|
23bb96e514
|
Merge pull request #948 from ruPaladin/patch-7
Russian translation (interact_menu)
|
2015-05-01 18:39:34 +02:00 |
|
ruPaladin
|
2aa788bba2
|
Update stringtable.xml
|
2015-05-01 19:26:23 +03:00 |
|
ruPaladin
|
a883517a5e
|
Update stringtable.xml
|
2015-05-01 19:18:06 +03:00 |
|
KoffeinFlummi
|
30e90a377e
|
Fix duplicate entries
|
2015-05-01 17:51:31 +02:00 |
|
KoffeinFlummi
|
48e59f0d71
|
Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:46:58 +02:00 |
|
KoffeinFlummi
|
1e786d4a92
|
Merge https://github.com/FreeZbe/ACE3 into french-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:45:00 +02:00 |
|
ulteq
|
a42dec6760
|
Added more missing privates
|
2015-05-01 17:40:30 +02:00 |
|
ulteq
|
5dcb45bd33
|
Finds the corresponding weapon class for each magazine type.
|
2015-05-01 17:39:38 +02:00 |
|
KoffeinFlummi
|
e46eba673f
|
Merge branch 'master' into german-translation
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:36:40 +02:00 |
|
KoffeinFlummi
|
954e4ef549
|
Merge branch 'master' of https://github.com/acemod/ACE3
Conflicts:
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
|
2015-05-01 17:32:19 +02:00 |
|
KoffeinFlummi
|
e96f23c197
|
Merge branch 'en-to-hu' of https://github.com/Harakhti/ACE3 into hungarian-merge
Conflicts:
addons/atragmx/stringtable.xml
addons/interact_menu/stringtable.xml
addons/laserpointer/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
addons/realisticnames/stringtable.xml
addons/respawn/stringtable.xml
|
2015-05-01 17:30:59 +02:00 |
|
ulteq
|
6dc28f026f
|
Added missing private
|
2015-05-01 17:15:49 +02:00 |
|
Felix Wiegand
|
526b0a2d59
|
Merge pull request #931 from gienkov/master
PL translation
|
2015-05-01 17:15:22 +02:00 |
|
KoffeinFlummi
|
5f60321a69
|
Merge https://github.com/Legolasindar/ACE3 into spanish-merge
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/medical/stringtable.xml
addons/mk6mortar/stringtable.xml
|
2015-05-01 17:12:00 +02:00 |
|
KoffeinFlummi
|
761e23001f
|
Merge https://github.com/Dimaslg/ACE3 into spanish-merge
Conflicts:
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/optionsmenu/stringtable.xml
|
2015-05-01 16:51:20 +02:00 |
|
ulteq
|
800ccc07f3
|
Removed duplicate code
|
2015-05-01 16:24:16 +02:00 |
|
Nicolás Badano
|
65dcbce25e
|
Merge pull request #945 from acemod/revert-937-fcsMuzzleVelocityCorrection
Revert "Takes negative initSpeed values into account"
|
2015-05-01 11:07:57 -03:00 |
|
ulteq
|
3ad668605a
|
Fix for last fcs change
|
2015-05-01 16:02:34 +02:00 |
|
jaynus
|
e4567fb59f
|
Merge remote-tracking branch 'origin/master' into guidanceClassFixes
Conflicts:
addons/javelin/functions/fnc_onOpticDraw.sqf
|
2015-05-01 06:59:28 -07:00 |
|
jaynus
|
9997b6d464
|
action is select 1
|
2015-05-01 06:57:49 -07:00 |
|
Nicolás Badano
|
cde80b2901
|
Revert "Takes negative initSpeed values into account"
|
2015-05-01 10:38:41 -03:00 |
|
commy2
|
b255d1040b
|
scope 1 for ACE_Comanche_Test, #943
|
2015-05-01 15:30:11 +02:00 |
|
FreeZbe
|
68d62b0005
|
Update stringtable.xml
|
2015-05-01 14:20:21 +02:00 |
|
FreeZbe
|
518614ec0b
|
Update stringtable.xml
|
2015-05-01 14:20:03 +02:00 |
|
FreeZbe
|
79ac41bd95
|
Update stringtable.xml
|
2015-05-01 14:19:43 +02:00 |
|
bux578
|
bfb68fe368
|
fix spelling errors
|
2015-05-01 14:19:30 +02:00 |
|
FreeZbe
|
80ae016021
|
Update stringtable.xml
|
2015-05-01 14:19:15 +02:00 |
|
FreeZbe
|
acf74dd2ae
|
Update stringtable.xml
|
2015-05-01 14:13:32 +02:00 |
|
FreeZbe
|
7a397459ae
|
Update stringtable.xml
|
2015-05-01 14:13:08 +02:00 |
|
FreeZbe
|
371aa381ec
|
Update stringtable.xml
|
2015-05-01 14:12:45 +02:00 |
|
FreeZbe
|
820c841b35
|
Update stringtable.xml
|
2015-05-01 14:12:10 +02:00 |
|
FreeZbe
|
53be70f661
|
French : update stringtable
|
2015-05-01 14:07:08 +02:00 |
|
ulteq
|
a6f4c68ef4
|
Removed obsolete comment
|
2015-05-01 13:50:01 +02:00 |
|
ulteq
|
6d0e2cc464
|
Merge pull request #936 from acemod/explosivesSleepReplacement
Replaced sleep with waitAndExecute
|
2015-05-01 12:55:14 +02:00 |
|
Glowbal
|
f0efba09e5
|
Merge pull request #814 from acemod/basic-med-options
Basic medical module options
|
2015-05-01 12:27:22 +02:00 |
|
ulteq
|
a9cde188ea
|
Merge pull request #937 from acemod/fcsMuzzleVelocityCorrection
Takes negative initSpeed values into account
|
2015-05-01 12:24:22 +02:00 |
|
bux578
|
2acc10ba70
|
meh
|
2015-05-01 12:19:42 +02:00 |
|
Glowbal
|
e9a86da8e0
|
Should be in same order as the module
|
2015-05-01 12:18:21 +02:00 |
|
bux578
|
aa2e5077e4
|
missing german translation
|
2015-05-01 12:17:28 +02:00 |
|
ulteq
|
4c0bed609e
|
Fixed a typo
|
2015-05-01 11:53:53 +02:00 |
|
Glowbal
|
5beca63ae2
|
Added missing private
|
2015-05-01 11:51:23 +02:00 |
|
ulteq
|
940f8e8349
|
Cleanup++:
*Removed spawn
*Added, moved and renamed some privates
|
2015-05-01 11:38:09 +02:00 |
|
commy2
|
a97c934688
|
fix ubc, fix #938
|
2015-05-01 11:01:07 +02:00 |
|
ulteq
|
d3b36c2b56
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3
|
2015-05-01 10:26:48 +02:00 |
|
ulteq
|
723ffc21d1
|
Removed unneeded TODO
|
2015-05-01 10:26:37 +02:00 |
|
ulteq
|
2219339e24
|
Fixed a typo
|
2015-05-01 10:25:59 +02:00 |
|
ulteq
|
965e45a53c
|
Takes negative initSpeed values into account
|
2015-05-01 10:25:33 +02:00 |
|
commy2
|
b859956604
|
rename category ace <blank> to ace common
|
2015-05-01 10:19:47 +02:00 |
|
PabstMirror
|
0f736ae684
|
GetDeathAnim
|
2015-05-01 03:13:26 -05:00 |
|
ulteq
|
e8264110bb
|
Replaced sleep with waitAndExecute
|
2015-05-01 10:12:41 +02:00 |
|
commy2
|
c52278c11f
|
Merge branch 'feature/laserpointer-3rdparty' of https://github.com/11thmeu/ACE3 into 11thmeu-feature/laserpointer-3rdparty
|
2015-05-01 09:52:03 +02:00 |
|
esteldunedain
|
a0923aa5c3
|
Tweak the position for rally point actions. Fix #837
|
2015-05-01 01:57:37 -03:00 |
|
esteldunedain
|
324b9510e3
|
Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.
|
2015-05-01 01:56:39 -03:00 |
|
esteldunedain
|
fc02bb4e06
|
Stylistic changes
|
2015-05-01 00:32:16 -03:00 |
|
esteldunedain
|
aa4a5539d4
|
Merge branch 'master' into interactMoreOptions
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
|
2015-05-01 00:04:22 -03:00 |
|
KoffeinFlummi
|
984a1fe337
|
Rename breakLine to break_line
|
2015-05-01 02:14:23 +02:00 |
|
KoffeinFlummi
|
e06e1a2f89
|
Make preventDeath work
|
2015-05-01 01:38:36 +02:00 |
|
KoffeinFlummi
|
cb82b20464
|
Let setUncon handle AI unconsciousness
|
2015-05-01 01:38:16 +02:00 |
|
KoffeinFlummi
|
48770f77d2
|
Rename caching variables in basic HD
|
2015-05-01 01:37:58 +02:00 |
|
KoffeinFlummi
|
67bd2b4e2f
|
Reduce animation forcing delay
|
2015-05-01 01:36:09 +02:00 |
|
KoffeinFlummi
|
98e44e86d8
|
Offload ejecting to unloadPerson
|
2015-05-01 01:35:50 +02:00 |
|
KoffeinFlummi
|
f7f416c8d3
|
Proper privates and alignment
|
2015-05-01 01:34:38 +02:00 |
|
KoffeinFlummi
|
aa9f1c53c7
|
Whoops
|
2015-05-01 01:34:18 +02:00 |
|
KoffeinFlummi
|
53835605ea
|
Merge remote-tracking branch 'origin/master' into basic-med-options
Conflicts:
addons/medical/functions/fnc_getBloodLoss.sqf
addons/medical/functions/fnc_handleDamage_basic.sqf
|
2015-05-01 01:25:16 +02:00 |
|
Kavinsky
|
f301491c7a
|
changed variable name to use QGVAR macro
|
2015-04-30 23:18:45 +02:00 |
|
Grzegorz
|
3f932c0a93
|
Update stringtable.xml
|
2015-04-30 22:55:51 +02:00 |
|
Grzegorz
|
1e0eaa1971
|
Update stringtable.xml
|
2015-04-30 22:55:43 +02:00 |
|
Grzegorz Sikora
|
03973f3dcf
|
PL translation
|
2015-04-30 22:54:15 +02:00 |
|
Glowbal
|
eb48048a58
|
Merge pull request #930 from acemod/keybindingCategories
Split keybindings into different sub-categories
|
2015-04-30 22:51:39 +02:00 |
|
commy2
|
2ae5538df5
|
change wrong strings
|
2015-04-30 22:46:08 +02:00 |
|
Glowbal
|
131468f0d8
|
plurals
|
2015-04-30 22:39:33 +02:00 |
|
PabstMirror
|
090062153c
|
Merge branch 'master' into interactMoreOptions
Conflicts:
addons/interact_menu/config.cpp
|
2015-04-30 15:36:00 -05:00 |
|
KoffeinFlummi
|
d59436c588
|
Only force animation when necessary
|
2015-04-30 22:19:31 +02:00 |
|
KoffeinFlummi
|
8fda984903
|
Fix missing semicolon
|
2015-04-30 22:17:25 +02:00 |
|
KoffeinFlummi
|
965a976daf
|
Reorganize AI unconsciousness
|
2015-04-30 22:16:45 +02:00 |
|
KoffeinFlummi
|
f28a806938
|
Remove max unconsciousness time again
|
2015-04-30 22:15:40 +02:00 |
|
Glowbal
|
7106093f1c
|
Merge pull request #929 from acemod/medical-lowercase
Convert Medical stringtable key names to lowercase
|
2015-04-30 22:10:54 +02:00 |
|
commy2
|
bc0d95765a
|
Merge pull request #849 from acemod/menuonclick
add option to only use action when clicking
|
2015-04-30 22:08:37 +02:00 |
|
KoffeinFlummi
|
270c3adc1e
|
Do it again, but properly this time
|
2015-04-30 22:06:10 +02:00 |
|
Glowbal
|
1ca0d66f30
|
Initial categories
|
2015-04-30 22:02:20 +02:00 |
|
KoffeinFlummi
|
85669a9e92
|
Convert Medical stringtable key names to lowercase
|
2015-04-30 22:01:09 +02:00 |
|
Glowbal
|
e7290feaa2
|
disabled radial option, so it isn't server selectable either
|
2015-04-30 21:20:04 +02:00 |
|
Glowbal
|
2f763a2310
|
Disabled client setting for menu style
|
2015-04-30 21:17:33 +02:00 |
|
Glowbal
|
1bee48214e
|
Merge branch 'master' into medicalMenuClientSetting
Conflicts:
addons/medical/ACE_Medical_Actions.hpp
addons/medical/CfgVehicles.hpp
addons/medical/stringtable.xml
|
2015-04-30 21:08:46 +02:00 |
|
PabstMirror
|
ba18f8b430
|
Handle Scaling
|
2015-04-30 14:07:19 -05:00 |
|
commy2
|
8c8e310d66
|
handle cursor mode
|
2015-04-30 21:00:30 +02:00 |
|
Glowbal
|
349d723fea
|
Merge pull request #928 from acemod/AdjustUnloadPerson
Adjust unload person
|
2015-04-30 20:55:17 +02:00 |
|
Glowbal
|
67370f3340
|
Handles waking up
|
2015-04-30 20:49:38 +02:00 |
|
Glowbal
|
8d358f3ab5
|
can only carry/drag units that are not in a vehicle
|
2015-04-30 20:44:59 +02:00 |
|
Glowbal
|
432a0102e8
|
Improved unloadPerson function
Removed caller parameter.
|
2015-04-30 20:44:43 +02:00 |
|
commy2
|
5ec8b6d36c
|
Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick
|
2015-04-30 20:01:58 +02:00 |
|
PabstMirror
|
a46d4e11ab
|
Remove linebreak from teamManagement, fix leaveteam
|
2015-04-30 12:38:19 -05:00 |
|
bux578
|
367da1f4bf
|
cleaned up insignias
|
2015-04-30 19:36:35 +02:00 |
|
PabstMirror
|
5ca75f9973
|
Action names Join->Assign
|
2015-04-30 12:20:01 -05:00 |
|
PabstMirror
|
ca57a4e168
|
Merge branch 'master' into group
Conflicts:
addons/interaction/CfgVehicles.hpp
addons/interaction/stringtable.xml
|
2015-04-30 11:59:53 -05:00 |
|
Kavinsky
|
b9c1936efc
|
changed laserpointer to allow 3rd party laser pointers. now there is a new config option for CfgWeapons called ace_laserpointer, number with value 0 no laser, 1 red laser, 2 green laser
|
2015-04-30 18:51:30 +02:00 |
|
KoffeinFlummi
|
fd152c580b
|
Merge branch 'master' into basic-med-options
Conflicts:
addons/medical/ACE_Settings.hpp
addons/medical/functions/fnc_setUnconscious.sqf
|
2015-04-30 18:39:33 +02:00 |
|
PabstMirror
|
9c02f915ec
|
Merge pull request #922 from acemod/medicalPrivates
Medical Private Variables
|
2015-04-30 11:34:33 -05:00 |
|
jaynus
|
21cc0db28f
|
Correctly look up configs.
|
2015-04-30 09:04:29 -07:00 |
|
jaynus
|
7568773ece
|
class localize and disable all guidance/locking.
|
2015-04-30 09:00:09 -07:00 |
|
bux578
|
0f135c5dab
|
fix ballistics stringtable
|
2015-04-30 15:23:52 +02:00 |
|
ulteq
|
ac33ad109f
|
Merge pull request #923 from Bla1337/master
Localization update (Russian)
|
2015-04-30 13:44:54 +02:00 |
|
Harakhti
|
4e165e2572
|
Update Hungarian translations
Let us match the current revision. At the time of making, the Ballistics
XML was broken.
|
2015-04-30 13:25:25 +02:00 |
|
ulteq
|
2c97b20781
|
Merge branch 'master' of https://github.com/NukeDev/ACE3 into NukeDev-master
Conflicts:
addons/atragmx/stringtable.xml
addons/ballistics/stringtable.xml
addons/medical/stringtable.xml
addons/missileguidance/stringtable.xml
addons/overheating/stringtable.xml
addons/realisticnames/stringtable.xml
addons/vehiclelock/stringtable.xml
|
2015-04-30 13:20:31 +02:00 |
|
Bla1337
|
5d1478b733
|
interact and medical system localization upd
|
2015-04-30 14:01:22 +03:00 |
|
ulteq
|
50a8a89b28
|
Added missing privates
|
2015-04-30 10:50:49 +02:00 |
|
ulteq
|
d2aa28715d
|
Merge pull request #874 from acemod/fragCleanup
Frag cleanup
|
2015-04-30 10:35:25 +02:00 |
|
ulteq
|
e77ddcf837
|
Added Sh_105mm_HEAT_MP frag config
|
2015-04-30 10:35:06 +02:00 |
|
ulteq
|
59017ed79d
|
Added more frag configs:
* R_Hydra_HE
* Sh_120mm_HE
* Sh_125mm_HE
* Missile_AGM_02_F
* M_Hellfire_AT
|
2015-04-30 10:26:00 +02:00 |
|
Glowbal
|
8f3d8707cc
|
Should be select
Should fix the new script error after last fix.
|
2015-04-30 08:53:43 +02:00 |
|
PabstMirror
|
48f7455ef1
|
Opps2
|
2015-04-30 01:23:23 -05:00 |
|
PabstMirror
|
d71bba0359
|
opps
|
2015-04-30 01:21:41 -05:00 |
|
PabstMirror
|
eb5af0cd89
|
Medical Private Variables
|
2015-04-30 01:17:26 -05:00 |
|
PabstMirror
|
11aafe013b
|
Localization
|
2015-04-29 23:53:00 -05:00 |
|
PabstMirror
|
9aa2e3130a
|
Options for Shadow/Outline and Text Size
|
2015-04-29 23:37:52 -05:00 |
|
PabstMirror
|
e40a2a524d
|
Merge branch 'master' into interactMoreOptions
|
2015-04-29 22:57:35 -05:00 |
|
commy2
|
8e54e6ec13
|
fix setFWS locality issues, fix #892
|
2015-04-30 00:53:49 +02:00 |
|
PabstMirror
|
f90834eeab
|
Unused
|
2015-04-29 16:57:24 -05:00 |
|
PabstMirror
|
5fef446c00
|
EFUNC for dragging calls
|
2015-04-29 16:53:09 -05:00 |
|
PabstMirror
|
a39e869728
|
Fix extra {} wraped
Error position: <if ({[_unit] call ace_medical_fnc_setDea>
Error if: Type code, expected Bool
File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50
|
2015-04-29 16:44:47 -05:00 |
|
Glowbal
|
581c64f66f
|
Implemented unloading from vehicles #740
|
2015-04-29 23:12:47 +02:00 |
|
Glowbal
|
943d2cbd72
|
Merge branch 'master' into medicalImprovements
|
2015-04-29 23:01:38 +02:00 |
|
Glowbal
|
aaa8171457
|
Implemented prevent instant death #839
|
2015-04-29 22:54:58 +02:00 |
|
Glowbal
|
614a93ef12
|
fixes #838
|
2015-04-29 22:04:46 +02:00 |
|
bux578
|
fce91279b5
|
add ace3 and banana insignia
`[this,"ACE_insignia_logo"] call BIS_fnc_setUnitInsignia;`
and
`[this,"ACE_insignia_banana"] call BIS_fnc_setUnitInsignia;`
|
2015-04-29 22:04:31 +02:00 |
|
Glowbal
|
87465b8b10
|
fixes #829
|
2015-04-29 21:49:24 +02:00 |
|
ulteq
|
4eec4da37c
|
Merge pull request #912 from acemod/explosiveFixAttachDeleteVehicleFix
Explosive fix attach delete vehicle fix
|
2015-04-29 21:32:28 +02:00 |
|
Dimaslg
|
864c3ea03b
|
Conflicts resolve again
Conflicts resolve again
|
2015-04-29 21:23:32 +02:00 |
|
ulteq
|
608af39a67
|
Added proper dummy object cleanup code
|
2015-04-29 21:22:07 +02:00 |
|
Dimaslg
|
f8d5c423ae
|
Merge conflicts resolved
|
2015-04-29 21:15:22 +02:00 |
|
PabstMirror
|
41bef1e58c
|
Merge pull request #903 from acemod/vehLockFix
Veh lock fix
|
2015-04-29 13:34:38 -05:00 |
|
PabstMirror
|
2beaf8ddeb
|
Merge pull request #905 from acemod/fixDragAnim
Fix Dragging StanceChange Anim
|
2015-04-29 13:34:16 -05:00 |
|
ulteq
|
00dc0ef01e
|
Added frag classes array for 82mm shell
|
2015-04-29 17:48:19 +02:00 |
|
ulteq
|
989332831f
|
Added frag configs for 82mm and 155mm shells
|
2015-04-29 17:42:37 +02:00 |
|
NukeDev
|
d4dc5e6d85
|
Other Fixes 2
|
2015-04-29 17:22:20 +02:00 |
|
ulteq
|
4e171c2988
|
Merge pull request #916 from FreeZbe/master
French: update and fix stringtable
|
2015-04-29 16:46:49 +02:00 |
|
NukeDev
|
73772d9de1
|
Other Fixes
|
2015-04-29 16:44:42 +02:00 |
|
FreeZbe
|
ca7aeece90
|
French: update stringtable
|
2015-04-29 16:28:59 +02:00 |
|
FreeZbe
|
5ec6bea71d
|
French: update stringtable
|
2015-04-29 16:19:23 +02:00 |
|
jaynus
|
283e34779f
|
Don't inherit
|
2015-04-29 07:05:48 -07:00 |
|
Glowbal
|
dfbc9b74fd
|
Added arsenalScope #913
|
2015-04-29 15:14:37 +02:00 |
|
ulteq
|
2068eaea75
|
Added G_40mm_HE config, changed 40mm gurney_k values
|
2015-04-29 13:53:38 +02:00 |
|
ulteq
|
a8f37a4c72
|
Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into fragCleanup
|
2015-04-29 13:33:07 +02:00 |
|
commy2
|
d149db61e8
|
ace insignia, #906
|
2015-04-29 13:01:08 +02:00 |
|
KoffeinFlummi
|
b263ac6847
|
Merge branch 'patch-5' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
addons/common/stringtable.xml
|
2015-04-29 12:57:48 +02:00 |
|
KoffeinFlummi
|
c854d2208f
|
Merge branch 'patch-4' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
addons/captives/stringtable.xml
|
2015-04-29 12:54:20 +02:00 |
|
KoffeinFlummi
|
a1e709047e
|
Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge
Conflicts:
AUTHORS.txt
addons/aircraft/stringtable.xml
addons/attach/stringtable.xml
addons/captives/stringtable.xml
addons/common/stringtable.xml
addons/disposable/stringtable.xml
addons/dragging/stringtable.xml
addons/explosives/stringtable.xml
addons/fcs/stringtable.xml
addons/frag/stringtable.xml
addons/grenades/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/inventory/stringtable.xml
addons/kestrel/stringtable.xml
addons/laser_selfdesignate/stringtable.xml
addons/laserpointer/stringtable.xml
addons/logistics_uavbattery/stringtable.xml
addons/logistics_wirecutter/stringtable.xml
addons/magazinerepack/stringtable.xml
addons/maptools/stringtable.xml
addons/markers/stringtable.xml
addons/medical/stringtable.xml
addons/microdagr/stringtable.xml
addons/movement/stringtable.xml
addons/nametags/stringtable.xml
addons/nightvision/stringtable.xml
addons/optionsmenu/stringtable.xml
addons/overheating/stringtable.xml
addons/parachute/stringtable.xml
addons/realisticnames/stringtable.xml
addons/reload/stringtable.xml
addons/reloadlaunchers/stringtable.xml
addons/respawn/stringtable.xml
addons/safemode/stringtable.xml
addons/switchunits/stringtable.xml
addons/vehiclelock/stringtable.xml
addons/weaponselect/stringtable.xml
addons/wep_javelin/stringtable.xml
addons/winddeflection/stringtable.xml
|
2015-04-29 12:52:55 +02:00 |
|
Legolasindar
|
1c8137a7e5
|
fixed spanish translate for opened pull #893
fixed spanish translate for opened pull #893
|
2015-04-29 12:46:32 +02:00 |
|