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
1,785 Commits 73 Branches 88 Tags 752 MiB
3e77eb9737
Commit Graph

1785 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nicolás Badano
9fd45fa707 Merge pull request #202 from KoffeinFlummi/vehLock-cleanup3 
Vehicle Lock Cleanup
 2015-03-21 09:51:47 -03:00
Nicolás Badano
4be788a093 Merge pull request #208 from KoffeinFlummi/dynamicInteractMenu 
Dynamic interact menu
 2015-03-21 09:38:18 -03:00
Nicolás Badano
4a8b5079a6 Fix #211 2015-03-21 09:37:01 -03:00
Nicolás Badano
4fe09034ff Merge branch 'master' into dynamicInteractMenu 2015-03-21 08:55:05 -03:00
Glowbal
7c30127ffb Disabled unimplemented medical systems 2015-03-21 10:55:40 +01:00
Glowbal
bc082783c9 check if unit is in a vehicle before checking the vehicle 2015-03-21 10:55:27 +01:00
Glowbal
b5c6e52416 fixed #201 2015-03-21 10:54:52 +01:00
Nicolás Badano
e7d7fa8e6c Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-21 00:27:41 -03:00
Nicolás Badano
14566c783b Prevent canInteractWith from throwing errors if third parameter is not supplied 2015-03-21 00:27:19 -03:00
Nicolás Badano
4210b175c3 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu 
Conflicts:
	addons/interact_menu/functions/fnc_compileMenu.sqf
	addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
 2015-03-21 00:16:52 -03:00
Nicolás Badano
2d6fb7e148 Merge branch 'dynamicInteractMenu' of github.com:KoffeinFlummi/ACE3 into dynamicInteractMenu 2015-03-20 22:45:51 -03:00
Nicolás Badano
3d6660b115 Debug stuff 2015-03-20 22:44:36 -03:00
Nicolás Badano
b3aa7c8970 Make collectActiveActionTree follow mounts correctly 2015-03-20 22:44:25 -03:00
KoffeinFlummi
a060e4bea5 Apply translations to epipen and morphine actions 2015-03-21 00:31:47 +01:00
KoffeinFlummi
b1ed80a23d Remove trailing whitespace in medical stringtable 2015-03-21 00:28:19 +01:00
KoffeinFlummi
510538bc53 Remove superfluous todo 2015-03-21 00:26:14 +01:00
KoffeinFlummi
88fb2765e3 Standardize actions across basic and advanced 2015-03-21 00:21:30 +01:00
PabstMirror
7e383dc10e #198 canInteractWith EGVAR -> EFUNC 2015-03-20 17:55:39 -05:00
KoffeinFlummi
6f8b5cc676 Fix missing dollar sign 2015-03-20 23:53:25 +01:00
KoffeinFlummi
fea63e597e Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-basic 2015-03-20 23:48:42 +01:00
PabstMirror
8840284309 Fix progressBar 2015-03-20 17:46:21 -05:00
commy2
955506dbe8 stuff in to merge folder 2015-03-20 19:56:39 +01:00