d2eb08594b
Merge branch 'master' into fixUAVandInteractionInhert
...
Conflicts:
addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
2015-05-27 00:36:43 -05:00
c924baefd7
All instances of time and diagTicktime changed to ACE_time / ACE_diagTime.
2015-05-21 09:42:44 -07:00
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
3daec7d98d
Fix UAV and Interaction Compile Inheritance
2015-05-17 13:51:59 -05:00
2158f467f4
#1171 - Safe get variables if settings not defined
2015-05-14 15:29:09 -05:00
f17c7c12a6
Fixed object actions not working
2015-05-14 16:56:32 -03:00
4a074d4e31
Replace BIS_fnc_sortBy by sort for interact_menu occlusion
2015-05-14 10:54:22 -03:00
5ef29c2354
Merge remote-tracking branch 'origin/master' into interactionOclusion
...
Conflicts:
addons/interact_menu/functions/fnc_keyDown.sqf
2015-05-14 10:39:02 -03:00
1827d8ad95
Fix #1024 - Adjust self iMenu for wave height
2015-05-12 16:04:42 -05:00
996c342087
Merge pull request #994 from acemod/imenumisclick
...
don't close menu when no action is selected
2015-05-06 13:31:07 -07:00
d07b69aca4
Increase the minimum distance required to perform LOS checks to 1.5m; should avoid LOS checks for medical bodyparts entirely, thus avoiding problems with weaponholders obstructing actions.
2015-05-04 13:37:14 -03:00
f44aaee7c7
also in cursor mode
2015-05-02 23:02:40 +02:00
0fd783082d
don't close menu when no action is selected
2015-05-02 22:53:23 +02:00
e6c333bff4
Fix oclusion when self-interacting
2015-05-02 14:54:57 -03:00
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
fae10aa731
Replace dialog by display.
2015-05-02 01:33:28 -03:00
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
fc02bb4e06
Stylistic changes
2015-05-01 00:32:16 -03:00
aa4a5539d4
Merge branch 'master' into interactMoreOptions
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
2015-05-01 00:04:22 -03:00
984a1fe337
Rename breakLine to break_line
2015-05-01 02:14:23 +02:00
090062153c
Merge branch 'master' into interactMoreOptions
...
Conflicts:
addons/interact_menu/config.cpp
2015-04-30 15:36:00 -05:00
ba18f8b430
Handle Scaling
2015-04-30 14:07:19 -05:00
8c8e310d66
handle cursor mode
2015-04-30 21:00:30 +02:00
5ec8b6d36c
Merge branch 'master' of https://github.com/acemod/ACE3 into menuonclick
2015-04-30 20:01:58 +02:00
11aafe013b
Localization
2015-04-29 23:53:00 -05:00
9aa2e3130a
Options for Shadow/Outline and Text Size
2015-04-29 23:37:52 -05:00
e40a2a524d
Merge branch 'master' into interactMoreOptions
2015-04-29 22:57:35 -05:00
47d4446520
Don't check intersection if distance < 1m
...
Related to #869
2015-04-29 02:34:47 -05:00
d7d43ce3b1
#828 - Private Variables for Interact Menu
2015-04-29 01:26:13 -05:00
9e8b13cd2b
Merge branch 'master' into altSelfInteract
...
Conflicts:
addons/interact_menu/functions/fnc_renderIcon.sqf
addons/interact_menu/functions/fnc_renderSelector.sqf
addons/interact_menu/stringtable.xml
2015-04-28 14:02:03 -05:00
5320f4c6b7
fix broken parse text cache in some cases
2015-04-26 19:33:08 +02:00
f96deadd20
imenu: remove shadow, fix caching
2015-04-26 12:41:15 +02:00
898d6c74a8
#854 - No canInteractWith check for Ace_MainAction
...
Was preventing subactions from showing.
2015-04-25 16:02:59 -05:00
ca6a559557
Fixed a typo
2015-04-25 21:18:09 +02:00
fc49814689
Use FUNC(ctrlSetParsedTextCached) for the selector too. Eliminates glitches
2015-04-25 10:52:52 -03:00
b7763331d6
the index
2015-04-25 14:34:09 +02:00
73b17efa2f
cache ctrlSetStructedText parseText
2015-04-25 13:28:21 +02:00
73f387d3e3
outline interaction menu text
2015-04-25 11:55:39 +02:00
664d08d4aa
add option to only use action when clicking
2015-04-25 08:23:54 +02:00
c8563ce484
Add LOS check for actions points. Close #785
2015-04-24 00:57:22 -03:00
96be881ea9
User changeable text/shadow colors for interaction
2015-04-20 18:28:01 -05:00
9295393dd6
Allow cursor for interactions
2015-04-20 13:54:51 -03:00
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
8b389949bc
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2015-04-18 18:42:11 -03:00
bce0d84989
Fix interact menu object ordering
2015-04-18 18:41:36 -03:00
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
dd09cc4d06
Update fnc_createAction.sqf
...
typo
2015-04-16 00:57:15 +03:00
5faf4b7dfa
Remove comment
2015-04-15 01:27:29 -03:00
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
7ad9238bbf
Fixes
2015-04-14 23:32:03 -03:00
