Commit Graph

50 Commits

Author SHA1 Message Date
Brett
8b4e8a61ac Split interaction menu settings between interaction and self interaction (#6609)
* Split interaction menu settings between interaction and self interaction

* consistent spacing
not sure which way is wanted here, but I might as well be consistent in 
my own PR

* remove useless code, fix use of backgroundMenu

* clean up from Dystopian

* use existing stringtable

* remove redundent localize

* Use LLSTRING, split UseListMenu

* style fixes

* style fixes

* add movedToSQF to old settings

* condense ifs

* Don't use cursorKeepCentered as default
2019-12-07 19:44:04 -06:00
PabstMirror
bcbffcff26
Interact Menu - Don't show interactions for virtual units (#7271)
* Interact Menu - Don't show interactions for virtual units

* be consistant
2019-12-07 14:58:44 -06:00
commy2
0fd442451f Interaction Menu - fix a crash when loading savegames (#7115)
* fix a crash when loading savegames

* fix a variable name

* optimize

* Put CAManBase actions into seperate bucket

* Apply suggestions from code review

Co-Authored-By: commy2 <commy-2@gmx.de>

* Fast exit for All

* CaManBase

* can't skip mans
2019-08-01 20:52:20 -05:00
PabstMirror
3ee3c5de5a
Interact Menu - Cache config actions for CAManBase (#6818)
* Interact Menu - Cache config actions for CaManBase

* Update addons/interact_menu/functions/fnc_compileMenu.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Update addons/interact_menu/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-02-22 18:54:07 -06:00
PabstMirror
ff5eb34e10
Interaction Menu - Only compile self actions when needed (#6792)
* Interaction Menu - Only compile self actions when needed

* Update XEH_clientInit.sqf

* fix spellling

* format/comments

* Don't compile actions on headless servers

* Update addons/zeus/XEH_postInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-01-31 19:25:16 -06:00
mharis001
e9af086454 Interaction Menu - Add ability to change selector color (#6292)
* Add selector color changing

* Setup colors once at init
2018-04-28 17:23:44 -05:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
commy2
da70854568 manual merge 2016-05-18 11:48:27 +02:00
commy2
7c2977ed47 Merge pull request #3150 from acemod/fixinteractmenusavegame
reset interaction menu time variables on save game load
2016-03-10 23:46:37 +01:00
commy2
6a58af5b33 fix save game crash?, ref #3397 2016-03-06 06:22:38 +01:00
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
commy2
80ea079827 reset interaction menu time variables on save game load 2016-01-12 19:32:26 +01:00
PabstMirror
dd979676fd Remove use of CAManBase for all mans
End use of bandaid from #1294
2016-01-09 22:05:40 -06:00
PabstMirror
93d2035fed #1984 - Always make sure ACE_MainActions exists
Also add debuging output when adding action with no parent
2015-08-02 15:33:16 -05:00
PabstMirror
5e80f9d8d3 Merge branch 'master' into userActionPrototype 2015-07-01 15:04:40 -05:00
SilentSpike
25f613b712 Initial implementation of static zeus menu 2015-06-04 23:24:57 +01:00
PabstMirror
08aeda11df Merge branch 'master' into userActionPrototype 2015-05-27 12:33:20 -05:00
jaynus
c924baefd7 All instances of time and diagTicktime changed to ACE_time / ACE_diagTime. 2015-05-21 09:42:44 -07: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
78dec5debc Merge branch 'master' into userActionPrototype
Conflicts:
	addons/interact_menu/XEH_preInit.sqf
2015-05-16 22:49:09 -05:00
PabstMirror
d4225e03d2 Split into functions (for future caching) 2015-05-02 23:13:35 -05:00
esteldunedain
1735047e3c Make closer action points oclude farther ones. Improves the clutter of the interact menu when interating with a person from the side. Close #738 2015-05-02 14:37:58 -03:00
esteldunedain
fae10aa731 Replace dialog by display. 2015-05-02 01:33:28 -03:00
PabstMirror
334647fa60 Merge branch 'master' into userActionPrototype 2015-05-01 22:55:35 -05:00
commy2
73b17efa2f cache ctrlSetStructedText parseText 2015-04-25 13:28:21 +02:00
PabstMirror
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05:00
esteldunedain
f928f37e26 Eliminate interact_menu fps drops due to high nearby object counts.
Instead of reanalizing every frame which actions points should be rendered based on distance, that job is now done only 5 times per second.
The rest of the frames the action points from the last frame are rerendered..
Close #434
2015-04-20 01:16:51 -03: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
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
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
Nicolás Badano
2beb1a289e Ensure the condition of the action is always checked uncached before calling the statement. 2015-03-21 20:30:27 -03:00
Nicolás Badano
4a8b5079a6 Fix #211 2015-03-21 09:37:01 -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
a3b913ad8b Interact menu usability improvements:
- Submenu scale as a function of the number of children
- Added menu expansion animation to better communicate where the options come from
- Unused action point are faded as soon as the user hovers a certain action point
2015-03-19 15:04:48 -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
Nicolás Badano
8c7a51eac7 Added addClassAction and removeClassAction functions 2015-03-11 01:43:37 -03:00
Nicolás Badano
722f49acc4 Execute statement when hovering over actions that open submenus 2015-03-11 00:21:05 -03:00
Nicolás Badano
b33127d3b0 Renamed variable 2015-03-10 23:45:46 -03:00
Nicolás Badano
27808847db - Solve a number of ASL vs ATL issues
- Replace the way of calculating 3D positions for subactions
2015-03-03 01:37:17 -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
094be22a19 Move collect children on a sepparate function 2015-03-02 17:53:30 -03:00
Nicolás Badano
2371bc1bb0 Removed the renderDepth variables 2015-02-27 02:35:37 -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
0dfeb22ec8 tidy up 2015-02-19 18:03:14 -03:00
Nicolás Badano
043987fc93 basic self actions 2015-02-18 18:58:06 -03:00
PabstMirror
9631154926 Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06: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