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
10,066 Commits 73 Branches 88 Tags 752 MiB
89ecc81111
Commit Graph

243 Commits

Author SHA1 Message Date
esteldunedain
8da43d25c6 Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly. 2015-07-16 17:28:27 -03:00
PabstMirror
5e80f9d8d3 Merge branch 'master' into userActionPrototype 2015-07-01 15:04:40 -05:00
SilentSpike
f2e5f729e8 Merge branch 'master' into gm_revamp 2015-06-27 18:26:30 +01: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
jonpas
951f9d32c3 Allow interaction menu while sitting 2015-06-09 16:04:37 +02:00
SilentSpike
f193204195 Simplify the renderZeus code 2015-06-08 13:12:27 +01:00
SilentSpike
246d303943 menuClosed event before variable clearing 2015-06-08 13:00:03 +01:00
SilentSpike
cb1b0c6262 Added zeus exception for interaction conditions 2015-06-07 20:21:51 +01:00
SilentSpike
5cc6abd49a Open menu over zeus inerface 2015-06-06 16:20:22 +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
jonpas
d934c25b78 Merge branch 'master' into macroSTR 
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
 2015-05-30 19:54:32 +02:00
PabstMirror
b0bfb7dd43 Fix Ladders - Add User Setting 2015-05-29 13:00:04 -05:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02: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
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
PabstMirror
d2eb08594b Merge branch 'master' into fixUAVandInteractionInhert 
Conflicts:
	addons/interact_menu/functions/fnc_compileMenuSelfAction.sqf
 2015-05-27 00:36:43 -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
3daec7d98d Fix UAV and Interaction Compile Inheritance 2015-05-17 13:51:59 -05:00
PabstMirror
78dec5debc Merge branch 'master' into userActionPrototype 
Conflicts:
	addons/interact_menu/XEH_preInit.sqf
 2015-05-16 22:49:09 -05:00
PabstMirror
2158f467f4 #1171 - Safe get variables if settings not defined 2015-05-14 15:29:09 -05:00
esteldunedain
f17c7c12a6 Fixed object actions not working 2015-05-14 16:56:32 -03:00
esteldunedain
4a074d4e31 Replace BIS_fnc_sortBy by sort for interact_menu occlusion 2015-05-14 10:54:22 -03:00
esteldunedain
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
PabstMirror
58ee797a94 Merge branch 'master' into userActionPrototype 2015-05-13 00:00:55 -05:00
PabstMirror
1827d8ad95 Fix #1024 - Adjust self iMenu for wave height 2015-05-12 16:04:42 -05:00
ViperMaul
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
PabstMirror
6c45292e89 Merge branch 'master' into userActionPrototype 
Conflicts:
	addons/interact_menu/functions/fnc_renderBaseMenu.sqf
 2015-05-04 14:23:21 -05:00
PabstMirror
6c5d72640c Caching, Optimzations 2015-05-04 14:06:33 -05:00
esteldunedain
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
PabstMirror
bdc967d3a9 Extension to parse text for image path 2015-05-03 13:44:02 -05:00
PabstMirror
5c556647ab Some Cleanup 2015-05-03 02:06:49 -05:00
PabstMirror
5147f9f584 Ladder Actions 2015-05-03 00:33:20 -05:00
PabstMirror
d4225e03d2 Split into functions (for future caching) 2015-05-02 23:13:35 -05:00
commy2
f44aaee7c7 also in cursor mode 2015-05-02 23:02:40 +02:00
commy2
0fd783082d don't close menu when no action is selected 2015-05-02 22:53:23 +02:00
esteldunedain
e6c333bff4 Fix oclusion when self-interacting 2015-05-02 14:54:57 -03: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
PabstMirror
d2fdeb5e96 Allow Skipping LOS Check (Because of doors) 2015-05-02 00:13:09 -05: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
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
esteldunedain
fc02bb4e06 Stylistic changes 2015-05-01 00:32:16 -03:00
esteldunedain
aa4a5539d4 Merge branch 'master' into interactMoreOptions 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
 2015-05-01 00:04:22 -03:00
KoffeinFlummi
984a1fe337 Rename breakLine to break_line 2015-05-01 02:14:23 +02:00
PabstMirror
090062153c Merge branch 'master' into interactMoreOptions 
Conflicts:
	addons/interact_menu/config.cpp
 2015-04-30 15:36:00 -05:00
PabstMirror
ba18f8b430 Handle Scaling 2015-04-30 14:07:19 -05:00
commy2
8c8e310d66 handle cursor mode 2015-04-30 21:00:30 +02: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
9aa2e3130a Options for Shadow/Outline and Text Size 2015-04-29 23:37:52 -05:00
PabstMirror
e40a2a524d Merge branch 'master' into interactMoreOptions 2015-04-29 22:57:35 -05:00
PabstMirror
47d4446520 Don't check intersection if distance < 1m 
Related to #869
 2015-04-29 02:34:47 -05:00
PabstMirror
d7d43ce3b1 #828 - Private Variables for Interact Menu 2015-04-29 01:26:13 -05:00
PabstMirror
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
commy2
5320f4c6b7 fix broken parse text cache in some cases 2015-04-26 19:33:08 +02:00
commy2
f96deadd20 imenu: remove shadow, fix caching 2015-04-26 12:41:15 +02:00
PabstMirror
898d6c74a8 #854 - No canInteractWith check for Ace_MainAction 
Was preventing subactions from showing.
 2015-04-25 16:02:59 -05:00
ulteq
ca6a559557 Fixed a typo 2015-04-25 21:18:09 +02:00
esteldunedain
fc49814689 Use FUNC(ctrlSetParsedTextCached) for the selector too. Eliminates glitches 2015-04-25 10:52:52 -03:00
commy2
b7763331d6 the index 2015-04-25 14:34:09 +02:00
commy2
73b17efa2f cache ctrlSetStructedText parseText 2015-04-25 13:28:21 +02:00
commy2
73f387d3e3 outline interaction menu text 2015-04-25 11:55:39 +02:00
commy2
664d08d4aa add option to only use action when clicking 2015-04-25 08:23:54 +02:00
esteldunedain
c8563ce484 Add LOS check for actions points. Close #785 2015-04-24 00:57:22 -03:00
PabstMirror
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05:00
esteldunedain
9295393dd6 Allow cursor for interactions 2015-04-20 13:54:51 -03: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
8b389949bc Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-18 18:42:11 -03:00
esteldunedain
bce0d84989 Fix interact menu object ordering 2015-04-18 18:41:36 -03: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
Tachii
dd09cc4d06 Update fnc_createAction.sqf 
typo
 2015-04-16 00:57:15 +03:00
PabstMirror
1f13d229a8 Stagger creating actions over time 2015-04-15 00:13:23 -05:00
esteldunedain
5faf4b7dfa Remove comment 2015-04-15 01:27:29 -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
esteldunedain
7ad9238bbf Fixes 2015-04-14 23:32:03 -03:00
esteldunedain
c397246534 Fix the fov test. Issue not fixed 2015-04-14 23:22:08 -03:00
esteldunedain
53ce7d0be4 Increase the tolerance to 2m 2015-04-14 23:12:48 -03:00
esteldunedain
ee34078960 Add early visibility check to interact menu 2015-04-14 22:53:10 -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
PabstMirror
85beb72a3a ASL Stuff 2015-04-13 23:27:03 -05:00
PabstMirror
c6b4a57ee2 Pull Icon from config 2015-04-13 23:11:18 -05:00
PabstMirror
5c994765ef Cleanup 2015-04-13 22:39:00 -05:00
PabstMirror
e84c5f4bb3 Radius Distance 2015-04-13 22:26:38 -05:00
PabstMirror
fda4f60a9e House UserAction Prototype 2015-04-13 22:19:38 -05:00
esteldunedain
0565eb6c74 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment 
Conflicts:
	addons/laser_selfdesignate/stringtable.xml
 2015-04-12 01:26:55 -03:00
esteldunedain
630a2a0f7a Make the list menu optional via a client setting 2015-04-12 01:15:38 -03:00
esteldunedain
01bc6b233a Merge branch 'breakLineExtension' into linearMenuExperiment 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
 2015-04-12 00:21:05 -03:00
esteldunedain
7b797d906f Merge branch 'master' into linearMenuExperiment 
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
	addons/overheating/stringtable.xml
 2015-04-12 00:19:33 -03:00
esteldunedain
df17df61f9 Improve the way lines are split 2015-04-11 23:39:06 -03:00
PabstMirror
350a79c8a4 #498 - Use cursor mode when scoped 2015-04-11 19:44:42 -05:00
esteldunedain
b8e0388581 Fix nearestObjects with getPos choking over seawater. Fix #465 2015-04-11 11:12:40 -03:00
PabstMirror
2bc0976979 Merge pull request #277 from KoffeinFlummi/revert-276-revert-272-142menudeploy 
Revert "Revert "1.42 - cursor mode when bipod deployed""
 2015-04-08 13:26:05 -05:00
PabstMirror
03dbe8e6c5 Make it optional 2015-04-07 22:57:58 -05:00
PabstMirror
ce70c72cd6 wip1 2015-04-07 22:44:41 -05:00
jaynus
1bb6be5654 Cleaning up of all tabs in source code files. 2015-04-06 09:22:43 -07:00
jaynus
e3ad83e109 Merge pull request #286 from KoffeinFlummi/lasers 
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
 2015-04-05 13:26:54 -07:00