Commit Graph

8 Commits

Author SHA1 Message Date
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
fd44f7bca6 Indentation 2015-03-06 19:57:45 +01:00
Glowbal
8064253a4d Formatting, indentation, minor refactoring + fix for opening settings menu 2015-03-06 18:15:32 +01:00
PabstMirror
fe4a0b9be8 Formating 2015-01-21 16:27:53 -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