b84b532cfb
Merge pull request #4001 from acemod/renameEvents
...
Rename events
2016-06-26 10:47:39 +02:00
18f09b9310
Rename events:
...
- ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded
- ace_cargoAddedByClass -> ace_cargoByClassAdded
- ace_enteredCardiacArrest -> ace_cardiacArrestEntered
- ace_itemAddedToTriageCard -> ace_triageCardItemAdded
- ace_reload_linkedAmmo -> ace_reload_ammoLinked
- ace_reload_returnedAmmo -> ace_reload_ammoReturned
- ace_treatmentSuccess -> ace_treatmentSucceded
- ace_common_engineOn -> ace_common_setEngine
- ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations
- ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations
- ace_interaction_lampTurnOff -> ace_interaction_setLampOff
- ace_interaction_lampTurnOn -> ace_interaction_setLampOn
- ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel
- ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint
Close #3533
2016-06-24 10:45:13 -03:00
89ecc81111
convert common events to CBA playerEvents
2016-06-22 01:39:20 +02:00
3972504d4a
Add dogtag actions to body bags
2016-06-21 12:13:32 -05:00
3fdc0dd521
Merge pull request #3955 from acemod/add_name
...
add 'name' to components
2016-06-20 19:25:58 +02:00
88b58216ee
Added beautified component names
2016-06-20 11:44:36 +02:00
a04dec0c63
Update french translation
2016-06-19 15:16:43 +02:00
c481ddedaf
add 'name' to components
2016-06-19 09:38:39 +02:00
d26f133733
Add missing french entries in stringtables and update older ones
...
Take changes from #3480 and completed empty entries
2016-06-19 01:18:12 +02:00
74da8cc36c
Fix strange animation played when using PAK
...
Fixes #1695
2016-06-18 13:12:49 +02:00
f6b744e741
Merge pull request #3945 from acemod/fix-gray-screen-medical
...
Fix no gray screen for advanced medical
2016-06-18 11:59:14 +02:00
7dc76dee78
Fix no gray screen for advanced medical
...
Advanced medical was never displaying the gray screen on low blood volume. This is because for advanced medical, the blood volume minimum level is around 40 before death. For basic medical, this is 0.
2016-06-18 11:55:03 +02:00
03e923aa68
Cleanup Function Headers titles
2016-06-18 11:50:41 +02:00
a8831a0d16
Change split medical in two components
...
- medical component is responsible for the injuries and common functionality
- medical_treatment component is responsible for offering treatment functionality
2016-06-13 17:00:56 +02:00
295ad3b037
Merge branch 'medical-impr' into merge-basic-and-advanced
2016-06-13 14:32:15 +02:00
38cdd523f0
Clean up medical function private declares
2016-06-13 14:27:43 +02:00
58f43f8a51
Remove unneeded and deprecated functions from medical
2016-06-13 12:24:28 +02:00
6657bde921
Change basic medical to use advanced medical injury system
2016-06-13 12:18:56 +02:00
792dbcd009
Change clean up privates in handleDamage code
2016-06-13 11:05:21 +02:00
8e59993d7a
Change clean up medical code
2016-06-13 10:55:19 +02:00
73bd684b65
Change formatting and private keywords in medical
2016-06-13 02:34:56 +02:00
3ba2396db7
Change minor clean up of handleUnitVitals
2016-06-13 02:11:21 +02:00
43a2b0ea29
Merge pull request #3909 from acemod/fix-bandaging-configuration
...
Adjust bandage configuration
2016-06-12 23:25:16 +02:00
1997cb5199
Add maxDam for medium velocity wounds
...
Ensures that velocity wounds from a major hit will use the "Large" type
of wound
2016-06-12 14:47:59 -05:00
fa1282406f
Change bandage configurations
...
- Field dressing is average treatment
- Packing bandage is average treatment, higher reopen change, longer reopening delay
- Elastic bandage is higher treatment, higher reopen change, shorter reopen delay
- QuikClot is lower treatment, lower reopen change, longer reopening delay
2016-06-12 20:40:45 +02:00
151d13244b
Improved misleading translation of german bandages ( #3810 )
...
* Improved misleading translation of german bandages
* Further improved german bandage names
2016-06-11 21:35:22 +02:00
7f9257716e
Merge pull request #2331 from acemod/323bloodyoverlay
...
remove BI blood overlay
2016-06-11 20:49:54 +02:00
dc6d5f1367
Temp fix for change to handleDamage in dev branch
...
Fix #3892
2016-06-09 21:26:50 -05:00
bd5f6107a0
Merge branch 'master' into eol-lf
2016-06-09 14:24:45 +02:00
8c9b31b1c7
Merge pull request #3815 from acemod/cbaEventSystem
...
Deprecate ACE events framework
2016-06-09 14:20:26 +02:00
a61e4b3a4e
remove BI blood overlay
2016-06-06 14:14:45 +02:00
90ebf9638b
Update common event names to meet new standard
2016-06-04 11:12:56 +01:00
9e4fd77745
Update common event names to meet new standard
2016-06-03 22:39:43 +01:00
694503c01b
Fix medical events
2016-06-03 20:57:21 +02:00
fa2cf55156
Fix medical related events
2016-06-03 20:22:34 +02:00
77baeda976
Merge branch 'master' into huehuehue
2016-06-03 00:01:13 -05:00
db78dd53a8
Cleanup Merge and remoteFnc events
2016-06-02 19:59:18 -05:00
d7f9c52c2f
Merge branch 'master' into cbaEventSystem
2016-06-02 19:29:30 -05:00
b0352fdeb9
Merge branch 'master' into eol-lf
2016-06-02 17:02:09 +02:00
637b5e02e9
Update 3den attributes to use 1.60 scaling ( #3857 )
2016-06-02 09:26:57 -05:00
95573ee711
Stringtable URL ( #3855 )
...
* Move url into stringtable to display it properly, Add some missing author and url entries
* Fix main
* Remove duplicate author
2016-06-01 23:45:51 +02:00
1354826d56
Put semi-colon to the correct place
2016-06-01 14:11:32 +02:00
1331265e65
Move url into a macro
2016-06-01 13:49:10 +02:00
6730d016c2
Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility
2016-06-01 13:27:02 +02:00
26fbc36cab
Merge branch 'master' into cbaEventSystem
2016-05-31 22:36:08 +02:00
fd26e2e44e
Merge pull request #3516 from acemod/cbamissiontime
...
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
7512c4e52e
manual merge
2016-05-30 21:14:34 +02:00
7a307393a4
Merge branch 'master' into useQuotedPathMacros
2016-05-30 21:14:17 +02:00
e7fa02d0d9
Merge pull request #3812 from acemod/cbaDelayedExecFnc
...
Use new CBA delayed execution functions and deprecate ACE functions
2016-05-30 21:02:29 +02:00
272775445f
Merge pull request #3670 from acemod/useQuotedFuncMacros
...
Use new quoted function macros
2016-05-30 21:00:23 +02:00
