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,253 Commits 73 Branches 88 Tags 752 MiB
630a2a0f7a
Commit Graph

2253 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
80349658d6 tweak turret functions 2015-03-25 22:50:28 +01:00
Glowbal
eb80831525 fixed script error with medical display patient information after check response 2015-03-25 22:18:52 +01:00
commy2
e007a247d8 detach when entering a vehicle, don't mess up animation insidea vehicle 2015-03-25 21:51:50 +01:00
commy2
01b7d3b213 global setDir on attachTo 2015-03-25 20:45:47 +01:00
commy2
3634eaf568 tweak carry stance req., timeout certain PFH, exit PFH, debug 2015-03-25 20:18:23 +01:00
bux578
02141a2947 add microDAGR to weapons array 2015-03-25 18:23:01 +01:00
bux578
1f3c3ce34b fixed spelling of engl. autoinjector 
http://en.wikipedia.org/wiki/Epinephrine_autoinjector
 2015-03-25 18:22:45 +01:00
commy2
39500110b5 remove disable command menu option - it does nothing 2015-03-25 15:14:22 +01:00
commy2
9b553c1134 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 2015-03-25 15:07:42 +01:00
commy2
50c63b8fb9 don't overwrite input in weapon select, fix: weapon select didn't work in FFV 2015-03-25 15:06:47 +01:00
PabstMirror
a88908d795 Release autotrack when trying to drag map 2015-03-25 09:00:49 -05:00
PabstMirror
600c7aed97 Restore Interaction Icon 2015-03-25 08:57:44 -05:00
commy2
569a77d41b logic 2015-03-25 14:34:19 +01:00
commy2
0c8e8236dd logic 2015-03-25 14:32:36 +01:00
commy2
e1b5b96a7e derped the file 2015-03-25 14:09:49 +01:00
commy2
20882ed694 properly remove fake weapon after carrying persons 2015-03-25 14:07:50 +01:00
commy2
5d950e8fad Merge pull request #247 from KoffeinFlummi/missingModuleIcons 
add missing module icons
 2015-03-25 13:36:20 +01:00
commy2
ebe9d7ed5f carrying unconscious persons 2015-03-25 13:32:59 +01:00
commy2
4ae3c22642 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry 2015-03-25 11:08:13 +01:00
bux578
c44b944044 add missing icons 2015-03-25 06:32:08 +01:00
bux578
074bf4ba6d tab to space 2015-03-25 06:06:04 +01:00
bux578
4fecc1372f add microDAGR to ace misc box 2015-03-25 06:05:06 +01:00
Glowbal
c94b496724 Merge pull request #245 from KoffeinFlummi/medical-fixes 
Medical fixes
 2015-03-24 23:10:25 +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
commy2
655f23b53c start carrying phase 2015-03-24 21:37:27 +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
commy2
12062c0e25 deleting obsolete stuff in common 2015-03-24 20:32:13 +01:00
commy2
34df28d938 cleaning up common 2015-03-24 20:28:44 +01:00
commy2
53a61eb001 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into mediccarry 2015-03-24 20:10:11 +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
7744d5b5fb fix authors #2 2015-03-24 19:43:06 +01:00
bux578
05896a55ea fix authors 2015-03-24 19:40:48 +01:00
bux578
bc7230f043 Merge pull request #222 from KoffeinFlummi/ModuleIcons 
Module Icons
 2015-03-24 19:12:39 +01:00
bux578
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
commy2
749352f0a8 animations, onUnconscious events 2015-03-24 19:07:39 +01:00
commy2
941d98a88d disable all self actions inside vehicles on default 2015-03-24 16:45:10 +01:00
Nicolás Badano
a1d6c052ba Refactored interaction key handling while boarded: 
- Self-interaction key opens up your own self interaction menu
- Interaction key opens interaction options of the vehicle and passengers
 2015-03-24 12:27:27 -03:00
commy2
43846970fa init drag/carry options on persons 2015-03-24 16:12:46 +01:00
commy2
bdc60c074a cleaning up in common 2015-03-24 16:01:53 +01:00
PabstMirror
82042f85f4 Wirecutters: fix error on end mission with keydown 2015-03-24 04:03:16 -05:00
PabstMirror
8346de8150 vehLock disable debug rpt spam 2015-03-24 04:01:20 -05:00