Glowbal
|
d125b9ad9c
|
Add category to options menu. Initial work.
|
2015-08-07 21:14:45 +02:00 |
|
PabstMirror
|
4a8344e1a4
|
Merge branch 'master' into userActionPrototype
Conflicts:
addons/interact_menu/ACE_Settings.hpp
addons/interact_menu/stringtable.xml
extensions/CMakeLists.txt
|
2015-06-13 15:05:57 -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 |
|
SzwedzikPL
|
18940d0787
|
Interaction menu background options
|
2015-06-03 06:04:47 +02:00 |
|
jonpas
|
d934c25b78
|
Merge branch 'master' into macroSTR
Conflicts:
addons/interact_menu/ACE_Settings.hpp
|
2015-05-30 19:54:32 +02:00 |
|
Glowbal
|
00acbaf44d
|
Added blur background client setting
|
2015-05-29 21:56:07 +02:00 |
|
PabstMirror
|
b0bfb7dd43
|
Fix Ladders - Add User Setting
|
2015-05-29 13:00:04 -05:00 |
|
jonpas
|
6072e14077
|
Changed all strings to macros (except external)
|
2015-05-27 19:04:25 +02:00 |
|
SAM
|
31adb5a9fc
|
Second batch of settings files
|
2015-05-14 20:59:25 +02:00 |
|