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 |
|
Glowbal
|
4995016a66
|
Switched to canInteractConditions
|
2015-03-22 20:59:57 +01:00 |
|
Glowbal
|
7bc6fa3c3b
|
Disable interaction for objects
|
2015-03-22 20:39:22 +01:00 |
|
Glowbal
|
6eac193825
|
Replaced deleting of body by hiding it
|
2015-03-22 20:37:55 +01:00 |
|
Glowbal
|
2d2687e759
|
Added self interact items
|
2015-03-22 17:28:48 +01:00 |
|
Glowbal
|
dd7dad1b90
|
define base class
|
2015-03-22 17:05:31 +01:00 |
|
Glowbal
|
f252b2c96f
|
advanced medical JIP improvements
|
2015-03-22 17:04:42 +01:00 |
|
Glowbal
|
8b4c0c0e36
|
fixed postInit depending on setting
|
2015-03-22 15:16:42 +01:00 |
|
Glowbal
|
be9c09b605
|
Added cfgPatches dependancy on ace_modules
|
2015-03-22 12:49:04 +01:00 |
|
Glowbal
|
281bad1e7e
|
Use of the ACE module instead of Module_F.
|
2015-03-22 12:44:26 +01:00 |
|
Glowbal
|
55e7e768ca
|
removed systemChat messages
|
2015-03-22 11:21:17 +01:00 |
|
Glowbal
|
5063e9cff9
|
fixed config duplicate entry
|
2015-03-22 11:21:08 +01:00 |
|
Glowbal
|
ac4309237b
|
Added drag/carry actions
|
2015-03-22 10:28:41 +01:00 |
|
Glowbal
|
0428a1d558
|
Added canDrag
|
2015-03-22 10:28:33 +01:00 |
|
Glowbal
|
7b519fc2e0
|
Merge branch 'master' into Medical_Dragging
Conflicts:
addons/medical/XEH_postInit.sqf
addons/medical/stringtable.xml
|
2015-03-22 09:46:58 +01:00 |
|
Nicolás Badano
|
5dcf29ba80
|
Merge pull request #212 from KoffeinFlummi/interactivePelvis
Move main interactions to pelvis; leave torso for medical
|
2015-03-21 20:44:18 -03:00 |
|
Nicolás Badano
|
6a83d0d9fc
|
clear canTreat caches before calling the last condition
|
2015-03-21 20:33:25 -03:00 |
|