Commit Graph

9473 Commits

Author SHA1 Message Date
7d53e1f4d2 Merge pull request #3488 from acemod/removeXEHENABLED
replace XEH_ENABLED macro with actual class, fix #3482, fix #3483
2016-03-01 18:52:08 +01:00
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
9cb40dab14 Merge pull request #3485 from acemod/removeSpareBarrelsEquipment
Remove spare barrels from starting equipment, as they make some grena…
2016-03-01 14:08:09 +01:00
bafe714ab5 Remove spare barrels from starting equipment, as they make some grenades not fit in the uniforms. 2016-03-01 10:05:06 -03:00
b69827aea8 Merge pull request #3476 from acemod/3den_-1
Try to handle -1 from eden modules
2016-02-29 20:17:52 -03:00
2bdeff1639 Fix for all missionVersions 2016-02-29 16:34:51 -06:00
cb370c4f70 Merge branch 'release' into 3den_-1 2016-02-29 14:16:34 -06:00
fe967ff2bd Don't read medic setting that is not in module 2016-02-29 14:07:15 -06:00
2b3b6083cb Try to handle bad 3den mission modules 2016-02-29 14:06:14 -06:00
bc126fca34 Merge pull request #3463 from BaerMitUmlaut/fr-rc-fixes
Fast roping RC fixes
2016-02-29 15:49:10 -03:00
5b4072bf50 Added vehicle existance check 2016-02-29 19:29:11 +01:00
05c16a5dfb Removed TOH animations 2016-02-29 19:29:10 +01:00
11a66d98e2 Cleanup & fix interaction conditions 2016-02-29 19:29:09 +01:00
f85a886b83 Merge pull request #3474 from acemod/fixFastropeRepairError
Don't try adding repair actions to fastrope helper
2016-02-29 12:12:27 -06:00
c0c6d3c52f Merge branch 'release' into fixFastropeRepairError 2016-02-29 12:10:34 -06:00
35860c8204 Merge pull request #3458 from acemod/fixFastropeRepairError
Don't try adding repair actions to fastrope helper
2016-02-29 11:55:57 -06:00
9fe7c5f189 Merge pull request #3473 from acemod/addDefinesBlank
Add defines to blank component
2016-02-29 14:08:34 -03:00
e0cfef0eed Add defines to blank component 2016-02-29 17:50:38 +01:00
b7329a77ee Merge pull request #3471 from acemod/350disableTaggingLog
Disable logging in tagging
2016-02-29 12:44:02 -03:00
7b96fe6c28 Disable logging in tagging - fix #3468 2016-02-29 16:37:19 +01:00
8fc4a9d901 Merge pull request #3461 from acemod/revert-3451-350fixFastropeAnimsBoneErrors
Revert "Convert fastroping animations to Arma 3, fix bone errors"
2016-02-28 19:24:28 -03:00
f5ff593dea Revert "Convert fastroping animations to Arma 3, fix bone errors" 2016-02-28 23:16:44 +01:00
99cd7b427f Merge pull request #3460 from acemod/350fixDupString
Remove duplicate medical string
2016-02-28 22:55:58 +01:00
8d326a0a1b Remove duplicate medical string 2016-02-28 22:54:24 +01:00
e5b79d7b33 Don't try adding repair actions to fastrope helper 2016-02-28 14:17:14 -06:00
75c2e3d032 Added QUOTE macros to fastroping configs 2016-02-28 18:56:45 +01:00
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
This prevents any possible confusion when the GVARs are used in code.
2016-02-28 15:18:15 +01:00
c61e7b5104 Tweaked & added translations
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
6bfe86e91a Merge pull request #3455 from acemod/fix3450
Fix #3450
2016-02-28 13:07:03 +01:00
a09d0be0d4 Merge pull request #3453 from acemod/hideEmptyCategories
Hide categories that have no user settable options
2016-02-28 13:05:55 +01:00
69f810f32b add missing pee 2016-02-28 07:25:11 +01:00
03b8e2b590 fix reloadMutex nil, fix#3450 2016-02-28 06:12:40 +01:00
147cd1a5af Hide categories that have no user settable options 2016-02-27 18:06:02 -06:00
2527de1acb Merge pull request #3451 from acemod/350fixFastropeAnimsBoneErrors
Convert fastroping animations to Arma 3, fix bone errors
2016-02-27 22:38:58 +01:00
0e606224c7 Convert fastroping animations to Arma 3, fix bone errors 2016-02-27 22:28:12 +01:00
992b4190e1 Merge pull request #3446 from acemod/350addMissingMedicalTexts
Make unused medical strings be used
2016-02-27 21:05:52 +01:00
905586bddc Make unused medical strings be used 2016-02-27 21:04:04 +01:00
428b828c27 Increase version 3.5.0 2016-02-27 20:44:38 +01:00
f758a90351 Merge pull request #3445 from acemod/preventSelfIMFromClosing
Prevent Self Interact Menu from bugging out during animations
2016-02-27 20:35:18 +01:00
d0b1ac56ba Merge pull request #3440 from System98/Update-german-translations
Update german translations
2016-02-27 20:33:51 +01:00
6f4c3483cb Merge pull request #3444 from ElTyranos/patch-4
Fastrope French translation
2016-02-27 20:32:53 +01:00
a86bbdb162 Prevent the interact menu from closing when moving the mouse during animations 2016-02-27 15:47:23 -03:00
9d50812a65 Fastrope French translation 2016-02-27 19:46:15 +01:00
121663226c Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases. 2016-02-27 15:44:53 -03:00
a7ec4d9d2f Merge pull request #3398 from acemod/fix3317
Resync mine orientations in JIP.
2016-02-27 16:52:53 +01:00
a9fa3a99b8 Merge pull request #3441 from acemod/fixNametagsError
Fix error in nametags when a player disconnects
2016-02-27 15:17:15 +01:00
30d62859dc Fix error in nametags when a player disconnects 2016-02-27 10:17:26 -03:00
188941a9b7 Filter the GVAR(explosivesOrientations) list before sending it 2016-02-27 10:07:51 -03:00
fba1a322ac Yet more fixes 2016-02-27 09:50:44 -03:00
823eb116ae more fixes 2016-02-27 09:37:57 -03:00