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
12,451 Commits 73 Branches 88 Tags 752 MiB
c2b9cddfb0
Commit Graph

1599 Commits

Author SHA1 Message Date
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
jonpas
fd39ee9e6b Merge branch 'master' into armake 2016-07-11 16:27:37 +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
jonpas
b99b11d066 Merge branch 'master' into armake 2016-06-28 18:29:51 +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
KoffeinFlummi
e5ef31c556 Disable redefinition warnings 2016-06-16 23:40:46 +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
Glowbal
8e59993d7a Change clean up medical code 2016-06-13 10:55:19 +02:00
Glowbal
73bd684b65 Change formatting and private keywords in medical 2016-06-13 02:34:56 +02:00
Glowbal
3ba2396db7 Change minor clean up of handleUnitVitals 2016-06-13 02:11:21 +02:00
Glowbal
43a2b0ea29 Merge pull request #3909 from acemod/fix-bandaging-configuration 
Adjust bandage configuration
 2016-06-12 23:25:16 +02:00
PabstMirror
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
Glowbal
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
Butt4cak3
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
Glowbal
7f9257716e Merge pull request #2331 from acemod/323bloodyoverlay 
remove BI blood overlay
 2016-06-11 20:49:54 +02:00
PabstMirror
dc6d5f1367 Temp fix for change to handleDamage in dev branch 
Fix #3892
 2016-06-09 21:26:50 -05:00
jonpas
bd5f6107a0 Merge branch 'master' into eol-lf 2016-06-09 14:24:45 +02:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem 
Deprecate ACE events framework
 2016-06-09 14:20:26 +02:00
commy2
a61e4b3a4e remove BI blood overlay 2016-06-06 14:14:45 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
SilentSpike
9e4fd77745 Update common event names to meet new standard 2016-06-03 22:39:43 +01:00
Glowbal
694503c01b Fix medical events 2016-06-03 20:57:21 +02:00
Glowbal
fa2cf55156 Fix medical related events 2016-06-03 20:22:34 +02:00
PabstMirror
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
PabstMirror
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
PabstMirror
637b5e02e9 Update 3den attributes to use 1.60 scaling (#3857) 2016-06-02 09:26:57 -05:00
jonpas
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
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime 
replace timePFH with CBA_missionTime
 2016-05-30 21:23:57 +02:00
commy2
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
commy2
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
commy2
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros 
Use new quoted function macros
 2016-05-30 21:00:23 +02:00
jonpas
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
jonpas
f956ea557a Merge branch 'master' into armake 2016-05-22 17:41:43 +02:00
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
PabstMirror
f69142dd45 Hearing - New XEH, Fix dead effects, Medical var (#3802) 
* Hearing - New XEH, Fix dead effects, Medical var

* Use setHearingCapability

* Cleanup dead player vol update

* Don't change global hearing in medical

* Fix exitWith
 2016-05-20 11:23:14 -05:00
commy2
d93132dac8 more replacing 2016-05-18 11:57:40 +02:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
commy2
cc9e128e74 Merge pull request #3792 from acemod/useGetUnitLoadout 
use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it
 2016-05-14 13:04:35 +02:00
commy2
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
Glowbal
04b61ff32e Fix missing semicolon 2016-05-14 10:37:29 +02:00
Glowbal
180a0f9d84 Merge pull request #3462 from acemod/medicalLoops 
Cleanup medical PFHs
 2016-05-14 09:39:14 +02:00
Glowbal
eb8390741b Change round down mass of body bag 
Mass is an integer.
 2016-05-14 09:23:29 +02:00
BaerMitUmlaut
38bb4f6c29 Adjusted weight of bodybag 2016-05-10 23:40:03 +02:00
Glowbal
83a8c488d9 Merge pull request #3751 from acemod/wipeoutWhitespace 
Cleaned up excessive whitespace
 2016-05-04 11:46:56 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
KoffeinFlummi
c02e7ead32 Fix medical paths 2016-05-02 16:49:33 +02:00
ProfessorCZ
7d0fcde9fa CZ Translate - Update 
04/30/2016
 2016-04-30 00:57:24 +02:00
BaerMitUmlaut
65ccf66d00 Fixed redundant privates in setCardiacArrest 2016-04-18 15:23:04 +02:00
jonpas
ccaec31a90 Use new QFUNC and QEFUNC macros 2016-04-08 20:43:26 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
bux578
076803951d Merge pull request #3628 from alef/translation/15bn/alef 
Italian translation
 2016-03-31 06:54:31 +02:00
PabstMirror
bcde9f8ed6 Filter minor falling damage to non-leg hitpoints 2016-03-28 01:15:58 -05:00
Alessandro Foresi
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
Alessandro Foresi
e5a7578f92 Translation: IT completed (no BOM) 2016-03-27 21:20:15 +02:00
SzwedzikPL
cdcde46a7d Fix double displayName in medical settings 2016-03-22 13:05:47 +01:00
Thomas Kooi
daceaa9dd8 Merge branch 'master' into settingsNameDescp 2016-03-18 14:48:11 +01:00
Thomas Kooi
61f1959109 Fix morphine increasing viscosity 
Morphine should decrease viscosity instead of increase. Closes #3579
 2016-03-12 18:55:42 +01:00
Thomas Kooi
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR 
Standardize GVAR array brackets in configs.
 2016-03-08 18:19:50 +01:00
PabstMirror
3232654e13 Close #3565 -Fix spelling of local var _woundEffectiveness 2016-03-08 11:02:54 -06:00
PabstMirror
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -06:00
PabstMirror
e3deebff7e Fix empty callback for hr adjustment 
Fix #3526
Same issue as #3384
 2016-03-03 13:23:53 -06:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
Jonathan Pereira
309f48ee0b Added remaining PT-BR translarions 2016-03-01 08:56:43 -03:00
PabstMirror
fe967ff2bd Don't read medic setting that is not in module 2016-02-29 14:07:15 -06: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
jonpas
8d326a0a1b Remove duplicate medical string 2016-02-28 22:54:24 +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
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
jonpas
905586bddc Make unused medical strings be used 2016-02-27 21:04:04 +01:00
System98
df3ec3a179 Fix length of a display name 
- Fix the length of a display name so it doesn't get cut off in the
settings.
 2016-02-27 12:51:32 +01:00
System98
a13b029b4a Merge remote-tracking branch 'refs/remotes/acemod/master' into Update-german-translations 2016-02-27 12:50:07 +01:00
Thomas Kooi
a0ea724db4 Merge pull request #3436 from acemod/register-last-damage-source 
Add registering last damage source
 2016-02-27 12:42:11 +01:00
System98
05575538e4 Fix format errors in "medical" addon 2016-02-27 12:10:40 +01:00
System98
f7253edec8 Update german translations 
- Fix some german translations
- Re-add strings in "medical" addon deleted in PR #3437
- Add german translations for previously deleted strings and update the
english texts so the purpose of the function gets clearer
 2016-02-27 12:07:57 +01:00
jonpas
0c79869d7a Fix duplicated English strings 2016-02-27 01:43:57 +01:00
jonpas
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
Glowbal
e0a65aa543 Add registering last damage source 2016-02-26 22:58:49 +01:00
bux578
db71aa54b8 Merge pull request #3434 from NorXAengell/Traduction-Fr 
Traduction fr
 2016-02-26 21:18:40 +01:00
licht-im-Norden87
1c7a25cc38 Update stringtable.xml 2016-02-26 19:36:47 +01:00
NorXAengell
ea461446f9 Translation Fr 2016-02-26 19:24:53 +01:00
System98
e587744b3e Fix text errors 
- Fix errors in "map_gestures, medical, overheating, slideshow and zeus"
addons
 2016-02-26 11:29:55 +01:00
SuN9491
9efbdb2e71 Spanish Translation (3.5.0) 
Remaining spanish translations for ACE 3.5.0
 2016-02-25 20:50:29 +01:00
System98
48d312cb8e Add german translations 
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
 2016-02-25 18:10:26 +01:00
bux578
21ba45d0c9 Merge pull request #3421 from gienkov/pltranslation350 
Polish translation 3.5.0 (FIXED)
 2016-02-25 18:01:01 +01:00
gienkov
8ae1c68d5e remove tabs 2016-02-25 17:20:45 +01:00
Nicolás Badano
333c8f57bc Merge pull request #3419 from acemod/addMissingMedicalSettingCategory 
Add missing medical category to delayUnconCaptive
 2016-02-25 13:16:23 -03:00
jonpas
6ad107ecc0 Add medical category to delayUnconCaptive 2016-02-25 17:03:38 +01:00
gienkov
04f714e53c Merge remote-tracking branch 'origin/master' into pltranslation350 2016-02-25 16:41:09 +01:00
gienkov
25561ab2c5 hearing and medical, unwind medical pl shorts 2016-02-25 16:31:47 +01:00
esteldunedain
3fa3512509 Remaining spanish translations 2016-02-25 12:25:42 -03:00
esteldunedain
64a62d65fc More spanish translations 2016-02-25 11:46:56 -03:00
Nicolás Badano
d02a590886 Merge pull request #3406 from acemod/diePurista 
Replace Purista with Roboto - everywhere
 2016-02-25 09:56:16 -03:00
Nicolás Badano
ae2ce0eebc Merge pull request #3124 from acemod/delayUnconCaptiv 
add delay to Unconsciousness Captivity
 2016-02-25 09:54:27 -03:00
jonpas
7f022eda00 Replace Purista with Roboto - everywhere, close #3401 2016-02-24 15:06:27 +01:00
PabstMirror
7cf912222b Merge pull request #3393 from acemod/3denReplaceDropDown 
Fix 3den attributes
 2016-02-23 17:09:03 -06:00
jokoho48
0956b97dce remove module settings 
change defualt in ACE_Settings
 2016-02-23 15:49:03 +01:00
jokoho48
c61763edc9 fix simicolon 
add stringtable entrys
 2016-02-23 15:37:28 +01:00