esteldunedain
e6a2ca7102
Fix typos
2016-03-01 19:25:45 -03:00
jonpas
f13517980b
Merge branch 'release'
2016-03-01 23:08:17 +01:00
esteldunedain
f130d6c253
Increase spare barrel mass to 60 (2.7 Kg)
2016-03-01 18:17:58 -03:00
esteldunedain
b8c8c21a02
Remove spare barrels from starting equipments
2016-03-01 18:17:23 -03:00
esteldunedain
a041555381
Add an animation and progressbar to the "Check spare barrels temperatures" action
2016-03-01 18:16:14 -03:00
esteldunedain
46a96dd5da
Move spare barrel event handlers out of postInit
2016-03-01 18:14:36 -03:00
VKing
353b5e9ef4
Replace transportMax... with maximumLoad for mortar boxes.
...
Fixes 3490
2016-03-01 21:58:21 +01:00
esteldunedain
bc4a338d32
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spareBarrelSimulation
2016-03-01 17:15:14 -03:00
Glowbal
e2c7576251
Remove headless client component from ACE.
...
The component does not fit properly within the scope of the ACE project. In order to avoid difficulties at a later point in time, project management has decided to pull the HC component from the ACE 3.5.0 release. We are going to look into alternative options for the HC component, such as a separate repository maintained by the ACE team.
2016-03-01 19:09:42 +01:00
Glowbal
4d0a894ce1
Merge branch 'release' of github.com:acemod/ACE3 into release
2016-03-01 18:54:04 +01:00
Glowbal
84052f50fd
Update extension builds
2016-03-01 18:53:52 +01:00
Thomas Kooi
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
commy2
fa3913752b
replace XEH_ENABLED macro with actual class, fix #3482 , fix #3483
2016-03-01 17:05:00 +01:00
commy2
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
esteldunedain
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
Nicolás Badano
b69827aea8
Merge pull request #3476 from acemod/3den_-1
...
Try to handle -1 from eden modules
2016-02-29 20:17:52 -03:00
PabstMirror
2bdeff1639
Fix for all missionVersions
2016-02-29 16:34:51 -06:00
PabstMirror
cb370c4f70
Merge branch 'release' into 3den_-1
2016-02-29 14:16:34 -06:00
PabstMirror
fe967ff2bd
Don't read medic setting that is not in module
2016-02-29 14:07:15 -06:00
PabstMirror
2b3b6083cb
Try to handle bad 3den mission modules
2016-02-29 14:06:14 -06:00
Nicolás Badano
bc126fca34
Merge pull request #3463 from BaerMitUmlaut/fr-rc-fixes
...
Fast roping RC fixes
2016-02-29 15:49:10 -03:00
BaerMitUmlaut
5b4072bf50
Added vehicle existance check
2016-02-29 19:29:11 +01:00
BaerMitUmlaut
05c16a5dfb
Removed TOH animations
2016-02-29 19:29:10 +01:00
BaerMitUmlaut
11a66d98e2
Cleanup & fix interaction conditions
2016-02-29 19:29:09 +01:00
PabstMirror
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
PabstMirror
c0c6d3c52f
Merge branch 'release' into fixFastropeRepairError
2016-02-29 12:10:34 -06:00
PabstMirror
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
Nicolás Badano
9fe7c5f189
Merge pull request #3473 from acemod/addDefinesBlank
...
Add defines to blank component
2016-02-29 14:08:34 -03:00
jonpas
e0cfef0eed
Add defines to blank component
2016-02-29 17:50:38 +01:00
Nicolás Badano
b7329a77ee
Merge pull request #3471 from acemod/350disableTaggingLog
...
Disable logging in tagging
2016-02-29 12:44:02 -03:00
jonpas
7b96fe6c28
Disable logging in tagging - fix #3468
2016-02-29 16:37:19 +01:00
esteldunedain
9e682253f3
Move the dead body cleanup PFH to a loop using waitAndExecute
2016-02-28 23:33:51 -03:00
esteldunedain
90a54397ae
Move the litter cleanup PFH to a loop using waitAndExecute
2016-02-28 23:20:26 -03:00
esteldunedain
4b702f68df
Make loops non public
2016-02-28 23:10:15 -03:00
esteldunedain
94e8bee348
Move the pfh from setDead to a waitAndExecute loop: reviveStepLoop
2016-02-28 23:08:25 -03:00
esteldunedain
12895e7983
Remove unneeded parameter
2016-02-28 22:58:09 -03:00
esteldunedain
0e82cdfe82
Move to a function and comments the function that tracks the effects of medications over time. Use waitAndExecute instead of a pfh for better performance.
2016-02-28 22:50:04 -03:00
esteldunedain
21d4939abb
Optimize the computation of tourniquet pain. Fix pain not being able to decrease when above 10
2016-02-28 22:08:59 -03:00
esteldunedain
35e13d5357
Fixes
2016-02-28 20:55:05 -03:00
esteldunedain
bbb84ec7d1
Move the tourniquet loop to handleUnitVitals. Makes the tourniquet pain compatible with swapping localities
2016-02-28 20:50:28 -03:00
esteldunedain
085860c770
Restore addToInjuredCollection as a deprecated function
2016-02-28 20:32:02 -03:00
esteldunedain
bed51ac8a4
Fix waitAndExecute syntax
2016-02-28 20:26:05 -03:00
esteldunedain
3bbabac2d7
Rename and add comments to the function that tracks the units vital loop. Use waitAndExecute instead of a pfh for better performance.
2016-02-28 20:12:56 -03:00
Nicolás Badano
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
jonpas
f5ff593dea
Revert "Convert fastroping animations to Arma 3, fix bone errors"
2016-02-28 23:16:44 +01:00
jonpas
99cd7b427f
Merge pull request #3460 from acemod/350fixDupString
...
Remove duplicate medical string
2016-02-28 22:55:58 +01:00
jonpas
8d326a0a1b
Remove duplicate medical string
2016-02-28 22:54:24 +01:00
PabstMirror
e5b79d7b33
Don't try adding repair actions to fastrope helper
2016-02-28 14:17:14 -06:00
BaerMitUmlaut
75c2e3d032
Added QUOTE macros to fastroping configs
2016-02-28 18:56:45 +01:00
VKing
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
