PabstMirror
|
c6be0bbb8c
|
Merge branch 'master' into add-category-optionsmenu
Conflicts:
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
|
2015-08-08 12:39:14 -05:00 |
|
jonpas
|
1aecd54fc3
|
Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common
|
2015-08-08 18:02:20 +02:00 |
|
PabstMirror
|
a3a481f96d
|
Some fixes
|
2015-08-07 15:08:52 -05:00 |
|
Glowbal
|
d125b9ad9c
|
Add category to options menu. Initial work.
|
2015-08-07 21:14:45 +02:00 |
|
jonpas
|
763cb07629
|
Macro STRING to LSTRING
|
2015-05-28 21:59:04 +02:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +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
|
8064253a4d
|
Formatting, indentation, minor refactoring + fix for opening settings menu
|
2015-03-06 18:15:32 +01: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 |
|
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 |
|