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,540 Commits 73 Branches 88 Tags 752 MiB
655f23b53c
Commit Graph

1540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
655f23b53c start carrying phase 2015-03-24 21:37:27 +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
PabstMirror
3ab033065f #233 - Clean up mDAGR interaction menu 
Adds exception to use on map (also for base ACE_equipment)
selfInteract has 3 options [close, show minimap, show dialog] (only 2
possible shown at any time)
Keybinds are just toggle and close
 2015-03-24 03:50:06 -05:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
Nicolás Badano
bc0dae63ca Fix #173 2015-03-24 00:57:03 -03:00
Nicolás Badano
58ea333b42 Fix #236 2015-03-24 00:34:41 -03:00
Nicolás Badano
8767a0d6ac Fix #206 2015-03-24 00:30:15 -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
Nicolás Badano
17d0c0ae38 Various tweaks on interact_menu styling to improve usability 2015-03-24 00:15:22 -03:00
Nicolás Badano
70ffefde10 Possibly close multiple dialogs when interact_menu is opened 2015-03-23 21:26:40 -03:00
Nicolás Badano
65d3e312d1 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-23 20:03:08 -03:00
Nicolás Badano
f64092f09c Close dialogs when pressing the interaction k 2015-03-23 20:02:30 -03:00
PabstMirror
ed3fc5919f #231 - Close DAGR if player dead/null 2015-03-23 17:34:40 -05:00
Nicolás Badano
50f5e2c858 Change the interact_menu selector to be a control. Makes it work reliably when surrendered 2015-03-23 19:16:10 -03:00
Nicolás Badano
a432f74a6b Make self interact_menu finally work on the map screen!! 2015-03-23 18:26:20 -03:00
Nicolás Badano
75a09357aa Properly configure canInteractWith and exceptions for self interaction 2015-03-23 18:08:58 -03:00
Nicolás Badano
eb557bf777 Make interac_menu work in real 2D: 
- Children positions are calculated directly on screen space
- Saves a lot of worldToScreen, ATLtoASL, etc calls
- Selector is now a control instead of a 3D icon
 2015-03-23 18:08:31 -03:00
PabstMirror
20362e8dc9 Cleanup exception names 2015-03-23 15:22:26 -05:00
PabstMirror
ef3b411c6c Close dagr when dropping item 2015-03-23 15:02:20 -05:00
Nicolás Badano
ba9fce8636 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-23 16:53:56 -03:00
Nicolás Badano
dbbfdd88df Forgotten line 2015-03-23 16:53:28 -03:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
PabstMirror
17eddb089b Missing Semicolon 2015-03-23 13:57:16 -05:00
PabstMirror
2329212060 Medical Action Stringtable 2015-03-23 13:52:26 -05:00
PabstMirror
14d6db4596 Merge pull request #183 from KoffeinFlummi/microDAGR 
MicroDAGR
 2015-03-23 13:24:37 -05:00
bux578
cdb6a1f947 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-23 18:43:00 +01:00
Nicolás Badano
c8b6f6dc78 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-23 14:02:06 -03:00
Nicolás Badano
bf1d808b82 Small optimizations on interact_menu 2015-03-23 14:01:38 -03:00
Nicolás Badano
1e5a194bf6 Optimize ace_common_fnc_toHex 2015-03-23 12:16:50 -03:00
bux578
1114e12186 add first batch of module icons, naming conventions 2015-03-23 13:56:59 +01:00
PabstMirror
d6ad0e15b4 Move wep_dragon to toMerge 
Always throws error during compile
Has multiple references to Arma2 assets.
 2015-03-22 17:34:28 -05:00
Glowbal
cb63302926 Merge pull request #193 from KoffeinFlummi/Medical_Dragging 
Medical: Carry, drag and dropping of a unit
 2015-03-22 23:30:32 +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