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,837 Commits 73 Branches 88 Tags 752 MiB
56882a9bcb
Commit Graph

1554 Commits

Author SHA1 Message Date
commy2
56882a9bcb manual merge 2016-10-02 13:04:20 +02:00
commy2
f4d4c521d7 manual merge 2016-10-02 13:02:17 +02:00
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
commy2
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
PabstMirror
1bc5669c95 Merge branch 'master' into cba-log-macros 2016-09-30 11:18:58 -05:00
commy2
c93e9e3f3b fix playSoundInjured wrong args 2016-09-30 13:03:43 +02:00
PabstMirror
60a7490b7e Fix some moved funcs/strings 2016-09-29 15:08:36 -05:00
commy2
2c7864c02b implement custom treatment sounds 2016-09-29 18:45:18 +02:00
commy2
0decd72063 manual merge 2016-09-28 08:37:39 +02:00
commy2
20d00d7cd9 make units scream when they're hit 2016-09-27 21:21:44 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
commy2
a913054b57 fix error with out of bounds blood loss 2016-09-27 20:00:58 +02:00
classicarma
eaf00c8340 translate medical 2016-09-28 01:15:38 +09:00
commy2
5e35204811 woundHandler(SQF), fixes, improvements, more consistent variable naming 2016-09-27 17:29:49 +02:00
commy2
7470d1f0f5 cleanup/improve parseConfigForinjuries 2016-09-27 11:05:38 +02:00
commy2
9f6baca424 port injury parse fnc to medical damage 2016-09-26 20:25:14 +02:00
PabstMirror
3c53a314d4 Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros 2016-09-22 15:10:30 -05:00
commy2
236d1f9669 Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite 2016-09-19 18:23:37 +02:00
commy2
729ba9178b Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-19 18:23:26 +02:00
commy2
c2f8007d36 port litter settings to treatment 2016-09-19 18:05:49 +02:00
commy2
81d962f0d5 port litter to treatment 2016-09-19 09:55:30 +02:00
Glowbal
27314c34b1 fix treatment functionality 2016-09-18 22:58:56 +02: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
Glowbal
b74245c323 Merged branch medical-rewrite into medical-rewrite 2016-09-18 19:48:58 +02:00
Glowbal
1c1e47c039 Enable treatmnet actions 2016-09-18 19:48:49 +02:00
commy2
031bb1ec91 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-18 15:17:01 +02:00
commy2
a5dcdf102f use TRACE macros for parseConfig function 2016-09-18 14:17:18 +02:00
Glowbal
9263cb0f7d Fix handleDamage not working 2016-09-18 14:05:05 +02:00
Glowbal
7691af47f3 Further clean up 2016-09-18 13:33:22 +02:00
Glowbal
811e1cd598 First set up clean up for medical rewrite 2016-09-18 12:05:36 +02:00
Glowbal
0c43c83b3d Merge branch 'master' 
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionLoadUnit.sqf
	addons/medical/functions/fnc_addDamageToUnit.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
	addons/medical/functions/fnc_handleCreateLitter.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_isBeingCarried.sqf
	addons/medical/functions/fnc_isBeingDragged.sqf
	addons/medical/functions/fnc_litterCleanupLoop.sqf
	addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
	addons/medical/functions/fnc_setCardiacArrest.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
 2016-09-18 11:51:21 +02:00
PabstMirror
1caea46d60 Medical - Fix adv wound not stacking (#4353) 2016-09-07 20:54:54 +02:00
Glowbal
89a5f28772 Merge pull request #4192 from acemod/medical-rewrite-engine-component 
merge medical engine component into medical rewrite branch
 2016-09-05 22:31:37 +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
commy2
2ac52fb430 remove static fix from vmedical component 2016-08-27 08:50:55 +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
commy2
f76457f48f convert log macros to cba versions 2016-08-22 21:06:52 +02: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
f12feae7fe Fix some efuncs 2016-08-09 12:47:59 -05:00
PabstMirror
6c63d3c23a Merge branch 'master' into medical-rewrite 2016-08-09 12:11:30 -05: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
commy2
8a8bc6a336 remove hitpoint config from medical-main component 2016-07-30 17:23:08 +02:00