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
2,094 Commits 73 Branches 88 Tags 752 MiB
b318d2cced
Commit Graph

453 Commits

Author SHA1 Message Date
Glowbal
32625b446b fixed animation being reset even when inside a vehicle 2015-04-05 13:03:09 +02:00
Glowbal
cf1f641424 Moved selfActions to a separate hpp file 2015-04-05 13:02:55 +02:00
jaynus
ab0d289762 Merge remote-tracking branch 'origin/master' into lasers 2015-04-04 16:56:03 -07:00
esteldunedain
f417fa2285 Add medical actions while boarded. 2015-04-04 19:41:12 -03:00
Glowbal
7f9043897c wake up by epinephrine in revive state 2015-04-04 22:50:38 +02:00
Glowbal
551c36d690 fixed treatment didnt work inside vehicles 2015-04-04 22:48:52 +02:00
Glowbal
77d39877d2 Merge branch 'master' into medicalImprovements 2015-04-04 22:01:15 +02:00
Glowbal
a56e8745c3 fixed module settings 2015-04-04 21:59:18 +02:00
Glowbal
d37094dc7a Work around for self treatment when cursorMenu from interact is used. 
Executing it one frame later works fine, but otherwise the loading bar will fail.
 2015-04-04 21:52:00 +02:00
Glowbal
5c3ee0dd1a Added settings to modules & fixed medicalVehicle module 2015-04-04 21:51:18 +02:00
Glowbal
89ec817ce3 Added setting for litter cleanup delay 2015-04-04 21:26:41 +02:00
Glowbal
1d33ce52b3 added support for adjustable settings for consumeItem and medicalLevel 2015-04-04 21:20:24 +02:00
Glowbal
93d9088410 fixed cardiac arrest 2015-04-04 21:20:03 +02:00
Glowbal
e3aaac7005 Only select primary weapon if no current weapon is selected 2015-04-04 20:49:30 +02:00
Nicolás Badano
5f4030469f Merge pull request #309 from KoffeinFlummi/closeInteractMenu 
Close interact menu when knocked out
 2015-04-04 15:35:00 -03:00
Glowbal
e78fc55b45 changed; When standing before treatment, the caller will now move into crouch instead of standing up again. 2015-04-04 20:21:52 +02:00
Glowbal
ddb01e7865 Improved unconscious wakeup animations 2015-04-04 20:21:06 +02:00
Glowbal
2420db78a1 CreateLitter now supports conditions and is selection specific. 
Format:
litter[] = {
   {"SelectionName", "Condition", {"litterClassname"} },
   ...
};

The array with litter classnames also support 2d arrays. ie:
{"SelectionName", "Condition", {{"litterClassname"}} }
Of array entries it will select a random classname.
 2015-04-04 20:20:29 +02:00
Glowbal
08e1949078 Improved patient unconscious animation 2015-04-04 18:08:41 +02:00
Glowbal
31b7ade057 Support unconscious animation for patient upon treatment 2015-04-04 17:33:20 +02:00
esteldunedain
d090b3328c - Close interact_menu when the player falls unconscious 
- Prevent all types of interactions while unconscious
 2015-04-04 12:25:49 -03:00
Glowbal
48758ff0e3 fixed incorrect typeNames 2015-04-04 16:59:52 +02:00
Glowbal
b54179696a fixed basic revive 2 2015-04-04 16:28:09 +02:00
Glowbal
18900cb82c fixed revive for basic 2015-04-04 16:27:44 +02:00
Glowbal
3a117e9b4d fixed incorrect unit used for fullheal (was healing caller) 2015-04-04 16:26:49 +02:00
Glowbal
914c5ffd0f fixed bandage optional parameter 2015-04-04 12:14:21 +02:00
Glowbal
7c296c413d Litter has a more random spread 2015-04-04 12:13:55 +02:00
Glowbal
d81dcba543 Added more litter variants 2015-04-04 12:13:42 +02:00
Glowbal
2645b102f0 Replaced waitAndExec for single PFH with 30s delay 2015-04-04 02:28:14 +02:00
PabstMirror
07dfe52133 Remove Duplicate Mortar Code (inherit from statics) 
Before an action added to staticWeapon wouldn't be applied to mk6 mortar
 2015-04-03 19:07:13 -05:00
Glowbal
83fbc1ff10 Added setting to toggle litter creation on/off 2015-04-04 01:47:56 +02:00
Glowbal
7f45d25ee5 Added litter for medical treatment 2015-04-04 01:42:13 +02:00
Glowbal
4ac77bceab Model fixes and imports 2015-04-04 01:09:44 +02:00
Glowbal
5e0f5b8b94 Added full heal/PAK for basic 2015-04-04 00:31:12 +02:00
Glowbal
7230687ea2 corrected revive setting classes 2015-04-04 00:30:59 +02:00
Nou
6541600d44 Switch everything to use modelToWorldVisual instead of modelToWorld. 2015-04-03 15:26:27 -07:00
Glowbal
d3c9d111e1 fullHeal now resets reviveState 2015-04-03 23:58:46 +02:00
Glowbal
4ddb496d8b Added max Revive lives 2015-04-03 23:56:32 +02:00
Glowbal
36288fce43 Updated medical action config. 
Added bodybag action
Added Tourniquet action to basic.
Added more displayNameProgress entries.
Removed deadcode
 2015-04-03 22:59:28 +02:00
Glowbal
a6ce961ca1 Usage of isBeingCarried and isBeingDragged 2015-04-03 22:45:16 +02:00
Glowbal
244bac8562 Merge branch 'master' into medicalAdvanced 2015-04-03 22:42:09 +02:00
Glowbal
05389e7e25 Implemented useItems for treatment (basic and adv) 
Will remove items on treatment start. Add again on treatmentFailure.
Based upon consumeItem config setting.
 2015-04-03 22:40:36 +02:00
Glowbal
038ed5f23e Removed deprecated returnDamage parameters 2015-04-03 21:59:47 +02:00
Glowbal
1ef262c119 Support for enableOverdosing setting in advanced 2015-04-03 21:53:58 +02:00
Glowbal
c3ddbb4be7 Prevent the usage of the blood loss coefficient to increase blood volume on bleeding 2015-04-03 21:51:44 +02:00
Glowbal
ecf16ad9f1 fixed prevent instant death setting 2015-04-03 21:49:46 +02:00
PabstMirror
604e851423 Medical - isBeingCarried 2015-04-03 14:37:04 -05:00
Glowbal
d4a6dd1038 Removed the options to enable fractures and airway through mission module 2015-04-03 21:32:49 +02:00
Glowbal
1b02cb2e82 examine actions now use activity log 2015-04-03 21:03:39 +02:00
Glowbal
43efc21f27 Only display the activity log in the activity list. 2015-04-03 21:03:22 +02:00
Glowbal
8881de4a07 Removed activity log background, made wider. Added shadow to text. 2015-04-03 21:02:56 +02:00
Glowbal
8d7ac1f930 Added selected bodypart text 
Changed "No injuries on bodypart" to still display if the generic messages have entries
 2015-04-03 20:26:24 +02:00
PabstMirror
254a25b139 Medical - isBeingDragged func 2015-04-03 13:16:48 -05:00
Glowbal
b92978fb80 Now resets the proper hasMovedOut value 2015-04-03 20:11:20 +02:00
Glowbal
e68e487769 fixed units not moving out of unconscious animation 2015-04-03 20:07:39 +02:00
Glowbal
d5f0cf5cbd Incorrect value for airwayStatus 2015-04-03 20:06:53 +02:00
Glowbal
14e00940cd fixed incorrect airwayStatus values for initialization (adv medical) 2015-04-03 18:59:22 +02:00
Glowbal
368002cc79 fixed undefined _selectionName variable #289 2015-04-03 08:48:10 +02:00
Glowbal
045ea02da0 Changed: CPR is now only possible when a unit is in cardiac arrest (Adv) 2015-04-03 00:10:12 +02:00
Glowbal
b399768798 Changed postInit wound sync to playerChanged eventhandler. 2015-04-03 00:04:41 +02:00
Glowbal
c174ccf396 fixed script error when performing treatment with secondary weapon selected 2015-04-02 22:58:00 +02:00
Glowbal
57b093f845 Added minimum lethal damage for injury types in adv medical 2015-04-02 22:57:35 +02:00
Glowbal
b267a52ec6 Fixed support for custom damage types 2015-04-02 22:57:02 +02:00
Glowbal
6f630d4c03 Changed setUnconscious contract to support a minimum unconscious time 2015-04-02 22:55:23 +02:00
Glowbal
7252966a78 Replaced advanced wounds event sync by regular setvariable public 2015-04-01 20:03:44 +02:00
Glowbal
635f3e31c9 Disable medical carry and drag 2015-04-01 19:56:00 +02:00
PabstMirror
559f0dbaea Unconc - dropping object handled in dragging 2015-03-26 16:32:44 -05:00
PabstMirror
6a71a04ad9 opps 2015-03-26 15:52:30 -05:00
PabstMirror
de644ba9b0 Medical - Reset captive status for respawning unit 2015-03-26 15:49:08 -05:00
PabstMirror
048be00a0f Medical - QGVAR(isUnconscious) -> "ACE_isUnconscious" 2015-03-26 15:47:08 -05:00
PabstMirror
2eefb1265d Medical - morphine icon for left leg 2015-03-26 15:16:28 -05:00
PabstMirror
3f137d357d Medical - carryObj func moved 2015-03-26 15:05:50 -05:00
commy2
9a0f0cb47b stuff from medical 2015-03-26 16:58:41 +01:00
Glowbal
9f540e0473 fixed Missing unconcious effects #253 2015-03-26 08:43:30 +01:00
Glowbal
eb80831525 fixed script error with medical display patient information after check response 2015-03-25 22:18:52 +01:00
bux578
1f3c3ce34b fixed spelling of engl. autoinjector 
http://en.wikipedia.org/wiki/Epinephrine_autoinjector
 2015-03-25 18:22:45 +01:00
Glowbal
b6133eb73e removed diag_log calls 2015-03-24 23:10:03 +01:00
Glowbal
3b17cc68e1 medical_onUnconscious is now a globalEvent instead of targetEvent. 
Feature request by commy.
 2015-03-24 22:10:41 +01:00
Glowbal
975ad5a399 Merge branch 'master' into medical-fixes 
Conflicts:
	addons/medical/CfgVehicles.hpp
 2015-03-24 22:07:15 +01:00
Glowbal
706e159815 Adjusted color of tourniquet message 2015-03-24 22:01:33 +01:00
Glowbal
2f729f67f1 Slightly increased the distance of medical actions 
Removed sub menu medical on torso
 2015-03-24 21:41:03 +01:00
Glowbal
7420f70020 Fixed #232 2015-03-24 21:26:20 +01:00
Glowbal
95489ed627 fixed missing handleDamage EH #235 2015-03-24 21:25:21 +01:00
Glowbal
53e7fe1ba5 fixed #227 2015-03-24 21:08:45 +01:00
Glowbal
f175467813 fixed #241 and #228 2015-03-24 21:08:13 +01:00
Nicolás Badano
77dc50f10f Some more fixes for self interaction inside vehicles 2015-03-24 16:06:03 -03:00
Nicolás Badano
4fb50fa71e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-24 15:44:10 -03:00
Nicolás Badano
8b3648cf8d Configure exceptions for self actions inside vehicles 2015-03-24 15:43:49 -03:00
bux578
05896a55ea fix authors 2015-03-24 19:40:48 +01:00
bux578
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
Nicolás Badano
a823fb2dca Tweaks on action names to: 
- Remove >> for submenus
- Split long action names in two lines
 2015-03-24 00:16:32 -03:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
PabstMirror
2329212060 Medical Action Stringtable 2015-03-23 13:52:26 -05:00
bux578
1114e12186 add first batch of module icons, naming conventions 2015-03-23 13:56:59 +01:00
Glowbal
15edb0bff2 fixes 2015-03-22 23:24:24 +01:00
Glowbal
d7de92c60d Merge branch 'master' into Medical_Dragging 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
 2015-03-22 22:41:36 +01:00
Glowbal
9e43ab5c25 Merge branch 'master' into medical-advanced 2015-03-22 22:37:37 +01:00
Glowbal
4ff849c2fd Merge branch 'master' into medical-advanced 2015-03-22 22:34:07 +01:00
Glowbal
1bb32dcfcb fixed missing condition variable 2015-03-22 22:20:44 +01:00