1310 Commits

Author	SHA1	Message	Date
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
Nou	12cadc603f	Fragmentation enabled.	2015-03-21 21:22:16 -07:00
Nicolás Badano	08eb40a606	Merge pull request #209 from KoffeinFlummi/disposableCleanup ... Disposable cleanup	2015-03-21 20:44:38 -03: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	32be87806b	Clear the caches again after performing the action, cause it's very possible something changed as a result.	2015-03-21 20:37:01 -03:00
Nicolás Badano	6a83d0d9fc	clear canTreat caches before calling the last condition	2015-03-21 20:33:25 -03:00
Nicolás Badano	323aa156d1	Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into clearCacheOnEvents	2015-03-21 20:31:01 -03:00
Nicolás Badano	2beb1a289e	Ensure the condition of the action is always checked uncached before calling the statement.	2015-03-21 20:30:27 -03:00
Nicolás Badano	71c79e7785	Merge pull request #214 from KoffeinFlummi/clearCacheOnEvents ... Added to cachedCall an option to clear the cache on an event	2015-03-21 20:15:10 -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
commy2	1bf13cea34	remove obsolete camera eh from agm	2015-03-21 22:13:36 +01:00
Nicolás Badano	87b1458dc0	Fix debug stuff	2015-03-21 18:09:42 -03: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
commy2	1b8a9290cd	remove obsolete custom eh from agm	2015-03-21 21:56:22 +01:00
commy2	cefd8d5c54	Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3	2015-03-21 21:51:48 +01:00
commy2	1d4249a825	macros	2015-03-21 21:51:27 +01:00
Nicolás Badano	213b817947	Added to cachedCall an option to clear the cache on an event	2015-03-21 17:50:35 -03: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
Nicolás Badano	274dae9a02	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-21 14:28:33 -03:00
Nicolás Badano	dbb9765035	Fix isSubPath	2015-03-21 14:28:17 -03:00
PabstMirror	054f21eede	+2more	2015-03-21 12:18:19 -05:00
PabstMirror	8a9ac4147f	Update $PBOPREFIX$ ... Only getting error on server, not client `Warning Message: Script z\ace\addons\gforces\XEH_preInit.sqf not found`	2015-03-21 12:14:38 -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
PabstMirror	0e6f76b50b	Cannot drop attachements because of duplication	2015-03-21 10:35:21 -05: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
Felix Wiegand	8fac4b5798	Merge pull request #192 from KoffeinFlummi/medical-basic ... Basic Medical Tweaks	2015-03-21 14:41:46 +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
KoffeinFlummi	75517f7ce4	Replace setDamage with setDead	2015-03-21 14:40:23 +01:00
Nicolás Badano	f5f91c4802	Merge branch 'master' of github.com:KoffeinFlummi/ACE3	2015-03-21 10:24:01 -03:00
Nicolás Badano	83d9aa4bb6	Replace tap shoulder and check (others) ammo animations by PutDown	2015-03-21 10:23:36 -03:00