ACE3/addons
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
..
ai rename agm burst mode to ace burst mode (ai) 2015-02-03 19:38:49 +01:00
aircraft Still MainTurret probs by Heli_Transport_01_base_F 2015-02-28 19:37:35 -06:00
attach Added base main actions for vehicle ancestors 2015-03-01 01:35:06 -03:00
backpacks zipper sounds for opening backpacks 2015-03-10 17:48:24 +01:00
ballistics Add README for ballistics 2015-01-26 07:36:45 +01:00
captives Use ace_isUnconscious in anim changed EH 2015-03-13 00:45:12 -05:00
common Tweak ambientBrightness to take into acount the cloud coverage 2015-03-13 22:27:14 -03:00
difficulties Create README.md 2015-01-26 13:37:41 +01:00
disposable Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
explosives Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
fcs Merge pull request #170 from KoffeinFlummi/cba-NewKeyBinding 2015-03-07 14:09:52 -06:00
flashsuppressors add macros for transport cargo config 2015-02-14 08:26:30 +01:00
frag Create README.md 2015-01-26 13:46:21 +01:00
gforces g-forces: updated headers 2015-02-08 19:58:41 -03:00
goggles Fix 2 broken keybinds 2015-03-10 12:45:08 -05:00
grenades Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
hearing Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
interact_menu Merge pull request #187 from KoffeinFlummi/wirecuttersInerationTest 2015-03-14 13:11:17 -05:00
interaction Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
inventory Cleanup 2015-03-09 18:53:19 -05:00
kestrel Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
laser Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
laser_selfdesignate replace tabs with spaces 2015-02-14 09:50:26 +01:00
laserpointer fix cfgPatches in laserpointer 2015-03-13 18:52:30 +01:00
logistics_uavbattery Merge pull request #157 from KoffeinFlummi/selfInteractionMenu 2015-02-23 14:24:43 -03:00
logistics_wirecutter Interact menu event consistant 2015-03-11 12:45:01 -05:00
magazinerepack Removed obsolote code from ace_interaction (#109) 2015-02-28 23:00:24 -03:00
magazines fix shitty initSpeed definitions breaking SD mags, fix #182 2015-03-08 19:51:52 +01:00
main Performance counter macros 2015-03-10 12:59:40 -07:00
map Merge branch 'mapContours' into mapfx 2015-03-14 17:20:25 -03:00
maptools Tab to space plus comments for the spawns 2015-03-14 17:15:28 -03:00
markers Fix CurrentChannel 2015-02-21 21:19:54 -06:00
medical Use ace_isUnconscious in anim changed EH 2015-03-13 00:45:12 -05:00
missileguidance Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
missionmodules Fixed forgotten missionModules. 2015-02-19 19:07:19 +01:00
movement Return False on keyUp Code 2015-03-05 02:51:24 -06:00
nametags Return False on keyUp Code 2015-03-05 02:51:24 -06:00
nightvision Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
noradio Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
optionsmenu Merge branch 'master' into SettingsMenuImprovements 2015-03-15 00:46:14 +01:00
overheating Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
overpressure mm 2015-02-15 16:25:09 -03:00
parachute Parachute - Move unused p3d back to TOMERGE 2015-03-12 00:07:28 -05:00
protection Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
ragdolls Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
realisticnames hpps for realistic names 2015-03-13 19:10:24 +01:00
recoil Set ADDON variable in XEH_preInit 2015-01-29 01:38:46 -06:00
reload Merge branch 'master' into Additional_UI_Client_settings 2015-03-08 17:03:25 +01:00
respawn Respawn - Module icon filenames 2015-03-12 00:12:19 -05:00
resting Return False on keyUp Code 2015-03-05 02:51:24 -06:00
safemode Return False on keyUp Code 2015-03-05 02:51:24 -06:00
scopes Return False on keyUp Code 2015-03-05 02:51:24 -06:00
smallarms Use MACRO_ADDITEM from main instead of redefining 2015-03-11 17:36:40 -05:00
switchunits fix events 2015-03-01 13:43:39 +01:00
thermals Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
vector fix vector cfg patches 2015-03-13 18:34:13 +01:00
vehiclelock Prevent ace_vehiclelock from overwritting mainaction distance 2015-03-01 19:35:18 -03:00
vehicles Return False on keyUp Code 2015-03-05 02:51:24 -06:00
weaponselect Removed weapon select, is now just grenade throw 2015-03-09 19:03:55 +01:00
weather Added a displayName for the wounds 2015-03-01 18:02:56 +01:00
wep_dragon Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
wep_javelin Add remaining READMEs, add helper script 2015-01-26 14:34:48 +01:00
winddeflection WindDef - Convert to use FiredBIS 2015-03-12 00:28:33 -05:00