PabstMirror
6702a1faa4
Fix warnings for WeaponHolderSimulated
2015-09-21 16:34:02 -05:00
PabstMirror
79d985a648
Fix XEH Warning Debug
...
Wait 5 to let supMon run first, and only show visual error if actually
missing pbo.
2015-09-19 10:43:29 -05:00
PabstMirror
88f89b8d76
also check allDeadMen
2015-09-15 13:30:04 -05:00
PabstMirror
a8688609d7
Typo
2015-09-15 13:10:06 -05:00
PabstMirror
0e32c28552
#2437 - Warn users when mods break XEH
2015-09-15 12:55:08 -05:00
SilentSpike
04269831e8
Consider modifier keys for zeus interaction hack
...
The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing
2015-08-31 14:40:31 +01:00
SilentSpike
5b8708a179
Prevent CBA keybindings in zeus interface
...
Checks if the key pressed matches the zeus menu keybind and only fires the code to handle CBA keybinds if true. Should fix the majority of weirdness with keybinds in zeus. However, not perfect as shared keybinds with different modifiers will still fire and it's really an un-ideal workaround.
2015-08-20 18:17:37 +01:00
PabstMirror
5e80f9d8d3
Merge branch 'master' into userActionPrototype
2015-07-01 15:04:40 -05:00
PabstMirror
4a8344e1a4
Merge branch 'master' into userActionPrototype
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
addons/interact_menu/stringtable.xml
extensions/CMakeLists.txt
2015-06-13 15:05:57 -05:00
SilentSpike
cb1b0c6262
Added zeus exception for interaction conditions
2015-06-07 20:21:51 +01:00
SilentSpike
25f613b712
Initial implementation of static zeus menu
2015-06-04 23:24:57 +01:00
jonpas
9fbf256acd
Merge branch 'master' into macroSTR
...
Conflicts:
addons/hearing/functions/fnc_putInEarplugs.sqf
addons/interact_menu/ACE_Settings.hpp
2015-06-04 17:13:09 +02:00
SzwedzikPL
18940d0787
Interaction menu background options
2015-06-03 06:04:47 +02:00
jonpas
d934c25b78
Merge branch 'master' into macroSTR
...
Conflicts:
addons/interact_menu/ACE_Settings.hpp
2015-05-30 19:54:32 +02:00
Glowbal
00acbaf44d
Added blur background client setting
2015-05-29 21:56:07 +02:00
jonpas
763cb07629
Macro STRING to LSTRING
2015-05-28 21:59:04 +02:00
jonpas
6072e14077
Changed all strings to macros (except external)
2015-05-27 19:04:25 +02:00
PabstMirror
58ee797a94
Merge branch 'master' into userActionPrototype
2015-05-13 00:00:55 -05:00
Glowbal
50cc5db92f
fixes #1017
2015-05-05 20:05:31 +02:00
PabstMirror
6c5d72640c
Caching, Optimzations
2015-05-04 14:06:33 -05:00
PabstMirror
d4225e03d2
Split into functions (for future caching)
2015-05-02 23:13:35 -05:00
PabstMirror
334647fa60
Merge branch 'master' into userActionPrototype
2015-05-01 22:55:35 -05:00
commy2
b859956604
rename category ace <blank> to ace common
2015-05-01 10:19:47 +02:00
PabstMirror
090062153c
Merge branch 'master' into interactMoreOptions
...
Conflicts:
addons/interact_menu/config.cpp
2015-04-30 15:36:00 -05:00
commy2
5ec8b6d36c
Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick
2015-04-30 20:01:58 +02:00
PabstMirror
11aafe013b
Localization
2015-04-29 23:53:00 -05:00
PabstMirror
d7d43ce3b1
#828 - Private Variables for Interact Menu
2015-04-29 01:26:13 -05:00
commy2
73b17efa2f
cache ctrlSetStructedText parseText
2015-04-25 13:28:21 +02:00
commy2
664d08d4aa
add option to only use action when clicking
2015-04-25 08:23:54 +02:00
PabstMirror
96be881ea9
User changeable text/shadow colors for interaction
2015-04-20 18:28:01 -05:00
esteldunedain
a9f44530c9
Move the function that prevents firing while the interact_menu is open to the interact_menu pbo
2015-04-15 01:20:20 -03:00
PabstMirror
fda4f60a9e
House UserAction Prototype
2015-04-13 22:19:38 -05:00
esteldunedain
848b5133ef
Remove debug chats for interact_menu
2015-04-04 19:15:29 -03:00
esteldunedain
d090b3328c
- Close interact_menu when the player falls unconscious
...
- Prevent all types of interactions while unconscious
2015-04-04 12:25:49 -03:00
PabstMirror
33ee7dc07c
iMenu - Add some localization and fix veh icons
2015-04-03 00:42:25 -05: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
Nicolás Badano
a432f74a6b
Make self interact_menu finally work on the map screen!!
2015-03-23 18:26:20 -03:00
PabstMirror
0919e59719
Key Bind Redo (except vector)
2015-03-05 01:32:26 -06:00
Nicolás Badano
310710b6e2
Major plumbing upgrades on interact_menu:
...
- Store only one compiled menu per class
- Actions added through apis for invidual objects stored on the object separately
- Replaced the concept of uids by paths. This allows adding/removing actions inside other actions loaded from config seamlessly.
- Temporarily removed caching of nearby actions (probe). We may go back to that if needed pretty easily. This allows the player to move freely with the interaction menu opened.
2015-02-27 01:55:16 -03:00
Nicolás Badano
043987fc93
basic self actions
2015-02-18 18:58:06 -03:00
Nou
ef94011cdc
Menu rendering should be done with the mission event handler for Draw3D because it executes before rendering the current frame, rather than after the current frame.
2015-01-19 15:13:41 -08:00
Nou
6a04408a74
Initial nou menu commit.
2015-01-18 10:38:27 -08:00
