5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
b091b73e24
fixes
2015-11-27 21:54:04 +01:00
3250245587
3.4.0 translations and fixes
2015-11-27 21:50:57 +01:00
7b526a99a3
Cleanup
2015-11-20 14:53:16 -06:00
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
3ec9fca73e
local -> private
2015-11-17 14:06:12 -06:00
554c303be0
InteractionMenu - Auto Expand First Level
2015-10-20 13:31:09 -05:00
7db5a34b24
Interaction Menu - Add setting for animation speed
2015-10-20 13:26:42 -05:00
4a935eb129
Remove debug
2015-09-26 22:02:44 -05:00
174d8ac306
#2486 - Run color setup on settingsInit
2015-09-26 22:02:05 -05:00
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
6702a1faa4
Fix warnings for WeaponHolderSimulated
2015-09-21 16:34:02 -05:00
8573238cff
Merge branch 'release'
2015-09-19 11:21:33 -05:00
79d985a648
Fix XEH Warning Debug
...
Wait 5 to let supMon run first, and only show visual error if actually
missing pbo.
2015-09-19 10:43:29 -05:00
a621a0c693
Fixes to spanish translations
2015-09-18 13:36:57 -03:00
3422f5a7f1
Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation
...
Conflicts:
addons/medical/stringtable.xml
addons/repair/stringtable.xml
2015-09-18 13:20:22 -03:00
463e21dd91
330
2015-09-16 12:40:30 +02:00
88f89b8d76
also check allDeadMen
2015-09-15 13:30:04 -05:00
a8688609d7
Typo
2015-09-15 13:10:06 -05:00
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
