PabstMirror
9aed148e8a
Default Action parameters is [] for self (ref #2228 )
...
Makes it match fnc_compileMenu.sqf
2015-08-23 00:16:01 -05: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
jonpas
de033f0ff2
README.md files added to all modules
2015-08-19 04:18:33 +02:00
PabstMirror
253fb6e66a
Merge pull request #1986 from acemod/addMainAction
...
Always make sure ACE_MainActions exists
2015-08-14 19:48:04 -05:00
PabstMirror
13abee2612
Merge pull request #2106 from acemod/optionMenuFiltering
...
Option Menu Fixes for categories
2015-08-14 19:31:17 -05:00
PabstMirror
763f793d0e
Localize Catagoires in loadSettingsLocalizedText
...
Minor, but allows us to use CSTRINGS in configs for consistancy
2015-08-13 13:20:37 -05:00
PabstMirror
6ca3761710
AddAction basic param checking
2015-08-13 11:54:26 -05:00
PabstMirror
207c002f3a
params
2015-08-09 13:02:08 -05:00
PabstMirror
5723c5eaac
Merge branch 'master' into addMainAction
2015-08-09 13:00:56 -05:00
PabstMirror
7624a459eb
Merge pull request #2010 from jokoho48/codeCleanupInteractMenu
...
Code cleanup Interact_menu module
2015-08-08 21:35:54 -05:00
PabstMirror
feceff2746
Polish the stringtable
2015-08-08 12:36:42 -05:00
Glowbal
872c257901
Used the wrong string macro.
2015-08-08 13:21:13 +02:00
Glowbal
e7a607ca35
Finalized server export category select
2015-08-08 13:07:22 +02:00
Glowbal
c6af8aaeb6
Localized category name for interaction menu related settings
2015-08-08 11:52:53 +02:00
Glowbal
d125b9ad9c
Add category to options menu. Initial work.
2015-08-07 21:14:45 +02:00
Michael Braun
77e62946ae
Updated parameterization in Interact_menu module.
2015-08-05 00:47:18 +02: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
Harakhti
d0f91c5ebf
Row 1
...
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
PabstMirror
6f90185f18
#1939 - Fix Remove Action From Class
2015-07-28 17:26:23 -05:00
KoffeinFlummi
9805a8270a
Merge branch 'master' into german-merge
2015-07-25 19:35:03 +02:00
Jonathan Pereira
5609ec7b6b
Added PT-BR translations
...
New PT-BR translations, including the slideshow and spectator module.
2015-07-25 12:56:50 -03:00
Nicolás Badano
67d83d0d49
Merge pull request #1862 from acemod/disappearingActionsFix
...
Cache the objects actions for nearby objects and set the GVAR(objectA…
2015-07-16 18:24:55 -03:00
esteldunedain
8da43d25c6
Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly.
2015-07-16 17:28:27 -03:00
Ivan Navarro Cabello
78529af60c
Update spanish translation
2015-07-08 20:57:46 +02:00
ProfessorCZ
89a9218e59
CZ Translation - Update
2015-07-04 15:56:00 +02:00
gienkov
70862c5de9
PL translation
2015-07-02 23:55:26 +02:00
PabstMirror
89305473a2
Add performance note.
2015-07-01 15:50:14 -05:00
PabstMirror
5e80f9d8d3
Merge branch 'master' into userActionPrototype
2015-07-01 15:04:40 -05:00
Nicolás Badano
a284cc3f6b
Merge pull request #1755 from ToasterBR/master
...
Translation to Brazilian Portuguese (PT-BR)
2015-06-29 17:22:38 -03:00
ToasterBR
f4a51d57ef
Translation to Brazilian Portuguese (PT-BR)
...
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
SilentSpike
f2e5f729e8
Merge branch 'master' into gm_revamp
2015-06-27 18:26:30 +01:00
Macusercom
cf2f36a775
Corrections suggested by others
2015-06-16 23:17:34 +02:00
Macusercom
24cea18ae5
Revert "Revert "Added German translations""
...
This reverts commit 4403e3c665
2015-06-16 03:21:25 +02:00
Macusercom
4403e3c665
Revert "Added German translations"
...
This reverts commit 0adc07d284
2015-06-16 03:06:23 +02:00
Macusercom
0adc07d284
Added German translations
2015-06-16 03:06:13 +02: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
29ce8f635e
Merge branch 'master' into sitting
...
Conflicts:
addons/kestrel4500/CfgVehicles.hpp
addons/microdagr/CfgVehicles.hpp
2015-06-13 21:43:42 +02:00
ProfessorCZ
531372b2a3
CZ - Translation
...
Already in README
2015-06-12 14:50:50 +02: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
Ivan Navarro Cabello
d15bae105d
Updated spanish translation
...
Updated spanish translation
2015-06-08 12:43:07 +02:00
SilentSpike
cb1b0c6262
Added zeus exception for interaction conditions
2015-06-07 20:21:51 +01:00
SilentSpike
822dd11ec6
Moved base ACE_ZeusActions to ace_interaction
2015-06-06 17:33:13 +01:00
SilentSpike
5cc6abd49a
Open menu over zeus inerface
2015-06-06 16:20:22 +01:00
SilentSpike
8a4b4a7e0c
Added a bunch of basic actions
2015-06-05 18:37:29 +01:00
gienkov
de13985492
interact_menu translation
2015-06-05 09:55:13 +02:00
gienkov
c1a7374404
Merge remote-tracking branch 'upstream/master' into pl-translation-1
...
Conflicts:
addons/interact_menu/stringtable.xml
2015-06-05 09:40:50 +02:00
SilentSpike
25f613b712
Initial implementation of static zeus menu
2015-06-04 23:24:57 +01:00
PabstMirror
1cb1468183
Remove unused control
2015-06-04 15:40:56 -05:00
PabstMirror
cecc133a59
Missing </Key> in stringtable
2015-06-04 13:22:55 -05: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
gienkov
46dbd3113c
Fix
2015-06-04 01:38:57 +02:00
gienkov
fb10961a9b
PL translation for new things
2015-06-04 01:34:58 +02:00
SzwedzikPL
18940d0787
Interaction menu background options
2015-06-03 06:04:47 +02:00
Nicolás Badano
8f15856084
Merge pull request #1415 from GitHawk/master
...
runOnHover can now be CODE & SurgicalKits
2015-06-02 18:07:36 -03: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
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
jonpas
87db721d4f
Stringtable fixes up to medical
2015-05-27 21:19:14 +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
e78c2fd676
Extension framework changes
2015-05-17 04:05:43 -05:00
PabstMirror
78dec5debc
Merge branch 'master' into userActionPrototype
...
Conflicts:
addons/interact_menu/XEH_preInit.sqf
2015-05-16 22:49:09 -05:00
Nicolás Badano
d9b6636221
Merge pull request #1196 from Winter259/common-cleanup
...
Cleanup of nearly all common functions
2015-05-14 18:31:19 -03: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
SAM
31adb5a9fc
Second batch of settings files
2015-05-14 20:59:25 +02: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
KoffeinFlummi
2bb3a0f139
Cleanup #1095
...
- Fix tabs
- Remove tabler comments
- Restore one removed Russian string
2015-05-10 16:19:46 +02:00
Alessandro Foresi
2dd06babec
Added: Italian translations completed.
...
Fixed: BOM markers where missing
2015-05-10 11:44:46 +02:00
Alessandro Foresi
6695a8793b
Added: Some italian translastions
2015-05-09 23:43:03 +02: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
Glowbal
50cc5db92f
fixes #1017
2015-05-05 20:05:31 +02: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
e6889f1634
Merge branch 'master' into userActionPrototype
2015-05-04 14:21:49 -05:00
PabstMirror
6c5d72640c
Caching, Optimzations
2015-05-04 14:06:33 -05:00
ViperMaul
032424b23e
Merge pull request #1006 from acemod/skipLOSCheckBodyparts
...
Interact menu: Increase the minimum distance required for LOS checks to 1.5m
2015-05-04 10:14:59 -07: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
KoffeinFlummi
298e1d88bd
Merge branch 'hu-catchup' of https://github.com/Harakhti/ACE3 into hungarian-merge
...
Conflicts:
addons/ballistics/stringtable.xml
addons/interact_menu/stringtable.xml
addons/interaction/stringtable.xml
addons/laser/stringtable.xml
addons/medical/stringtable.xml
addons/respawn/stringtable.xml
2015-05-02 23:17:39 +02: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
aad108a6a3
Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into interactionOclusion
2015-05-02 14:55:35 -03: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
Harakhti
6c2717be7f
More more translations
...
Stope.
2015-05-02 18:06:01 +02:00
ToasterBR
021b00c722
Translation to Portuguese
...
Done all remaining portuguese translations, including some minor
corrections
2015-05-02 03:38:53 -03:00
