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
6,941 Commits 73 Branches 88 Tags 752 MiB
5e57cad669
Commit Graph

6941 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Glowbal
82c181cd7c Fixed header 2015-02-22 14:54:54 +01:00
Glowbal
5e0eb7323a Added option to toggle between progressbar top and bottom 2015-02-22 14:38:48 +01:00
Glowbal
77666e8097 Added weapon resting state icon 2015-02-22 13:58:51 +01:00
Glowbal
dd51037c5e Added support for image color 2015-02-22 13:44:17 +01:00
Glowbal
9d44ec18b8 Added a default text color setting 2015-02-22 13:35:05 +01:00
Glowbal
323d673eec Removed deprecated config entries (DisplayMessage and DisplayInformation) 2015-02-22 13:20:17 +01:00
Glowbal
7f6a647b4d Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 2015-02-22 12:26:19 +01:00
Glowbal
56dad70a9e Removed redundant level checks 2015-02-22 12:26:08 +01:00
Kieran
c8bf9d2ce1 Changed 'impacted' to 'crushed' 
Changed "Impacted Tissue" to "Crushed tissue", as its a bit more to-the-point (less chance for confusion), and still accurate
 2015-02-22 21:25:28 +10:00
Kieran
7ea31f8b05 Added causes to contusions - ace_med_treatment.hpp 
Added vehiclecrash and falling to contusion causes.
(As those two situations commonly do result in bruising)
 2015-02-22 21:21:27 +10:00
Glowbal
14411a5ef0 Fixed weird fix for getNumber for Array bug in setSettingFromConfig. 2015-02-22 11:36:21 +01:00
Glowbal
1ed50bfe3e Fixed font size 2015-02-22 11:35:52 +01:00
Glowbal
47e27d7be3 Merge branch 'standardize_ui' of github.com:KoffeinFlummi/ACE3 into standardize_ui 2015-02-22 11:19:46 +01:00
Glowbal
8393645df9 Changed position to be inline with the weapon selector UI element by default 2015-02-22 11:19:32 +01:00
Glowbal
a574487166 Added localization support for displayText 2015-02-22 11:19:10 +01:00
Glowbal
9f3a0fe8d4 Removed displayInfo and displayMessage functions. 2015-02-22 11:18:37 +01:00
Glowbal
9dc33c659d Now takes selections into account 2015-02-22 10:56:46 +01:00
Glowbal
bdaec01112 Added medication overdose and wearoff. 2015-02-22 10:27:57 +01:00
Glowbal
fa2d0c6b06 Specified bleeding rate more accurately for subclasses 2015-02-22 09:40:36 +01:00
Glowbal
8e539bfb56 Added ability to use subclasses for injuries. 
Allows for usage of minor, medium and large injury variants.
 2015-02-22 09:27:01 +01:00
PabstMirror
8945f99be1 Fix CurrentChannel 
GVAR -> FUNC
onEachFrame exits when channel control is closed
 2015-02-21 21:19:54 -06:00
PabstMirror
11be8f6f8f Merge pull request #156 from KoffeinFlummi/nightVisionCleanup 
Night vision cleanup
 2015-02-21 20:21:04 -06:00
Glowbal
e091ba1fd1 Added hasMedicalEnabled 2015-02-22 00:49:38 +01:00
Glowbal
e21046459e Fixed location checking in treatment call 2015-02-22 00:47:14 +01:00
Glowbal
ab045e49c8 Fixed incorrect function calls for location 2015-02-22 00:45:58 +01:00
Glowbal
1781629c13 Added isMedic, isMedicalVehicle, isInMedicalFacility and hasTourniquetAppliedTo functions. 2015-02-22 00:44:11 +01:00
Glowbal
b9213e8abc Added use and has item functions for medical 2015-02-22 00:34:16 +01:00
Glowbal
c2b8e9031f Increased the type and causes of injuries for advanced medical. 2015-02-22 00:25:07 +01:00
Glowbal
73c91af533 Added separate config parsing for basic and advanced 2015-02-22 00:24:50 +01:00
Glowbal
3f12af8b21 Added onTreatmentCompleted event calls 2015-02-21 23:17:20 +01:00
Glowbal
e5941e55fc Added reactionToDamage and onTreatmentCompleted event 2015-02-21 23:14:21 +01:00
Glowbal
925aa094c7 Added place in bodybag function 2015-02-21 21:53:07 +01:00
Glowbal
46f28763b6 Added triage card and activity log 2015-02-21 21:47:10 +01:00
Glowbal
0d24ad5c0a Removed outdated injury defines file 2015-02-21 21:33:07 +01:00
Glowbal
95ff4b151c Added addHeartRateAdjustment function 2015-02-21 21:32:25 +01:00
Glowbal
72e2690b81 Fixed incorrect animation function call 2015-02-21 21:28:59 +01:00
Glowbal
909a87fdd3 Added tourniquet treatment functions 2015-02-21 21:26:39 +01:00
Glowbal
308e165cb6 Fixed headers 2015-02-21 21:25:37 +01:00
Nicolás Badano
6b7f649244 interact_menu: add headers 2015-02-21 17:11:03 -03:00
Glowbal
ead5f2ee79 Added new injury and treatment systems for advanced medical 2015-02-21 21:10:57 +01:00
Glowbal
b3e7431e67 Added new treatment framework 2015-02-21 21:09:57 +01:00
Garth L-H de Wet
2ad0aab2bb Merge branch 'master' into explosiveInteraction 2015-02-21 13:17:08 +02:00
KoffeinFlummi
3482633fb1 Basic treatment structure 2015-02-20 22:04:01 +01:00
Nicolás Badano
96abddc31b Ability to link a belt of ammo to an AR's machinegun while he's firing. Non stop suppresion! 2015-02-20 02:45:17 -03:00
Nicolás Badano
2c05db3ffb Create an interaction point for the current weapon 2015-02-20 02:04:00 -03:00
PabstMirror
9935ac57bd Base Cleanup 
Headers
Formating
Small optimizations
 2015-02-19 19:32:41 -06:00
Garth L-H de Wet
9d1b1e1b12 Explosives are now placed first and then the trigger is set afterwards. 2015-02-20 03:28:16 +02:00
Nicolás Badano
908f23a78f Removed filtering actions 2015-02-19 20:10:07 -03:00
PabstMirror
3511a74ef9 Don't show sound if not enabled 2015-02-19 16:59:21 -06:00
Garth L-H de Wet
477d8c9dec Merge remote-tracking branch 'origin/selfInteractionMenu' into explosiveInteraction 2015-02-20 00:46:56 +02:00