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
IngoKauffmann
ab31891b8d
runOnHover can now be CODE
...
Expanded render, compileMenu, compileMenuSelfAction so runOnHover can be
CODE
2015-05-28 18:16:05 +02:00
PabstMirror
08aeda11df
Merge branch 'master' into userActionPrototype
2015-05-27 12:33:20 -05:00
PabstMirror
d2eb08594b
Merge branch 'master' into fixUAVandInteractionInhert
...
Conflicts:
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
2015-05-27 00:36:43 -05:00
esteldunedain
22b83826f0
Bandaid for #1281 , until we properly solve unreliable init handlers. 1- Menus for CAManBase are precomputed on preInit 2- Class action menus for all men are supposed to be equal to those of CAManBase Note: we loose the capability of defining actions for specific classes from config (which we don't do on ACE annyway)
2015-05-20 17:15:25 +02:00
PabstMirror
3daec7d98d
Fix UAV and Interaction Compile Inheritance
2015-05-17 13:51:59 -05:00
PabstMirror
d2fdeb5e96
Allow Skipping LOS Check (Because of doors)
2015-05-02 00:13:09 -05:00
esteldunedain
324b9510e3
Allow positions for actions to be computed dynamically. Also leverage that for the position of the "Weapon" action, instead of hard coding an exception for that.
2015-05-01 01:56:39 -03:00
PabstMirror
d7d43ce3b1
#828 - Private Variables for Interact Menu
2015-04-29 01:26:13 -05:00
PabstMirror
898d6c74a8
#854 - No canInteractWith check for Ace_MainAction
...
Was preventing subactions from showing.
2015-04-25 16:02:59 -05:00
esteldunedain
bdd3422150
Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc
2015-04-16 23:53:54 -03:00
jaynus
b39209cc28
BAD @esteldunedain! BAD DOGGY!
2015-04-14 17:09:13 -07:00
esteldunedain
ee04ea2f41
Allow actions on coordinates instead of selections
2015-04-14 20:21:11 -03:00
Nicolás Badano
5e79970740
Switching nicknames
2015-03-24 01:18:00 -03:00
Nicolás Badano
84bf44e026
Refactoring of interact_menu:
...
- Reordering of action members
- Removed full path from actions, so they can be mounted under different paths if needed
- Added api for creating actions
- Api for adding actions for objects or classes
2015-03-19 23:32:44 -03:00
Nicolás Badano
acd3ca0d56
Interact menu:
...
- Allow dynamically adding children actions just-in-time
- Added optional custom parameters for actions
2015-03-19 13:00:10 -03:00
commy2
b5f307919e
replace canInteract with canInteractWith
2015-03-15 13:00:10 +01:00
Nicolás Badano
d02b5d2125
Ensure the class actions are compiled from config before adding them from the API
2015-03-11 16:26:58 -03:00
Nicolás Badano
f12e4ab751
Add the runOnHover parameter
2015-03-11 00:37:59 -03:00
Nicolás Badano
83572921ae
- Modification of actions data structure to separate action parameters from children
...
- The action tree of each interaction point is parsed before drawing, pruning inactive actions
- Parent actions without statements or active children are not drawn, in order to reduce clutter
2015-03-02 23:29:57 -03:00
Nicolás Badano
85a77150c9
- Add cursored self interaction menu (for using inside vehicles)
...
- Renamed the base menu "SelfActions" to "ACE_SelfActions"
- Limit the amount of objects the player is shown interactions with. This are the 3 nearest objects which have active action points visible on screen.
- Cull action points that are not visible, to far away, etc before checking if they are active.
2015-02-28 17:48:46 -03: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
6b7f649244
interact_menu: add headers
2015-02-21 17:11:03 -03:00
Nicolás Badano
908f23a78f
Removed filtering actions
2015-02-19 20:10:07 -03:00
Nicolás Badano
f7d5d615ee
allow actions to be defined for different selections
2015-02-19 15:36:27 -03:00
Nicolás Badano
d055315661
interact_menu: tab to space
2015-02-19 10:49:36 -03:00
Nicolás Badano
b6dbd8d3c4
interact_menu: add canInteract (including exceptions) and canInteractWith to condition.
2015-01-20 02:41:04 -03:00
Nou
84f404ae84
Remove debug, added scripted add/remove actions.
2015-01-18 20:08:34 -08:00
Nou
6a04408a74
Initial nou menu commit.
2015-01-18 10:38:27 -08:00