Commit Graph

593 Commits

Author SHA1 Message Date
dc7c7fcaf5 Merge pull request #811 from gienkov/master
PL translation
2015-04-25 20:46:47 +02:00
fc49814689 Use FUNC(ctrlSetParsedTextCached) for the selector too. Eliminates glitches 2015-04-25 10:52:52 -03:00
a7e1d1c1c8 Update stringtable.xml 2015-04-25 14:36:53 +02:00
b7763331d6 the index 2015-04-25 14:34:09 +02:00
73b17efa2f cache ctrlSetStructedText parseText 2015-04-25 13:28:21 +02:00
73f387d3e3 outline interaction menu text 2015-04-25 11:55:39 +02:00
664d08d4aa add option to only use action when clicking 2015-04-25 08:23:54 +02:00
c8563ce484 Add LOS check for actions points. Close #785 2015-04-24 00:57:22 -03:00
55732d4262 Text Shadow should have been black. 2015-04-23 13:33:38 -05:00
1063d4bb2c PL translation 2015-04-22 13:17:43 +02:00
96be881ea9 User changeable text/shadow colors for interaction 2015-04-20 18:28:01 -05:00
afc8abce85 hide open bag option when it's not selected via scroll wheel 2015-04-20 22:00:13 +02:00
ed72697141 Merge pull request #728 from acemod/error
Show error message and quit mission if a dll isn't present
2015-04-20 19:41:38 +02:00
9295393dd6 Allow cursor for interactions 2015-04-20 13:54:51 -03:00
ea368511b7 ace extensions class for modularity 2015-04-20 18:48:58 +02:00
f928f37e26 Eliminate interact_menu fps drops due to high nearby object counts.
Instead of reanalizing every frame which actions points should be rendered based on distance, that job is now done only 5 times per second.
The rest of the frames the action points from the last frame are rerendered..
Close #434
2015-04-20 01:16:51 -03:00
592e0d2dd3 Merge https://github.com/ruPaladin/ACE3 into russian-merge
Conflicts:
	addons/ballistics/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/medical/stringtable.xml
2015-04-19 00:51:09 +02:00
8015aca0c3 Merge branch 'master' of https://github.com/acemod/ACE3 2015-04-19 00:40:18 +02:00
3aafa2082d Merge https://github.com/nomisum/ACE3 into german-merge
Conflicts:
	addons/atragmx/stringtable.xml
	addons/scopes/stringtable.xml
	addons/weather/stringtable.xml
2015-04-19 00:39:44 +02:00
8b389949bc Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-18 18:42:11 -03:00
bce0d84989 Fix interact menu object ordering 2015-04-18 18:41:36 -03:00
f55bd5a629 French: updates / fixes stringtable 2015-04-18 18:49:46 +02:00
a6e0cac734 interact_menu (fixes to prevent text overlapping) 2015-04-17 16:02:46 +03:00
8813315f36 added missing translations german 2015-04-17 11:40:31 +02:00
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