commy2
80ea079827
reset interaction menu time variables on save game load
2016-01-12 19:32:26 +01:00
PabstMirror
dd979676fd
Remove use of CAManBase for all mans
...
End use of bandaid from #1294
2016-01-09 22:05:40 -06:00
PabstMirror
a161008eb7
Fix count/forEach
2016-01-09 01:15:09 -06:00
PabstMirror
ed4cc42897
Cleanup Interaction Menu
2016-01-08 23:29:32 -06:00
Alessandro Foresi
c16d97cad0
Merge branch 'master' into translation/15bn/alef
2016-01-03 12:23:27 +01:00
PabstMirror
fb0738bd30
Merge branch 'master' into release
2015-12-31 20:27:26 -06:00
PabstMirror
8bdd5d0597
Merge remote-tracking branch 'brGuy/Translations-December' into fixStringtablesMerge
2015-12-31 14:30:29 -06:00
PabstMirror
cf27571b5a
Merge pull request #3007 from dudakov/master
...
Russian Translations - Update
2015-12-31 14:11:45 -06:00
PabstMirror
1e29c0286f
Remove Keybinds/Events for Zeus now handeld in CBA
...
Close #2937
2015-12-30 01:07:55 -06:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
Jonathan Pereira
ad48f51ec7
Added PT-BR translations
...
All remaining translations of gestures, hearing, interact_menu,
interaction, nightvision, rearm, refuel, viewdistance were done!
2015-12-18 15:14:19 -02:00
PabstMirror
ff3ddbe287
Building Interact - Dummy object instead of hiding
...
Fix #3038
InteractiMenu now checks `isObjectHidden`,
So now use dummy object instead of hiding a real one
2015-12-15 12:04:03 -06:00
kaban
fd06472f4d
Russian Translations - Update
2015-12-10 20:32:16 +03:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
d037f00a92
fix forEachIndex capitalization
2015-11-30 17:25:16 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
dcf0a68b80
Revert "fix Cfg capitalization"
...
This reverts commit 43bda9c462
2015-11-30 17:00:32 +01:00
commy2
43bda9c462
fix Cfg capitalization
2015-11-30 16:52:20 +01:00
commy2
ca9b909e75
fix CBA_fnc capitalization
2015-11-30 16:45:20 +01:00
Thomas Kooi
081106d6a3
Merge pull request #2892 from acemod/TheHidden
...
Remove nametags and actions on hidden units
2015-11-29 12:38:27 +01:00
bux578
35ecef454f
Merge pull request #2825 from gienkov/pl-translation
...
pl translation
2015-11-29 07:35:04 +01:00
PabstMirror
8d2b612570
Remove nametags and actions on hidden units
...
Fix #2596
2015-11-28 21:35:25 -06:00
PabstMirror
f676e6d9c9
Add some more typeNames replacements
2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
gienkov
b091b73e24
fixes
2015-11-27 21:54:04 +01:00
gienkov
3250245587
3.4.0 translations and fixes
2015-11-27 21:50:57 +01:00
PabstMirror
7b526a99a3
Cleanup
2015-11-20 14:53:16 -06:00
PabstMirror
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
PabstMirror
3ec9fca73e
local -> private
2015-11-17 14:06:12 -06:00
PabstMirror
554c303be0
InteractionMenu - Auto Expand First Level
2015-10-20 13:31:09 -05:00
PabstMirror
7db5a34b24
Interaction Menu - Add setting for animation speed
2015-10-20 13:26:42 -05:00
PabstMirror
4a935eb129
Remove debug
2015-09-26 22:02:44 -05:00
PabstMirror
174d8ac306
#2486 - Run color setup on settingsInit
2015-09-26 22:02:05 -05:00
PabstMirror
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
PabstMirror
6702a1faa4
Fix warnings for WeaponHolderSimulated
2015-09-21 16:34:02 -05:00
PabstMirror
8573238cff
Merge branch 'release'
2015-09-19 11:21:33 -05:00
PabstMirror
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
esteldunedain
a621a0c693
Fixes to spanish translations
2015-09-18 13:36:57 -03:00
esteldunedain
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
Ivan Navarro Cabello
463e21dd91
330
2015-09-16 12:40:30 +02:00
PabstMirror
88f89b8d76
also check allDeadMen
2015-09-15 13:30:04 -05:00
PabstMirror
a8688609d7
Typo
2015-09-15 13:10:06 -05:00
PabstMirror
0e32c28552
#2437 - Warn users when mods break XEH
2015-09-15 12:55:08 -05:00
Glowbal
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
Alessandro Foresi
89eb98a248
Added: IT more translation, medic partial
...
Fixed: dup entries (from gienkov)
2015-09-12 23:16:57 +02:00
Alessandro Foresi
337cde3fb3
autointerazioni (?)
2015-09-12 09:21:38 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
KoffeinFlummi
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c
Merge branch 'release' into french
2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be
Update French translations
2015-09-10 19:14:51 +02:00
Jonathan Pereira
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
kaban
08b7110e58
Russian Translations - Update
2015-09-03 04:54:52 +03:00
kaban
91cae690c0
Russian Translations - Update
2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd
Czech Translations - Update
2015-09-03 01:20:24 +02:00
Michael Braun
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
commy2
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
SilentSpike
5e57cad669
Merge pull request #2216 from acemod/isolateZeusMenuKeybind
...
Prevent CBA keybindings in zeus interface
2015-08-31 14:41:48 +01:00
SilentSpike
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
commy2
7a4c37c085
disable all actions on ladders by default, close #2289
2015-08-30 22:03:45 +02:00
KoffeinFlummi
5f63290508
Merge branch 'ptbr'
2015-08-30 00:42:31 +02:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
Michael Braun
5047d4de1c
Switched to ACE_LOG<LEVEL>_# variation
2015-08-26 17:39:44 +02:00
Michael Braun
097506076f
Fixed format usage in macros requiring ARR_# for it to work
2015-08-26 16:48:55 +02:00
Michael Braun
9e10aa86d7
Standardize logging format through ACE_LOG macros
2015-08-26 15:32:54 +02:00
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
