Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,812 Commits 73 Branches 88 Tags 752 MiB
962a296710
Commit Graph

1509 Commits

Author SHA1 Message Date
commy2
05d30c5573 convert log macros to cba versions (#4282) 
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
 2016-10-02 12:55:31 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
classicarma
eaf00c8340 translate medical 2016-09-28 01:15:38 +09:00
Grzegorz
a63dcb49d0 PL Translation 3.7.1 (#4395) 
* translate advanced fatigue

* translate advanced throwing

* translate cargo

* translate chemlights

* translate cookoff

* translate explosives

* translate fastroping

* translate gforce

* translate googles

* translate grenades

* translate gunbag

* translate maptools

* translate medical

* translate medical_ai

* translate minedetector

* translate nametags

* translate overheating

* translate repair

* translate tagging

* translate ui

* translate zeus
 2016-09-18 22:00:13 +02:00
PabstMirror
1caea46d60 Medical - Fix adv wound not stacking (#4353) 2016-09-07 20:54:54 +02:00
PabstMirror
4fd5d6be6c Fix handleDamage params for addDamageToUnit (#4344) 2016-09-05 22:27:00 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
PabstMirror
1c5761f845 Bundle fire damage into larger chunks (#4223) 2016-09-03 22:00:45 +02:00
PabstMirror
c4d2383005 Increase blood bag flow rate for basic medical (#4306) 
* Change blood bags

- Increase flow rate for basic medical
- Don't queue bags

* change to ivBags, reset var on init / fullHeal
 2016-09-01 12:46:08 +02:00
Joko
927d8ead8f add Hiddenselection camo to bodybag for Retexturing (#4276) 
* add Hiddenselection camo to bodybag

* Add default texture

* Use macro
 2016-08-24 12:42:32 -05:00
Glowbal
83e78f1021 Merge pull request #4258 from acemod/reviveTimer 
Clear reviveState when calling setUnconscious
 2016-08-20 11:57:51 +02:00
Glowbal
167dc7735d Merge pull request #4197 from acemod/litterSimpleObject 
Use createSimpleObject for medical litter
 2016-08-20 11:53:43 +02:00
PabstMirror
b02e91e02e Clear reviveState when calling setUnconscious 
#4250
 2016-08-18 01:59:40 -05:00
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
PabstMirror
c46b2d09cf Heal hitpoint after bandage sets bodyPartStatus 2016-08-07 13:58:09 -05:00
PabstMirror
82cf18575c Minor tweaks to medical 
- decrease needed blood loss on selection to turn icon red. (Largest
wound bleedingRate is only 0.1)
- Don't print warning for basic medical bandage not having sub configs
 2016-08-03 13:14:12 -05:00
PabstMirror
02c308e141 Use createSimpleObject for medical litter 2016-08-01 16:20:13 -05:00
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
Glowbal
c8a54fd090 Merge branch 'release' 2016-07-15 02:03:42 +02:00
PabstMirror
1213c08e4b Fix cached call events 2016-07-14 13:06:45 -05:00
PabstMirror
0281bc8f3d Fix 3den attribute layout for 1.62 2016-07-12 17:54:16 +02:00
Glowbal
ee8e03a1ae Merge pull request #3916 from acemod/merge-basic-and-advanced 
Merge basic and advanced injury systems
 2016-07-12 13:36:02 +02:00
Glowbal
0e740f00c3 Merge branch 'release' 2016-07-11 23:42:03 +02:00
Glowbal
d0c30577af Remove usage of setUnconscious 2016-07-11 19:18:40 +02:00
Glowbal
f86d8d113c Merge branch 'release' 2016-07-09 11:36:49 +02:00
PabstMirror
450b8dfedb Fix order of revive loop 
Fix #4035
Revive loop was killing heartrate before it exited
 2016-07-06 00:54:51 -05:00
Glowbal
e3f96b6594 Merge branch 'master' into merge-basic-and-advanced 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
 2016-06-30 11:27:51 +02:00
Glowbal
cd08e00c71 Merge pull request #3962 from acemod/dogtags 
Dogtags
 2016-06-29 22:19:02 +02:00
Glowbal
1d66d46501 Fix damaged array not being overwritten. 
This fixes an issue were injured body parts were displayed as blue instead of red. Happens when using advanced medical with AI running in basic mode.
 2016-06-27 19:55:00 +02:00
Glowbal
a9f3c2f784 Merge pull request #4012 from acemod/fix-medical-config-typo 
Fix incorrect values for bandage configuration
 2016-06-27 19:07:34 +02:00
Glowbal
c287223a08 Fix incorrect values for bandage configuration 2016-06-27 19:01:33 +02:00
PabstMirror
10a19b59e7 Swich EFUNC(common,waitAndExecute) to CBA 2016-06-26 22:18:53 -05:00
Glowbal
b84b532cfb Merge pull request #4001 from acemod/renameEvents 
Rename events
 2016-06-26 10:47:39 +02:00
esteldunedain
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
commy2
89ecc81111 convert common events to CBA playerEvents 2016-06-22 01:39:20 +02:00
PabstMirror
3972504d4a Add dogtag actions to body bags 2016-06-21 12:13:32 -05:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
Josuan Albin
a04dec0c63 Update french translation 2016-06-19 15:16:43 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
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
Glowbal
74da8cc36c Fix strange animation played when using PAK 
Fixes #1695
 2016-06-18 13:12:49 +02:00
Glowbal
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
Glowbal
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
jonpas
03e923aa68 Cleanup Function Headers titles 2016-06-18 11:50:41 +02:00
Glowbal
295ad3b037 Merge branch 'medical-impr' into merge-basic-and-advanced 2016-06-13 14:32:15 +02:00
Glowbal
38cdd523f0 Clean up medical function private declares 2016-06-13 14:27:43 +02:00
Glowbal
58f43f8a51 Remove unneeded and deprecated functions from medical 2016-06-13 12:24:28 +02:00
Glowbal
6657bde921 Change basic medical to use advanced medical injury system 2016-06-13 12:18:56 +02:00
Glowbal
792dbcd009 Change clean up privates in handleDamage code 2016-06-13 11:05:21 +02:00