Commit Graph

469 Commits

Author SHA1 Message Date
bdd3422150 Allow to dynamically modify actions at runtime. An optional code entry called modifierFunction can be added. That code is called before evaluating the action, allowing to dynamically change the actions name, icon, etc 2015-04-16 23:53:54 -03:00
4ff68eabd4 Update stringtable.xml 2015-04-16 14:59:19 +02:00
dd09cc4d06 Update fnc_createAction.sqf
typo
2015-04-16 00:57:15 +03:00
1b67b2df26 Merge branch 'master' of https://github.com/ramius86/ACE3 into italian-merge
Conflicts:
	addons/disposable/stringtable.xml
	addons/explosives/stringtable.xml
	addons/fcs/stringtable.xml
	addons/frag/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/javelin/stringtable.xml
	addons/kestrel4500/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/markers/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/movement/stringtable.xml
2015-04-15 22:20:47 +02:00
df61f5c995 French : update stringtable 2015-04-15 21:15:57 +02:00
64504a9515 addons/interact_menu translation to Russian 2015-04-15 18:27:28 +03:00
8b915380b7 Merge branch 'hungarian-merge' 2015-04-15 13:55:02 +02:00
2ffbccbf20 Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge 2015-04-15 12:59:56 +02:00
544894a05e Update stringtable.xml
Italian
2015-04-15 10:59:44 +02:00
1f13d229a8 Stagger creating actions over time 2015-04-15 00:13:23 -05:00
25e8e93fd0 Add back stringtables for the list menu 2015-04-15 01:32:42 -03:00
5faf4b7dfa Remove comment 2015-04-15 01:27:29 -03:00
a9f44530c9 Move the function that prevents firing while the interact_menu is open to the interact_menu pbo 2015-04-15 01:20:20 -03:00
7ad9238bbf Fixes 2015-04-14 23:32:03 -03:00
c397246534 Fix the fov test. Issue not fixed 2015-04-14 23:22:08 -03:00
53ce7d0be4 Increase the tolerance to 2m 2015-04-14 23:12:48 -03:00
7a606a2352 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 22:54:10 -03:00
ee34078960 Add early visibility check to interact menu 2015-04-14 22:53:10 -03:00
b307b4bc4b Fixed: Flummi missed 2 isClientSettable renames. 2015-04-14 18:38:52 -07:00
b39209cc28 BAD @esteldunedain! BAD DOGGY! 2015-04-14 17:09:13 -07:00
10b1587453 Merge pull request #592 from gienkov/master
PL translation
2015-04-14 20:36:25 -03:00
ee04ea2f41 Allow actions on coordinates instead of selections 2015-04-14 20:21:11 -03:00
3543b9c806 PL Translation
Some french, german and russian entries were listed twice, had to remove
one of two here and there so this list is for revision by different
translators
2015-04-15 00:43:42 +02:00
495c822061 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-14 19:10:31 -03:00
6f4bb48489 Merge branch 'master' into linearMenuExperiment
Conflicts:
	addons/attach/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/overheating/stringtable.xml
	extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
ebcdafe610 Fix spelling of "isClientSetable" 2015-04-14 21:43:19 +02:00
b2be71c9cf Merge branch 'master' into userActionPrototype 2015-04-14 14:22:57 -05:00
63fe4118d4 Merge https://github.com/FreeZbe/ACE3 into french-merge 2015-04-14 14:48:13 +02:00
85beb72a3a ASL Stuff 2015-04-13 23:27:03 -05:00
c6b4a57ee2 Pull Icon from config 2015-04-13 23:11:18 -05:00
5c994765ef Cleanup 2015-04-13 22:39:00 -05:00
e84c5f4bb3 Radius Distance 2015-04-13 22:26:38 -05:00
fda4f60a9e House UserAction Prototype 2015-04-13 22:19:38 -05:00
3c3f6ba4c3 Translation: A to I
Some parts filled out, other parts corrected or stylized.
2015-04-13 19:28:58 +02:00
f6c7d444e1 Merge https://github.com/Anthariel/ACE3 into french-merge 2015-04-13 13:31:48 +02:00
118b5509ea Merge https://github.com/gienkov/ACE3 into polish-merge 2015-04-13 13:00:59 +02:00
614afa8537 Merge https://github.com/Kllrt/ACE3 into czech-merge
Conflicts:
	addons/attach/stringtable.xml
	addons/captives/stringtable.xml
	addons/common/stringtable.xml
	addons/dragging/stringtable.xml
	addons/explosives/stringtable.xml
	addons/goggles/stringtable.xml
	addons/grenades/stringtable.xml
	addons/hearing/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/inventory/stringtable.xml
	addons/kestrel/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/laserpointer/stringtable.xml
	addons/logistics_uavbattery/stringtable.xml
	addons/logistics_wirecutter/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/maptools/stringtable.xml
	addons/medical/stringtable.xml
	addons/microdagr/stringtable.xml
	addons/nametags/stringtable.xml
	addons/optionsmenu/stringtable.xml
	addons/overheating/stringtable.xml
	addons/realisticnames/stringtable.xml
	addons/reload/stringtable.xml
	addons/reloadlaunchers/stringtable.xml
	addons/weaponselect/stringtable.xml
	addons/wep_javelin/stringtable.xml
	addons/winddeflection/stringtable.xml
2015-04-12 14:27:59 +02:00
0565eb6c74 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into linearMenuExperiment
Conflicts:
	addons/laser_selfdesignate/stringtable.xml
2015-04-12 01:26:55 -03:00
630a2a0f7a Make the list menu optional via a client setting 2015-04-12 01:15:38 -03:00
01bc6b233a Merge branch 'breakLineExtension' into linearMenuExperiment
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
2015-04-12 00:21:05 -03:00
7b797d906f Merge branch 'master' into linearMenuExperiment
Conflicts:
	addons/interact_menu/functions/fnc_renderIcon.sqf
	addons/overheating/stringtable.xml
2015-04-12 00:19:33 -03:00
df17df61f9 Improve the way lines are split 2015-04-11 23:39:06 -03:00
59952441d8 Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge 2015-04-12 06:22:17 +02:00
362753209e Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-12 05:40:24 +02:00
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02:00
350a79c8a4 #498 - Use cursor mode when scoped 2015-04-11 19:44:42 -05:00
21abff3713 Revert "Revert "Russian Translation""
This reverts commit ea04f4ab3e.
2015-04-11 21:33:34 +03:00
ea04f4ab3e Revert "Russian Translation"
This reverts commit 17a552bb80.
2015-04-11 21:33:07 +03:00
56681e632d Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-11 16:36:31 +02:00
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00