KoffeinFlummi
|
9805a8270a
|
Merge branch 'master' into german-merge
|
2015-07-25 19:35:03 +02: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 |
|