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 |
|
PabstMirror
|
3a6995fbec
|
Cleanup medical Item classnames
|
2015-03-21 18:07:50 -05:00 |
|
Felix Wiegand
|
be4f21ea2e
|
Merge pull request #215 from KoffeinFlummi/medical-itemcheck
Medical itemcheck
|
2015-03-21 22:41:06 +01:00 |
|
Glowbal
|
a7d8914884
|
Removed GVAR/QGVAR from items
|
2015-03-21 22:22:28 +01:00 |
|
Glowbal
|
b74eb550b0
|
Added advanced items
|
2015-03-21 22:08:42 +01:00 |
|
KoffeinFlummi
|
58237751b0
|
Woopsie
|
2015-03-21 22:01:20 +01:00 |
|
KoffeinFlummi
|
f6f910fb8a
|
Replace vanilla items with ours.
|
2015-03-21 21:59:08 +01:00 |
|
Glowbal
|
d73f16861b
|
Merge pull request #213 from KoffeinFlummi/medical-advanced
Medical advanced
|
2015-03-21 21:02:35 +01:00 |
|
Nicolás Badano
|
ce3ed988a2
|
Removed debug traces
|
2015-03-21 16:33:59 -03:00 |
|
Glowbal
|
89daf840f6
|
fixed incorrect macro
|
2015-03-21 20:08:52 +01:00 |
|
Nicolás Badano
|
4e32e584be
|
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
|
2015-03-21 15:33:36 -03:00 |
|
Nicolás Badano
|
f8ea603977
|
Added dynamic actions to unload patients (unconscious) from vehicles
|
2015-03-21 15:32:32 -03:00 |
|
PabstMirror
|
9578024693
|
Dupe stringtable entry
`Item STR_ACE_MEDICAL_BANDAGING listed twice`
|
2015-03-21 12:52:08 -05:00 |
|
Glowbal
|
7d6afdf1a9
|
Added triage card option
|
2015-03-21 17:30:49 +01:00 |
|
Glowbal
|
82ec93b84e
|
Medical icons
|
2015-03-21 17:05:32 +01:00 |
|
Glowbal
|
7ae45fbeff
|
Fixed canTreatCached
|
2015-03-21 16:47:51 +01:00 |
|
Glowbal
|
d0b14286ff
|
Wrong function name
|
2015-03-21 16:34:42 +01:00 |
|
Glowbal
|
1d63e94fff
|
canTreatCached
|
2015-03-21 16:33:14 +01:00 |
|
Glowbal
|
8de985d754
|
Added medical icons
|
2015-03-21 15:45:35 +01:00 |
|
Nicolás Badano
|
d7363a6dab
|
Move main interactions to pelvis; leave torso for medical
|
2015-03-21 11:01:38 -03:00 |
|
Glowbal
|
4bcfd1a0ba
|
Merge branch 'master' into medical-advanced
Conflicts:
addons/medical/functions/fnc_handleUnitVitals.sqf
|
2015-03-21 14:54:37 +01:00 |
|
Glowbal
|
946ade63e5
|
Merge branch 'master' into medical-advanced
|
2015-03-21 14:40:59 +01:00 |
|
Glowbal
|
ff5c8e911d
|
Added InteractionMenuClosed event for closing the patient information display
|
2015-03-21 14:40:51 +01:00 |
|
Glowbal
|
77210581f5
|
Added corners to triage card
|
2015-03-21 14:40:26 +01:00 |
|