commy2
|
5a1aae6028
|
manual merge
|
2015-11-30 17:44:15 +01:00 |
|
commy2
|
a9ebcf8543
|
fix setVariable and getVariable capitalization
|
2015-11-30 17:27:09 +01:00 |
|
commy2
|
b3950bd7f0
|
fix forEach capitalization
|
2015-11-30 17:23:48 +01:00 |
|
commy2
|
2b05f6f451
|
fix isNil capitalization
|
2015-11-30 17:22:16 +01:00 |
|
commy2
|
34d351c652
|
fix exitWith capitalization
|
2015-11-30 17:14:05 +01:00 |
|
Thomas Kooi
|
cef01baf0b
|
Merge pull request #2856 from acemod/isEqualTypeRepalcement
1.54 - Replace typeName with isEqualType
|
2015-11-28 20:36:07 +01:00 |
|
PabstMirror
|
a42c2153cc
|
Error handling for bad setting values array
|
2015-11-28 01:57:15 -06:00 |
|
PabstMirror
|
69b53af1d3
|
1.54 - Replace typeName with isEqualType
|
2015-11-20 11:40:31 -06:00 |
|
PabstMirror
|
5d104106c5
|
#2188 - Fix Exporting Color Arrays
|
2015-08-24 00:58:45 -05:00 |
|
PabstMirror
|
660d048670
|
Options Menu - Fix Colors when category selected
|
2015-08-15 03:21:03 -05:00 |
|
PabstMirror
|
763f793d0e
|
Localize Catagoires in loadSettingsLocalizedText
Minor, but allows us to use CSTRINGS in configs for consistancy
|
2015-08-13 13:20:37 -05:00 |
|
PabstMirror
|
a908863317
|
Use proper lnbXXX commands
|
2015-08-11 04:15:55 -05:00 |
|
PabstMirror
|
2565a80a22
|
#2098 - Option Menu Fixes for categories
Use lbValue to store the index of the filtered selection
|
2015-08-10 17:19:30 -05:00 |
|
PabstMirror
|
c949daae1f
|
OptionMenu C->LStrings
|
2015-08-08 19:57:57 -05:00 |
|
Glowbal
|
c0562aaf6c
|
clean up debug messages
|
2015-08-08 20:31:19 +02:00 |
|
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 |
|
Glowbal
|
e8961e3d0e
|
Use display instead of just idc
|
2015-08-08 13:41:25 +02:00 |
|
Glowbal
|
25597704ed
|
Added fail save for incorrect string value input
|
2015-08-08 13:07:40 +02:00 |
|
Glowbal
|
e7a607ca35
|
Finalized server export category select
|
2015-08-08 13:07:22 +02:00 |
|
Glowbal
|
0601aa80bb
|
Localized All categories string
Enabled categories for config export menu
|
2015-08-08 11:52:23 +02:00 |
|
Glowbal
|
38b9fdab4d
|
fixes #1948
|
2015-08-08 11:51:31 +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 |
|
PabstMirror
|
1221498357
|
Dump settings to debug
|
2015-06-04 15:31:10 -05:00 |
|
jonpas
|
9fbf256acd
|
Merge branch 'master' into macroSTR
Conflicts:
addons/hearing/functions/fnc_putInEarplugs.sqf
addons/interact_menu/ACE_Settings.hpp
|
2015-06-04 17:13:09 +02:00 |
|
ViperMaul
|
237f5c1130
|
Merge pull request #1304 from acemod/debugButton
Export debug report from options menu
|
2015-06-03 09:28:37 -07:00 |
|
jonpas
|
d934c25b78
|
Merge branch 'master' into macroSTR
Conflicts:
addons/interact_menu/ACE_Settings.hpp
|
2015-05-30 19:54:32 +02:00 |
|
PabstMirror
|
b49b2fa3d1
|
Send to RPT and Clipboard
|
2015-05-30 01:21:47 -05:00 |
|
jonpas
|
763cb07629
|
Macro STRING to LSTRING
|
2015-05-28 21:59:04 +02:00 |
|
PabstMirror
|
2cf9519702
|
Send to extension directly
|
2015-05-28 04:33:13 -05:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
Glowbal
|
d6cc1d4b76
|
Proposed fix for #1158
Sent directly to extension instead of splitting it
|
2015-05-20 10:26:32 +02:00 |
|
PabstMirror
|
7c8505592b
|
Chunk Data to Extension, add some extra diag info
|
2015-05-19 01:57:41 -05:00 |
|
PabstMirror
|
b727fd79c4
|
Call Ext Directly
CBA_fnc_split problems
|
2015-05-18 19:29:39 -05:00 |
|
PabstMirror
|
bace23c331
|
Button to dump array info to clipboard
|
2015-05-18 18:44:52 -05:00 |
|
jaynus
|
717d7c874f
|
Data chunking. Feature complete.
|
2015-05-02 15:28:40 -07:00 |
|
esteldunedain
|
233ca37219
|
Export settings to clipboard using ace_clipboard. Deprecate exporting through diag_log
|
2015-05-02 17:52:37 -03:00 |
|
PabstMirror
|
1729c781bd
|
Cleanup / private vars
|
2015-04-16 19:46:42 -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 |
|
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 |
|