Commit Graph

153 Commits

Author SHA1 Message Date
c6efd4e546 Merge https://github.com/EpMAK/ACE3 into russian-merge 2015-04-12 05:39:46 +02: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
38adfbcb70 Added missing CZ strings and made little revision 2015-04-11 16:33:00 +02:00
17a552bb80 Russian Translation
Russian translation of stringtables: new lines + old lines fixed a bit,
realistic names for armory are not yet filled.
2015-04-10 19:55:57 +03:00
68d08b8c7b Revert "Translation"
This reverts commit fab5605ad5.
2015-04-10 19:46:18 +03:00
fab5605ad5 Translation
Russian translation of the texts
2015-04-10 17:51:48 +03:00
16b2311376 Added German translation for a couple of things, 2015-04-10 14:21:55 +02:00
a73c37ce05 Update stringtable.xml
added spanish translation
2015-04-10 13:14:33 +02:00
87f5873c2a Update stringtable.xml
Added: French Translation (90%)
Fixed: Uknow to Unknow (line 101)
2015-04-10 05:50:08 +02:00
5255c91408 optionsmenu PL translation 2015-04-10 02:20:22 +02:00
88336753d0 optionsmenu 2015-04-10 00:36:41 +02:00
af3d6a5113 #386 - Ace Options Menu on main menu
Same limitations as CBA controls, needs a intro or mission loaded
Doesn't work with -skipintro command line.
2015-04-08 10:33:12 -05:00
0bcb7f76dc This should not be here 2015-04-06 13:12:40 +02:00
83c670576b fixed typeOf instead of typeName 2015-04-06 11:58:52 +02:00
8fa6ab38fd Merge branch 'serverConfig' of github.com:KoffeinFlummi/ACE3 into serverConfig 2015-04-05 14:08:54 -07:00
d6632a0e45 Module should default to true. 2015-04-05 14:08:42 -07:00
c514fde5d3 Not necessary here. Makes it only work once. 2015-04-05 15:13:34 +02:00
bae3826bdf Polished server config export 2015-04-05 14:48:23 +02:00
279641787d Added checks for enforce usage only in SP with settings enabled 2015-04-05 11:11:54 +02:00
202904f1f9 Using 1 and 0 instead of true and false for config export 2015-04-05 10:32:40 +02:00
d487092d84 formatting 2015-04-05 02:33:45 +02:00
110635df7b improved formatting 2015-04-05 02:33:11 +02:00
a0af055917 export config should force the settings 2015-04-05 02:22:24 +02:00
7928ca71a5 Server side config export 2015-04-05 02:17:43 +02:00
4f08d0d006 Merge branch 'master' into SettingsMenuImprovements
Conflicts:
	addons/optionsmenu/functions/fnc_onListBoxSettingsChanged.sqf
	addons/optionsmenu/functions/fnc_onListBoxShowSelectionChanged.sqf
	addons/optionsmenu/functions/fnc_onSettingsMenuOpen.sqf
	addons/optionsmenu/functions/fnc_onSliderPosChanged.sqf
	addons/optionsmenu/functions/fnc_resetSettings.sqf
	addons/optionsmenu/functions/fnc_settingsMenuUpdateKeyView.sqf
	addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
	addons/optionsmenu/functions/fnc_updateSetting.sqf
	addons/optionsmenu/gui/settingsMenu.hpp
2015-03-15 00:46:14 +01:00
a92389f450 optMenu - remove 'fix anim' button and add headers 2015-03-14 13:10:25 -05:00
fc0d6e8e1c Updated author information in the config 2015-03-06 20:04:48 +01:00
fd44f7bca6 Indentation 2015-03-06 19:57:45 +01:00
8687f8d073 Changed font sizes and removed animation button. 2015-03-06 19:56:43 +01:00
50bdc1d4c7 Disable unused buttons 2015-03-06 19:56:15 +01:00
8064253a4d Formatting, indentation, minor refactoring + fix for opening settings menu 2015-03-06 18:15:32 +01:00
658f30b9a2 ACE_Settings: various fixes 2015-02-03 02:37:13 -03:00
2c0d2013d4 ACE_Settings: Added a function to change settings on runtime (e.g. for modules) 2015-02-03 01:45:04 -03:00
857b45453a ACE_Settings: fix option to reset user setable settings to default 2015-02-03 01:03:26 -03:00
91cfb40e6f ACE_Settings: updated optionsmenu to use the the new system 2015-02-03 00:44:34 -03:00
c407553d49 Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
75c87dfd9b Option Menu Tweaks 2015-01-23 02:43:43 -06:00
47c3ad1e5e Remove debug config 2015-01-22 00:17:31 -06:00
0d24ddf994 optionsMenu: tweak columns 2015-01-22 02:56:11 -03:00
86e841bc64 optionsMenu: matched the size and font style of the main menu buttons 2015-01-22 02:45:27 -03:00
96289b6395 optionsMenu: added localization to menu name 2015-01-22 02:44:45 -03:00
f73a456fb0 optionmenu: increase size 2015-01-22 02:33:51 -03:00
b6f35cc015 define all sizes and offsets through macros 2015-01-22 01:48:39 -03:00
91f066b84d remove quotes 2015-01-22 01:40:17 -03:00
d5916ced9e Colors from config 2015-01-21 17:43:57 -06:00
2b62c170fd Read from config 2015-01-21 17:29:42 -06:00
fe4a0b9be8 Formating 2015-01-21 16:27:53 -06:00
a595b48d32 More Locaization 2015-01-21 16:00:54 -06:00
c29acb4c68 Localization start 2015-01-21 14:23:33 -06:00