Commit Graph

474 Commits

Author SHA1 Message Date
0e32c28552 #2437 - Warn users when mods break XEH 2015-09-15 12:55:08 -05:00
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
89eb98a248 Added: IT more translation, medic partial
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
337cde3fb3 autointerazioni (?) 2015-09-12 09:21:38 +02:00
63c2712360 Merge branch 'release' into portuguese 2015-09-10 21:59:30 +02:00
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
a5621604fd Merge branch 'release' into czech 2015-09-10 20:51:33 +02:00
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
44fa520bdd Czech Translations - Update 2015-09-03 01:20:24 +02:00
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
d85f96eac0 Merge pull request #2320 from acemod/322notonladder
disable all actions while being on a ladder by default, close #2289
2015-08-31 21:31:54 +02:00
5e57cad669 Merge pull request #2216 from acemod/isolateZeusMenuKeybind
Prevent CBA keybindings in zeus interface
2015-08-31 14:41:48 +01:00
04269831e8 Consider modifier keys for zeus interaction hack
The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing
2015-08-31 14:40:31 +01:00
7a4c37c085 disable all actions on ladders by default, close #2289 2015-08-30 22:03:45 +02:00
5f63290508 Merge branch 'ptbr' 2015-08-30 00:42:31 +02:00
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
5047d4de1c Switched to ACE_LOG<LEVEL>_# variation 2015-08-26 17:39:44 +02:00
097506076f Fixed format usage in macros requiring ARR_# for it to work 2015-08-26 16:48:55 +02:00
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
9aed148e8a Default Action parameters is [] for self (ref #2228)
Makes it match fnc_compileMenu.sqf
2015-08-23 00:16:01 -05:00
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
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
253fb6e66a Merge pull request #1986 from acemod/addMainAction
Always make sure ACE_MainActions exists
2015-08-14 19:48:04 -05:00
13abee2612 Merge pull request #2106 from acemod/optionMenuFiltering
Option Menu Fixes for categories
2015-08-14 19:31:17 -05:00
763f793d0e Localize Catagoires in loadSettingsLocalizedText
Minor, but allows us to use CSTRINGS in configs for consistancy
2015-08-13 13:20:37 -05:00
6ca3761710 AddAction basic param checking 2015-08-13 11:54:26 -05:00
207c002f3a params 2015-08-09 13:02:08 -05:00
5723c5eaac Merge branch 'master' into addMainAction 2015-08-09 13:00:56 -05:00
7624a459eb Merge pull request #2010 from jokoho48/codeCleanupInteractMenu
Code cleanup Interact_menu module
2015-08-08 21:35:54 -05:00
feceff2746 Polish the stringtable 2015-08-08 12:36:42 -05:00
872c257901 Used the wrong string macro. 2015-08-08 13:21:13 +02:00
e7a607ca35 Finalized server export category select 2015-08-08 13:07:22 +02:00
c6af8aaeb6 Localized category name for interaction menu related settings 2015-08-08 11:52:53 +02:00
d125b9ad9c Add category to options menu. Initial work. 2015-08-07 21:14:45 +02:00
77e62946ae Updated parameterization in Interact_menu module. 2015-08-05 00:47:18 +02:00
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
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
6f90185f18 #1939 - Fix Remove Action From Class 2015-07-28 17:26:23 -05:00
9805a8270a Merge branch 'master' into german-merge 2015-07-25 19:35:03 +02:00
5609ec7b6b Added PT-BR translations
New PT-BR translations, including the slideshow and spectator module.
2015-07-25 12:56:50 -03:00
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
8da43d25c6 Cache the objects actions for nearby objects and set the GVAR(objectActionList) correctly. 2015-07-16 17:28:27 -03:00
78529af60c Update spanish translation 2015-07-08 20:57:46 +02:00
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02:00
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
89305473a2 Add performance note. 2015-07-01 15:50:14 -05:00