289 Commits

Author	SHA1	Message	Date
KoffeinFlummi	a1e709047e	Merge branch 'patch-3' of https://github.com/VyMajoris/ACE3 into portuguese-merge ... Conflicts: AUTHORS.txt addons/aircraft/stringtable.xml addons/attach/stringtable.xml addons/captives/stringtable.xml addons/common/stringtable.xml addons/disposable/stringtable.xml addons/dragging/stringtable.xml addons/explosives/stringtable.xml addons/fcs/stringtable.xml addons/frag/stringtable.xml addons/grenades/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/markers/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/movement/stringtable.xml addons/nametags/stringtable.xml addons/nightvision/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/parachute/stringtable.xml addons/realisticnames/stringtable.xml addons/reload/stringtable.xml addons/reloadlaunchers/stringtable.xml addons/respawn/stringtable.xml addons/safemode/stringtable.xml addons/switchunits/stringtable.xml addons/vehiclelock/stringtable.xml addons/weaponselect/stringtable.xml addons/wep_javelin/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-29 12:52:55 +02:00
Bla1337	cfbf3bd053	Localization update	2015-04-29 11:20:21 +03:00
simon84	8ac6f61fcf	added some translations ... added some translations	2015-04-28 00:36:37 +02:00
KoffeinFlummi	b472292b20	Remove tabler comments. ... sed is awesome.	2015-04-26 21:05:41 +02:00
KoffeinFlummi	1bb8628109	Merge https://github.com/simon84/ACE3 into german-merge	2015-04-26 21:00:22 +02:00
VyMajoris	523cb49ff1	Added - Portuguese translation to lots of things. ... Also fixed a typo the english key for STR_ACE_microdagr_configure.	2015-04-26 03:09:16 -03:00
Dimaslg	274663e1b9	Spanish Translation ... Minor fixes and spelling mistakes.	2015-04-25 18:53:45 +02:00
Ivan Navarro Cabello	55887b7cfe	updated stringtable for spanish ... added some spanish translate	2015-04-21 19:03:55 +02:00
Grzegorz	8dac6d3f3d	Update stringtable.xml	2015-04-18 22:03:36 +02:00
Grzegorz Sikora	0629b59184	Merge branch 'master' of https://github.com/gienkov/ACE3 ... Conflicts: addons/optionsmenu/stringtable.xml	2015-04-18 22:02:44 +02:00
Grzegorz Sikora	c08125e0f3	PL translation	2015-04-18 22:00:37 +02:00
FreeZbe	f55bd5a629	French: updates / fixes stringtable	2015-04-18 18:49:46 +02:00
Grzegorz Sikora	170a8d0641	PL translation	2015-04-18 16:01:07 +02:00
PabstMirror	d7da259c11	Merge pull request #688 from acemod/optionMenuStuff ... Option menu stuff	2015-04-17 23:49:37 -05:00
KoffeinFlummi	20e4858a0d	Merge https://github.com/ramius86/ACE3 into italian-merge	2015-04-17 15:44:50 +02:00
PabstMirror	1729c781bd	Cleanup / private vars	2015-04-16 19:46:42 -05:00
PabstMirror	4e5c2ef187	option menu ui scaling	2015-04-16 19:11:42 -05:00
simon84	cc75928cc0	Merge remote-tracking branch 'acemod/master' ... Conflicts: addons/disarming/stringtable.xml addons/hearing/stringtable.xml addons/medical/stringtable.xml addons/microdagr/stringtable.xml addons/nametags/stringtable.xml addons/optionsmenu/stringtable.xml addons/overheating/stringtable.xml addons/winddeflection/stringtable.xml	2015-04-16 22:47:51 +02:00
PabstMirror	e12831bee4	#678 - Missing Text Height in settingMenu	2015-04-16 15:17:56 -05:00
simon84	c18284d964	German translation	2015-04-16 22:04:24 +02:00
Marco	ba510facbd	Update stringtable.xml ... IT	2015-04-16 10:29:17 +02:00
KoffeinFlummi	8b915380b7	Merge branch 'hungarian-merge'	2015-04-15 13:55:02 +02:00
KoffeinFlummi	2ffbccbf20	Merge branch 'hu-translate' of https://github.com/Harakhti/ACE3 into hungarian-merge	2015-04-15 12:59:56 +02:00
PabstMirror	1488ba2aac	#595 - Hide ace optino button if no world loaded ... I wanted to use a rscMapControl onDraw, but it throws an error onMouseMoving seems odd, but it works and I don't have to overload onLoad	2015-04-14 19:52:35 -05:00
KoffeinFlummi	63fe4118d4	Merge https://github.com/FreeZbe/ACE3 into french-merge	2015-04-14 14:48:13 +02:00
Harakhti	8bfd915ec4	Translation: N to R ... This was a lot more fun than the previous two were. 12 folders left...	2015-04-13 23:45:44 +02:00
Kllrt	1c611ba2db	Added another new CZ strings	2015-04-13 21:15:04 +02:00
Grzegorz Sikora	ac886828b0	Fixes	2015-04-13 18:02:48 +02:00
bux578	8c24d9ec35	fix invalid xml, fix duplicate keys	2015-04-13 15:25:30 +02:00
KoffeinFlummi	8d4003a396	Merge https://github.com/HerrStein/ACE3 into german-merge	2015-04-13 14:21:00 +02:00
KoffeinFlummi	f6c7d444e1	Merge https://github.com/Anthariel/ACE3 into french-merge	2015-04-13 13:31:48 +02:00
KoffeinFlummi	118b5509ea	Merge https://github.com/gienkov/ACE3 into polish-merge	2015-04-13 13:00:59 +02:00
simon84	51bc7208bc	German translation ... Some german translations and corrections	2015-04-12 20:52:15 +02:00
KoffeinFlummi	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
FreeZbe	45ff6c7ce9	French: (Nearly) Complete French translations ... Some entries (3 or 4) are still missing. I dont understand what you mean / what the input is related to.	2015-04-12 14:15:45 +02:00
KoffeinFlummi	59952441d8	Merge branch 'patch-2' of https://github.com/licht-im-Norden87/ACE3 into german-merge	2015-04-12 06:22:17 +02:00
KoffeinFlummi	c6efd4e546	Merge https://github.com/EpMAK/ACE3 into russian-merge	2015-04-12 05:39:46 +02:00
EpMAK	21abff3713	Revert "Revert "Russian Translation"" ... This reverts commit ea04f4ab3e.	2015-04-11 21:33:34 +03:00
EpMAK	ea04f4ab3e	Revert "Russian Translation" ... This reverts commit 17a552bb80.	2015-04-11 21:33:07 +03:00
Kllrt	38adfbcb70	Added missing CZ strings and made little revision	2015-04-11 16:33:00 +02:00
EpMAK	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
EpMAK	68d08b8c7b	Revert "Translation" ... This reverts commit fab5605ad5.	2015-04-10 19:46:18 +03:00
EpMAK	fab5605ad5	Translation ... Russian translation of the texts	2015-04-10 17:51:48 +03:00
Asgar	16b2311376	Added German translation for a couple of things,	2015-04-10 14:21:55 +02:00
Legolasindar	a73c37ce05	Update stringtable.xml ... added spanish translation	2015-04-10 13:14:33 +02:00
Anthariel	87f5873c2a	Update stringtable.xml ... Added: French Translation (90%) Fixed: Uknow to Unknow (line 101)	2015-04-10 05:50:08 +02:00
Grzegorz	5255c91408	optionsmenu PL translation	2015-04-10 02:20:22 +02:00
licht-im-Norden87	88336753d0	optionsmenu	2015-04-10 00:36:41 +02:00
PabstMirror	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
Glowbal	0bcb7f76dc	This should not be here	2015-04-06 13:12:40 +02:00
Glowbal	83c670576b	fixed typeOf instead of typeName	2015-04-06 11:58:52 +02:00
jaynus	8fa6ab38fd	Merge branch 'serverConfig' of github.com:KoffeinFlummi/ACE3 into serverConfig	2015-04-05 14:08:54 -07:00
jaynus	d6632a0e45	Module should default to true.	2015-04-05 14:08:42 -07:00
Glowbal	c514fde5d3	Not necessary here. Makes it only work once.	2015-04-05 15:13:34 +02:00
Glowbal	bae3826bdf	Polished server config export	2015-04-05 14:48:23 +02:00
Glowbal	279641787d	Added checks for enforce usage only in SP with settings enabled	2015-04-05 11:11:54 +02:00
Glowbal	202904f1f9	Using 1 and 0 instead of true and false for config export	2015-04-05 10:32:40 +02:00
Glowbal	d487092d84	formatting	2015-04-05 02:33:45 +02:00
Glowbal	110635df7b	improved formatting	2015-04-05 02:33:11 +02:00
Glowbal	a0af055917	export config should force the settings	2015-04-05 02:22:24 +02:00
Glowbal	7928ca71a5	Server side config export	2015-04-05 02:17:43 +02:00
Glowbal	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
PabstMirror	a92389f450	optMenu - remove 'fix anim' button and add headers	2015-03-14 13:10:25 -05:00
Glowbal	fc0d6e8e1c	Updated author information in the config	2015-03-06 20:04:48 +01:00
Glowbal	fd44f7bca6	Indentation	2015-03-06 19:57:45 +01:00
Glowbal	8687f8d073	Changed font sizes and removed animation button.	2015-03-06 19:56:43 +01:00
Glowbal	50bdc1d4c7	Disable unused buttons	2015-03-06 19:56:15 +01:00
Glowbal	8064253a4d	Formatting, indentation, minor refactoring + fix for opening settings menu	2015-03-06 18:15:32 +01:00
Nicolás Badano	658f30b9a2	ACE_Settings: various fixes	2015-02-03 02:37:13 -03:00
Nicolás Badano	2c0d2013d4	ACE_Settings: Added a function to change settings on runtime (e.g. for modules)	2015-02-03 01:45:04 -03:00
Nicolás Badano	857b45453a	ACE_Settings: fix option to reset user setable settings to default	2015-02-03 01:03:26 -03:00
Nicolás Badano	91cfb40e6f	ACE_Settings: updated optionsmenu to use the the new system	2015-02-03 00:44:34 -03:00
KoffeinFlummi	c407553d49	Add remaining READMEs, add helper script	2015-01-26 14:34:48 +01:00
PabstMirror	75c87dfd9b	Option Menu Tweaks	2015-01-23 02:43:43 -06:00
PabstMirror	47c3ad1e5e	Remove debug config	2015-01-22 00:17:31 -06:00
Nicolás Badano	0d24ddf994	optionsMenu: tweak columns	2015-01-22 02:56:11 -03:00
Nicolás Badano	86e841bc64	optionsMenu: matched the size and font style of the main menu buttons	2015-01-22 02:45:27 -03:00
Nicolás Badano	96289b6395	optionsMenu: added localization to menu name	2015-01-22 02:44:45 -03:00
Nicolás Badano	f73a456fb0	optionmenu: increase size	2015-01-22 02:33:51 -03:00
Nicolás Badano	b6f35cc015	define all sizes and offsets through macros	2015-01-22 01:48:39 -03:00
Nicolás Badano	91f066b84d	remove quotes	2015-01-22 01:40:17 -03:00
PabstMirror	d5916ced9e	Colors from config	2015-01-21 17:43:57 -06:00
PabstMirror	2b62c170fd	Read from config	2015-01-21 17:29:42 -06:00
PabstMirror	fe4a0b9be8	Formating	2015-01-21 16:27:53 -06:00
PabstMirror	a595b48d32	More Locaization	2015-01-21 16:00:54 -06:00
PabstMirror	c29acb4c68	Localization start	2015-01-21 14:23:33 -06:00
PabstMirror	92bbfd92d1	Color Sliders	2015-01-21 13:53:05 -06:00
PabstMirror	0ae940fdfb	Rough Conversion ... Gut keybind stuff, redo data arrays, reset button, progress on color changer.	2015-01-21 05:43:58 -06:00
PabstMirror	09bb14d11b	Options Menu from CSE	2015-01-20 23:27:08 -06:00