Index: ps/trunk/binaries/data/mods/mod/gui/common/modern/setup.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/common/modern/setup.xml	(revision 23413)
+++ ps/trunk/binaries/data/mods/mod/gui/common/modern/setup.xml	(revision 23414)
@@ -1,69 +1,69 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <!DOCTYPE setup SYSTEM "..\..\gui.dtd">
 
 <setup>
 	<!--
 	==========================================
 	- SCROLLBARS -
 	==========================================
 	-->
 	<scrollbar name="ModernScrollBar"
 			width = "15"
 			minimum_bar_size = "15"
 			maximum_bar_size = "15"
 			show_edge_buttons = "false"
 			sprite_back_vertical = "ModernScrollBack"
 			sprite_bar_vertical = "ModernScrollBar"
 	/>
 
 	<!--
 	==========================================
 	- TOOLTIPS -
 	==========================================
 	-->
 	<tooltip name="default"
 			anchor="top"
 			buffer_zone="4"
 			delay="500"
 			font="sans-14"
 			maxwidth="300"
 			offset="16 32"
 			sprite="BlackBorderOnGray"
 			textcolor="255 255 255"
 	/>
 
-	<tooltip name="sliderTooltip"
+	<tooltip name="tooltipInstant"
 		anchor="top"
 		buffer_zone="4"
 		delay="0"
 		font="sans-14"
 		maxwidth="300"
 		offset="16 32"
 		sprite="BlackBorderOnGray"
 		textcolor="255 255 255"
 	/>
 
 	<!--
 	==========================================
 	- COLORS -
 	==========================================
 	-->
 	<color name="black">0 0 0</color>
 	<color name="white">255 255 255</color>
 	<color name="red">255 0 0</color>
 	<color name="blue">0 0 255</color>
 	<color name="yellow">255 255 0</color>
 
 	<color name="gold">237 227 167</color>
 	<color name="lightgray">243 242 240</color>
 	<color name="gray">143 142 140</color>
 	<color name="darkgray">43 42 40</color>
 	<color name="green">0 200 0</color>
 	<color name="mustard">191 191 2</color>
 	<color name="brown">159 98 24</color>
 	<color name="orange">255 165 0</color>
 	<color name="darkred">80 0 0</color>
 	<color name="darkbrown">30 20 10</color>
 
 	<color name="transparent">0 0 0 0</color>
 </setup>
Index: ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml
===================================================================
--- ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml	(revision 23413)
+++ ps/trunk/binaries/data/mods/mod/gui/common/modern/styles.xml	(revision 23414)
@@ -1,191 +1,191 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <styles>
 	<!--
 	==========================================
 	- DEFAULT STYLE: The style with the name 'default' is special, it will
 	- be called by every object before any other style is loaded.
 	==========================================
 	Note that the default z value is determined by GUI engine regardless of what is specified here.
 	-->
 	<style name="default"
 		absolute="false"
 		enabled="true"
 		ghost="false"
 		hidden="false"
 		size="0 0 100% 100%"
 		font="sans-14"
 		buffer_zone="5"
 	/>
 	<style name="ModernWindow"
 		sprite="ModernWindow"
 	/>
 	<style name="ModernDialog"
 		sprite="ModernDialog"
 	/>
 	<style name="ModernList"
 		buffer_zone="5"
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		sprite="ModernDarkBoxGoldNoTop"
 		sprite_selectarea="ModernDarkBoxWhite"
 		sprite_heading="ModernDarkBoxGoldNoBottom"
 		textcolor="white"
 		textcolor_selected="white"
 		text_align="left"
 		sound_selected="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernSortedList"
 		buffer_zone="5"
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		sprite="ModernDarkBoxGoldNoTop"
 		sprite_selectarea="ModernDarkBoxWhite"
 		sprite_heading="ModernDarkBoxGoldNoBottom"
 		sprite_asc="ModernArrowUp"
 		sprite_desc="ModernArrowDown"
 		sprite_not_sorted="ModernNotSorted"
 		textcolor="white"
 		textcolor_selected="white"
 		text_align="left"
 		sound_selected="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernDropDown"
 		dropdown_buffer="1"
 		font="sans-bold-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="center"
 		button_width="16"
 		sprite="ModernDarkBoxGold"
 		sprite_disabled="ModernDarkBoxGoldDisabled"
 		sprite2="ModernDropDownArrow"
 		sprite2_disabled="ModernDropDownArrowDisabled"
 		sprite2_pressed="ModernDropDownArrowHighlight"
 		buffer_zone="8"
 		dropdown_size="225"
 		minimum_visible_items="3"
 		sprite_list="BlackBorderOnGray"
 		sprite_selectarea="ModernDarkBoxWhite"
 		textcolor_selected="white"
 		textcolor_disabled="140 140 140 255"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		sound_opened="audio/interface/ui/ui_button_click.ogg"
 		sound_closed="audio/interface/ui/ui_button_click.ogg"
 		sound_selected="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="140 140 140 255"
 		text_align="center"
 		text_valign="center"
 	/>
 	<style name="ModernRightLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="140 140 140 255"
 		text_align="right"
 		text_valign="center"
 	/>
 	<style name="ModernLeftLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="140 140 140 255"
 		text_align="left"
 		text_valign="center"
 	/>
 	<style name="ModernTopLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		text_align="center"
 		text_valign="top"
 	/>
 	<style name="ModernLeftTopLabelText"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="top"
 	/>
 	<style name="ModernText"
 		font="sans-14"
 		textcolor="white"
 		text_align="left"
 		text_valign="top"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 	/>
 	<style name="ModernTextPanel"
 		buffer_zone="8"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
 		textcolor="white"
 		text_align="left"
 		text_valign="center"
 		sprite="ModernDarkBoxGold"
 	/>
 	<style name="ModernInput"
 		sprite="ModernDarkBoxWhite"
 		sprite_selectarea="color:150 0 0"
 		textcolor="white"
 		textcolor_selected="white"
 	/>
 	<style name="ModernTickBox"
 		sprite="ModernTickOff"
 		sprite2="ModernTickOn"
 		sprite_disabled="ModernTickDisabledOff"
 		sprite2_disabled="ModernTickDisabledOn"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernSlider"
 		sprite="ModernSliderButton"
 		sprite_bar="ModernSliderLine"
 		button_width="20"
-		tooltip_style="sliderTooltip"
+		tooltip_style="tooltipInstant"
 	/>
 	<style name="ModernButtonRed"
 		sprite="ModernButtonRed"
 		sprite_disabled="ModernButtonRedDisabled"
 		sprite_over="ModernButtonRedOver"
 		sprite_pressed="ModernButtonRed"
 		font="sans-bold-stroke-14"
 		textcolor="white"
 		textcolor_disabled="210 210 210 160"
 		text_align="center"
 		text_valign="center"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernProgressBarBackground"
 		sprite="ModernProgressBarBackground"
 	/>
 	<style name="ModernProgressBar"
 		sprite_bar="ModernProgressBar"
 		size="3 0 100%-3 100%"
 	/>
 	<style name="ModernProgressBarText"
 		font="sans-stroke-14"
 		textcolor="white"
 		text_align="center"
 		text_valign="center"
 	/>
 	<style name="ModernTabButtonHorizontal"
 		sprite="ModernTabHorizontalBackground"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernTabButtonVertical"
 		sprite="ModernTabVerticalBackground"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
 	<style name="ModernChart"
 		axis_color="209 174 132 255"
 		axis_width="2"
 		buffer_zone="4"
 		font="sans-stroke-14"
 		format_x="DECIMAL2"
 		format_y="DECIMAL2"
 		text_align="left"
 	/>
 </styles>
Index: ps/trunk/binaries/data/mods/public/gui/options/options.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/options/options.js	(revision 23413)
+++ ps/trunk/binaries/data/mods/public/gui/options/options.js	(revision 23414)
@@ -1,383 +1,387 @@
 /**
  * Translated JSON file contents.
  */
 var g_Options;
 
 /**
  * Names of config keys that have changed, value returned when closing the page.
  */
 var g_ChangedKeys;
 
 /**
  * Vertical size of a tab button.
  */
 var g_TabButtonHeight = 30;
 
 /**
  * Vertical space between two tab buttons.
  */
 var g_TabButtonDist = 5;
 
 /**
  * Vertical distance between the top of the page and the first option.
  */
 var g_OptionControlOffset = 5;
 
 /**
  * Vertical size of each option control.
  */
 var g_OptionControlHeight = 26;
 
 /**
  * Vertical distance between two consecutive options.
  */
 var g_OptionControlDist = 2;
 
 /**
  * Horizontal indentation to distinguish options that depend on another option.
  */
 var g_DependentLabelIndentation = 25;
 
 /**
  * Color used to indicate that the string entered by the player isn't a sane color.
  */
 var g_InsaneColor = "255 0 255";
 
 /**
  * Defines the parsing of config strings and GUI control interaction for the different option types.
  *
  * @property configToValue - parses a string from the user config to a value of the declared type.
  * @property valueToGui - sets the GUI control to display the given value.
  * @property guiToValue - returns the value of the GUI control.
  * @property guiSetter - event name that should be considered a value change of the GUI control.
  * @property initGUI - sets properties of the GUI control that are independent of the current value.
  * @property sanitizeValue - Displays a visual clue if the entered value is invalid and returns a sane value.
  * @property tooltip - appends a custom tooltip to the given option description depending on the current value.
  */
 var g_OptionType = {
 	"boolean":
 	{
 		"configToValue": config => config == "true",
 		"valueToGui": (value, control) => {
 			control.checked = value;
 		},
 		"guiToValue": control => control.checked,
 		"guiSetter": "onPress"
 	},
 	"string":
 	{
 		"configToValue": value => value,
 		"valueToGui": (value, control) => {
 			control.caption = value;
 		},
 		"guiToValue": control => control.caption,
 		"guiSetter": "onTextEdit"
 	},
 	"color":
 	{
 		"configToValue": value => value,
 		"valueToGui": (value, control) => {
 			control.caption = value;
 		},
 		"guiToValue": control => control.caption,
 		"guiSetter": "onTextEdit",
 		"sanitizeValue": (value, control, option) => {
 			let color = guiToRgbColor(value);
 			let sanitized = rgbToGuiColor(color);
 			if (control)
 			{
 				control.sprite = sanitized == value ? "ModernDarkBoxWhite" : "ModernDarkBoxWhiteInvalid";
 				control.children[1].sprite = sanitized == value ? "color:" + value : "color:" + g_InsaneColor;
 			}
 			return sanitized;
 		},
 		"tooltip": (value, option) =>
 			sprintf(translate("Default: %(value)s"), {
 				"value": Engine.ConfigDB_GetValue("default", option.config)
 			})
 	},
 	"number":
 	{
 		"configToValue": value => value,
 		"valueToGui": (value, control) => {
 			control.caption = value;
 		},
 		"guiToValue": control => control.caption,
 		"guiSetter": "onTextEdit",
 		"sanitizeValue": (value, control, option) => {
 			let sanitized =
 				Math.min(option.max !== undefined ? option.max : +Infinity,
 					Math.max(option.min !== undefined ? option.min : -Infinity,
 						isNaN(+value) ? 0 : value));
 
 			if (control)
 				control.sprite = sanitized == value ? "ModernDarkBoxWhite" : "ModernDarkBoxWhiteInvalid";
 
 			return sanitized;
 		},
 		"tooltip": (value, option) =>
 			sprintf(
 				option.min !== undefined && option.max !== undefined ?
 					translateWithContext("option number", "Min: %(min)s, Max: %(max)s") :
 				option.min !== undefined && option.max === undefined ?
 					translateWithContext("option number", "Min: %(min)s") :
 				option.min === undefined && option.max !== undefined ?
 					translateWithContext("option number", "Max: %(max)s") :
 					"",
 				{
 					"min": option.min,
 					"max": option.max
 				})
 	},
 	"dropdown":
 	{
 		"configToValue": value => value,
 		"valueToGui": (value, control) => {
 			control.selected = control.list_data.indexOf(value);
 		},
 		"guiToValue": control => control.list_data[control.selected],
 		"guiSetter": "onSelectionChange",
 		"initGUI": (option, control) => {
 			control.list = option.list.map(e => e.label);
 			control.list_data = option.list.map(e => e.value);
-		},
+			control.onHoverChange = () => {
+				let item = option.list[control.hovered];
+				control.tooltip = item && item.tooltip || option.tooltip;
+			};
+		}
 	},
 	"slider":
 	{
 		"configToValue": value => +value,
 		"valueToGui": (value, control) => {
 			control.value = +value;
 		},
 		"guiToValue": control => control.value,
 		"guiSetter": "onValueChange",
 		"initGUI": (option, control) => {
 			control.max_value = option.max;
 			control.min_value = option.min;
 		},
 		"tooltip": (value, option) =>
 			sprintf(translateWithContext("slider number", "Value: %(val)s (min: %(min)s, max: %(max)s)"), {
 				"val": value.toFixed(2),
 				"min": option.min.toFixed(2),
 				"max": option.max.toFixed(2)
 			})
 	}
 };
 
 function init(data, hotloadData)
 {
 	g_ChangedKeys = hotloadData ? hotloadData.changedKeys : new Set();
 	g_TabCategorySelected = hotloadData ? hotloadData.tabCategorySelected : 0;
 
 	g_Options = Engine.ReadJSONFile("gui/options/options.json");
 	translateObjectKeys(g_Options, ["label", "tooltip"]);
 	deepfreeze(g_Options);
 
 	placeTabButtons(
 		g_Options,
 		g_TabButtonHeight,
 		g_TabButtonDist,
 		selectPanel,
 		displayOptions);
 }
 
 function getHotloadData()
 {
 	return {
 		"tabCategorySelected": g_TabCategorySelected,
 		"changedKeys": g_ChangedKeys
 	};
 }
 
 /**
  * Sets up labels and controls of all options of the currently selected category.
  */
 function displayOptions()
 {
 	// Hide all controls
 	for (let body of Engine.GetGUIObjectByName("option_controls").children)
 	{
 		body.hidden = true;
 		for (let control of body.children)
 			control.hidden = true;
 	}
 
 	// Initialize label and control of each option for this category
 	for (let i = 0; i < g_Options[g_TabCategorySelected].options.length; ++i)
 	{
 		// Position vertically
 		let body = Engine.GetGUIObjectByName("option_control[" + i + "]");
 		let bodySize = body.size;
 		bodySize.top = g_OptionControlOffset + i * (g_OptionControlHeight + g_OptionControlDist);
 		bodySize.bottom = bodySize.top + g_OptionControlHeight;
 		body.size = bodySize;
 		body.hidden = false;
 
 		// Load option data
 		let option = g_Options[g_TabCategorySelected].options[i];
 		let optionType = g_OptionType[option.type];
 		let value = optionType.configToValue(Engine.ConfigDB_GetValue("user", option.config));
 
 		// Setup control
 		let control = Engine.GetGUIObjectByName("option_control_" + option.type + "[" + i + "]");
 		control.tooltip = option.tooltip + (optionType.tooltip ? "\n" + optionType.tooltip(value, option) : "");
 		control.hidden = false;
 
 		if (optionType.initGUI)
 			optionType.initGUI(option, control);
 
 		control[optionType.guiSetter] = function() {};
 		optionType.valueToGui(value, control);
 		if (optionType.sanitizeValue)
 			optionType.sanitizeValue(value, control, option);
 
 		control[optionType.guiSetter] = function() {
 
 			let value = optionType.guiToValue(control);
 
 			if (optionType.sanitizeValue)
 				optionType.sanitizeValue(value, control, option);
 
 			control.tooltip = option.tooltip + (optionType.tooltip ? "\n" + optionType.tooltip(value, option) : "");
 
 			Engine.ConfigDB_CreateValue("user", option.config, String(value));
 			Engine.ConfigDB_SetChanges("user", true);
 
 			g_ChangedKeys.add(option.config);
 			fireConfigChangeHandlers(new Set([option.config]));
 
 			if (option.function)
 				Engine[option.function](value);
 
 			enableButtons();
 		};
 
 		// Setup label
 		let label = Engine.GetGUIObjectByName("option_label[" + i + "]");
 		label.caption = option.label;
 		label.tooltip = option.tooltip;
 		label.hidden = false;
 
 		let labelSize = label.size;
 		labelSize.left = option.dependencies ? g_DependentLabelIndentation : 0;
 		labelSize.rright = control.size.rleft;
 		label.size = labelSize;
 	}
 
 	enableButtons();
 }
 
 /**
  * Enable exactly the buttons whose dependencies are met.
  */
 function enableButtons()
 {
 	g_Options[g_TabCategorySelected].options.forEach((option, i) => {
 
 		let enabled =
 			!option.dependencies ||
 			option.dependencies.every(config => Engine.ConfigDB_GetValue("user", config) == "true");
 
 		Engine.GetGUIObjectByName("option_label[" + i + "]").enabled = enabled;
 		Engine.GetGUIObjectByName("option_control_" + option.type + "[" + i + "]").enabled = enabled;
 	});
 
 	let hasChanges = Engine.ConfigDB_HasChanges("user");
 	Engine.GetGUIObjectByName("revertChanges").enabled = hasChanges;
 	Engine.GetGUIObjectByName("saveChanges").enabled = hasChanges;
 }
 
 function setDefaults()
 {
 	messageBox(
 		500, 200,
 		translate("Resetting the options will erase your saved settings. Do you want to continue?"),
 		translate("Warning"),
 		[translate("No"), translate("Yes")],
 		[null, reallySetDefaults]
 	);
 }
 
 function reallySetDefaults()
 {
 	for (let category in g_Options)
 		for (let option of g_Options[category].options)
 		{
 			Engine.ConfigDB_RemoveValue("user", option.config);
 			g_ChangedKeys.add(option.config);
 		}
 
 	Engine.ConfigDB_WriteFile("user", "config/user.cfg");
 	revertChanges();
 }
 
 function revertChanges()
 {
 	Engine.ConfigDB_Reload("user");
 	Engine.ConfigDB_SetChanges("user", false);
 
 	for (let category in g_Options)
 		for (let option of g_Options[category].options)
 			if (option.function)
 				Engine[option.function](
 					g_OptionType[option.type].configToValue(
 						Engine.ConfigDB_GetValue("user", option.config)));
 
 	displayOptions();
 }
 
 function saveChanges()
 {
 	for (let category in g_Options)
 		for (let i = 0; i < g_Options[category].options.length; ++i)
 		{
 			let option = g_Options[category].options[i];
 			let optionType = g_OptionType[option.type];
 			if (!optionType.sanitizeValue)
 				continue;
 
 			let value = optionType.configToValue(Engine.ConfigDB_GetValue("user", option.config));
 			if (value == optionType.sanitizeValue(value, undefined, option))
 				continue;
 
 			selectPanel(category);
 
 			messageBox(
 				500, 200,
 				translate("Some setting values are invalid! Are you sure to save them?"),
 				translate("Warning"),
 				[translate("No"), translate("Yes")],
 				[null, reallySaveChanges]
 			);
 			return;
 		}
 
 	reallySaveChanges();
 }
 
 function reallySaveChanges()
 {
 	Engine.ConfigDB_WriteFile("user", "config/user.cfg");
 	Engine.ConfigDB_SetChanges("user", false);
 	enableButtons();
 }
 
 /**
  * Close GUI page and inform the parent GUI page which options changed.
  **/
 function closePage()
 {
 	if (Engine.ConfigDB_HasChanges("user"))
 		messageBox(
 			500, 200,
 			translate("You have unsaved changes, do you want to close this window?"),
 			translate("Warning"),
 			[translate("No"), translate("Yes")],
 			[null, closePageWithoutConfirmation]);
 	else
 		closePageWithoutConfirmation();
 }
 
 function closePageWithoutConfirmation()
 {
 	Engine.PopGuiPage(g_ChangedKeys);
 }
Index: ps/trunk/binaries/data/mods/public/gui/options/options.json
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/options/options.json	(revision 23413)
+++ ps/trunk/binaries/data/mods/public/gui/options/options.json	(revision 23414)
@@ -1,538 +1,550 @@
 [
 	{
 		"label": "General",
 		"options":
 		[
 			{
 				"type": "string",
 				"label": "Player name (single-player)",
 				"tooltip": "How you want to be addressed in single-player matches.",
 				"config": "playername.singleplayer"
 			},
 			{
 				"type": "string",
 				"label": "Player name (multiplayer)",
 				"tooltip": "How you want to be addressed in multiplayer matches (except lobby).",
 				"config": "playername.multiplayer"
 			},
 			{
 				"type": "boolean",
 				"label": "Background pause",
 				"tooltip": "Pause single-player games when window loses focus.",
 				"config": "pauseonfocusloss"
 			},
 			{
 				"type": "boolean",
 				"label": "Enable welcome screen",
 				"tooltip": "If you disable it, the welcome screen will still appear once, each time a new version is available. You can always launch it from the main menu.",
 				"config": "gui.splashscreen.enable"
 			},
 			{
 				"type": "boolean",
 				"label": "Network warnings",
 				"tooltip": "Show which player has a bad connection in multiplayer games.",
 				"config": "overlay.netwarnings"
 			},
 			{
 				"type": "boolean",
 				"label": "FPS overlay",
 				"tooltip": "Show frames per second in top right corner.",
 				"config": "overlay.fps"
 			},
 			{
 				"type": "boolean",
 				"label": "Real time overlay",
 				"tooltip": "Show current system time in top right corner.",
 				"config": "overlay.realtime"
 			},
 			{
 				"type": "boolean",
 				"label": "Game time overlay",
 				"tooltip": "Show current simulation time in top right corner.",
 				"config": "gui.session.timeelapsedcounter"
 			},
 			{
 				"type": "boolean",
 				"label": "Ceasefire time overlay",
 				"tooltip": "Always show the remaining ceasefire time.",
 				"config": "gui.session.ceasefirecounter"
 			},
 			{
 				"type": "dropdown",
 				"label": "Late observer joins",
 				"tooltip": "Allow everybody or buddies only to join the game as observer after it started.",
 				"config": "network.lateobservers",
 				"list": [
 					{ "value": "everyone", "label": "Everyone" },
 					{ "value": "buddies", "label": "Buddies" },
 					{ "value": "disabled", "label": "Disabled" }
 				]
 			},
 			{
 				"type": "number",
 				"label": "Observer limit",
 				"tooltip": "Prevent further observers from joining if the limit is reached.",
 				"config": "network.observerlimit",
 				"min": 0,
 				"max": 32
 			},
 			{
 				"type": "boolean",
 				"label": "Chat timestamp",
 				"tooltip": "Show time that messages are posted in the lobby, gamesetup and ingame chat.",
 				"config": "chat.timestamp"
 			}
 		]
 	},
 	{
 		"label": "Graphics",
 		"tooltip": "Set the balance between performance and visual appearance.",
 		"options":
 		[
 			{
 				"type": "boolean",
 				"label": "Windowed mode",
 				"tooltip": "Start 0 A.D. in a window.",
 				"config": "windowed"
 			},
 			{
 				"type": "boolean",
 				"label": "Prefer GLSL",
 				"tooltip": "Use OpenGL 2.0 shaders (recommended).",
 				"config": "preferglsl",
 				"function": "Renderer_SetPreferGLSLEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Fog",
 				"tooltip": "Enable Fog.",
 				"dependencies": ["preferglsl"],
 				"config": "fog",
 				"function": "Renderer_SetFogEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Post-processing",
 				"tooltip": "Use screen-space post-processing filters (HDR, Bloom, DOF, etc).",
 				"config": "postproc",
 				"function": "Renderer_SetPostProcEnabled"
 			},
 			{
 				"type": "slider",
 				"label": "Shader effects",
 				"tooltip": "Number of shader effects. REQUIRES GAME RESTART",
 				"config": "materialmgr.quality",
 				"min": 0,
 				"max": 10
 			},
 			{
 				"type": "boolean",
 				"label": "Shadows",
 				"tooltip": "Enable shadows.",
 				"config": "shadows",
 				"function": "Renderer_SetShadowsEnabled"
 			},
 			{
 				"type": "dropdown",
 				"label": "Shadow quality",
 				"tooltip": "Shadow map resolution. High values can crash the game when using a graphics card with low memory!",
 				"dependencies": ["shadows"],
 				"config": "shadowquality",
 				"function": "Renderer_RecreateShadowMap",
 				"list": [
 					{ "value": -2, "label": "Very Low" },
 					{ "value": -1, "label": "Low" },
 					{ "value": 0, "label": "Medium" },
 					{ "value": 1, "label": "High" },
 					{ "value": 2, "label": "Very High" }
 				]
 			},
 			{
 				"type": "boolean",
 				"label": "Shadow filtering",
 				"tooltip": "Smooth shadows.",
 				"dependencies": ["shadows"],
 				"config": "shadowpcf",
 				"function": "Renderer_SetShadowPCFEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Unit silhouettes",
 				"tooltip": "Show outlines of units behind structures.",
 				"config": "silhouettes",
 				"function": "Renderer_SetSilhouettesEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Particles",
 				"tooltip": "Enable particles.",
 				"config": "particles",
 				"function": "Renderer_SetParticlesEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Water effects",
 				"tooltip": "When OFF, use the lowest settings possible to render water. This makes other settings irrelevant.",
 				"config": "watereffects",
 				"function": "Renderer_SetWaterEffectsEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "High-quality water effects",
 				"tooltip": "Use higher-quality effects for water, rendering coastal waves, shore foam, and ships trails.",
 				"dependencies": ["watereffects"],
 				"config": "waterfancyeffects",
 				"function": "Renderer_SetWaterFancyEffectsEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Real water depth",
 				"tooltip": "Use actual water depth in rendering calculations.",
 				"dependencies": ["watereffects"],
 				"config": "waterrealdepth",
 				"function": "Renderer_SetWaterRealDepthEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Water reflections",
 				"tooltip": "Allow water to reflect a mirror image.",
 				"dependencies": ["watereffects"],
 				"config": "waterreflection",
 				"function": "Renderer_SetWaterReflectionEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Water refraction",
 				"tooltip": "Use a real water refraction map and not transparency.",
 				"dependencies": ["watereffects"],
 				"config": "waterrefraction",
 				"function": "Renderer_SetWaterRefractionEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Shadows on water",
 				"tooltip": "Cast shadows on water.",
 				"dependencies": ["watereffects"],
 				"config": "shadowsonwater",
 				"function": "Renderer_SetWaterShadowsEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Smooth vision",
 				"tooltip": "Lift darkness and fog-of-war smoothly.",
 				"config": "smoothlos",
 				"function": "Renderer_SetSmoothLOSEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "Show sky",
 				"tooltip": "Render Sky.",
 				"config": "showsky",
 				"function": "Renderer_SetShowSkyEnabled"
 			},
 			{
 				"type": "boolean",
 				"label": "VSync",
 				"tooltip": "Run vertical sync to fix screen tearing. REQUIRES GAME RESTART",
 				"config": "vsync"
 			},
 			{
 				"type": "slider",
 				"label": "FPS throttling in menus",
 				"tooltip": "To save CPU workload, throttle render frequency in all menus. Set to maximum to disable throttling.",
 				"config": "adaptivefps.menu",
 				"min": 20,
 				"max": 100
 			},
 			{
 				"type": "slider",
 				"label": "FPS throttling in games",
 				"tooltip": "To save CPU workload, throttle render frequency in running games. Set to maximum to disable throttling.",
 				"config": "adaptivefps.session",
 				"min": 20,
 				"max": 100
 			}
 		]
 	},
 	{
 		"label": "Sound",
 		"options":
 		[
 			{
 				"type": "slider",
 				"label": "Master volume",
 				"tooltip": "Master audio gain.",
 				"config": "sound.mastergain",
 				"function": "SetMasterGain",
 				"min": 0,
 				"max": 2
 			},
 			{
 				"type": "slider",
 				"label": "Music volume",
 				"tooltip": "In game music gain.",
 				"config": "sound.musicgain",
 				"function": "SetMusicGain",
 				"min": 0,
 				"max": 2
 			},
 			{
 				"type": "slider",
 				"label": "Ambient volume",
 				"tooltip": "In game ambient sound gain.",
 				"config": "sound.ambientgain",
 				"function": "SetAmbientGain",
 				"min": 0,
 				"max": 2
 			},
 			{
 				"type": "slider",
 				"label": "Action volume",
 				"tooltip": "In game unit action sound gain.",
 				"config": "sound.actiongain",
 				"function": "SetActionGain",
 				"min": 0,
 				"max": 2
 			},
 			{
 				"type": "slider",
 				"label": "UI volume",
 				"tooltip": "UI sound gain.",
 				"config": "sound.uigain",
 				"function": "SetUIGain",
 				"min": 0,
 				"max": 2
 			},
 			{
 				"type": "boolean",
 				"label": "Nick notification",
 				"tooltip": "Receive audio notification when someone types your nick.",
 				"config": "sound.notify.nick"
 			},
 			{
 				"type": "boolean",
 				"label": "Game setup - new player notification",
 				"tooltip": "Receive audio notification when a new client joins the game setup.",
 				"config": "sound.notify.gamesetup.join"
 			}
 		]
 	},
 	{
 		"label": "Game Setup",
 		"options":
 		[
 			{
 				"type": "boolean",
 				"label": "Enable game setting tips",
 				"tooltip": "Show tips when setting up a game.",
 				"config": "gui.gamesetup.enabletips"
 			},
 			{
 				"type": "boolean",
 				"label": "Enable settings panel slide",
 				"tooltip": "Slide the settings panel when opening, closing or resizing.",
 				"config": "gui.gamesetup.settingsslide"
 			},
 			{
 				"type": "boolean",
 				"label": "Persist match settings",
 				"tooltip": "Save and restore match settings for quick reuse when hosting another game.",
 				"config": "persistmatchsettings"
 			},
 			{
 				"type": "dropdown",
 				"label": "Default AI difficulty",
 				"tooltip": "Default difficulty of the AI.",
 				"config": "gui.gamesetup.aidifficulty",
 				"list": [
 					{ "value": 0, "label": "Sandbox" },
 					{ "value": 1, "label": "Very Easy" },
 					{ "value": 2, "label": "Easy" },
 					{ "value": 3, "label": "Medium" },
 					{ "value": 4, "label": "Hard" },
 					{ "value": 5, "label": "Very Hard" }
 				]
 			},
 			{
 				"type": "dropdown",
 				"label": "Default AI behavior",
 				"tooltip": "Default behavior of the AI.",
 				"config": "gui.gamesetup.aibehavior",
 				"list": [
 					{ "value": "random", "label": "Random" },
 					{ "value": "balanced", "label": "Balanced" },
 					{ "value": "aggressive", "label": "Aggressive" },
 					{ "value": "defensive", "label": "Defensive" }
 				]
 			},
 			{
 				"type": "dropdown",
 				"label": "Assign players",
 				"tooltip": "Automatically assign joining clients to free player slots during the match setup.",
 				"config": "gui.gamesetup.assignplayers",
 				"list": [
-					{ "value": "everyone", "label": "Everyone" },
-					{ "value": "buddies", "label": "Buddies" },
-					{ "value": "disabled", "label": "Disabled" }
+					{
+						"value": "everyone",
+						"label": "Everyone",
+						"tooltip": "Players joining the match will be assigned if there is a free slot."
+					},
+					{
+						"value": "buddies",
+						"label": "Buddies",
+						"tooltip": "Players joining the match will only be assigned if they are a buddy of the host and if there is a free slot."
+					},
+					{
+						"value": "disabled",
+						"label": "Disabled",
+						"tooltip": "Players only receive a slot when the host assigns them explicitly."
+					}
 				]
 			}
 		]
 	},
 	{
 		"label": "Lobby",
 		"tooltip": "These settings only affect the multiplayer.",
 		"options":
 		[
 			{
 				"type": "boolean",
 				"label": "TLS encryption",
 				"tooltip": "Protect login and data exchanged with the lobby server using TLS encryption.",
 				"config": "lobby.tls"
 			},
 			{
 				"type": "number",
 				"label": "Chat backlog",
 				"tooltip": "Number of backlogged messages to load when joining the lobby.",
 				"config": "lobby.history",
 				"min": "0"
 			},
 			{
 				"type": "boolean",
 				"label": "Game rating column",
 				"tooltip": "Show the average rating of the participating players in a column of the gamelist.",
 				"config": "lobby.columns.gamerating"
 			}
 		]
 	},
 	{
 		"label": "In-Game",
 		"tooltip": "Change options regarding the in-game settings.",
 		"options":
 		[
 			{
 				"type": "slider",
 				"label": "Wounded unit health",
 				"tooltip": "The wounded unit hotkey considers the selected units as wounded if their health percentage falls below this number.",
 				"config": "gui.session.woundedunithotkeythreshold",
 				"min": 0,
 				"max": 100
 			},
 			{
 				"type": "number",
 				"label": "Batch training size",
 				"tooltip": "Number of units trained per batch by default.",
 				"config": "gui.session.batchtrainingsize",
 				"min": 1,
 				"max": 20
 			},
 			{
 				"type": "slider",
 				"label": "Scroll batch increment ratio",
 				"tooltip": "Number of times you have to scroll to increase/decrease the batchsize by 1.",
 				"config": "gui.session.scrollbatchratio",
 				"min": 0.1,
 				"max": 30
 			},
 			{
 				"type": "boolean",
 				"label": "Chat notification attack",
 				"tooltip": "Show a chat notification if you are attacked by another player.",
 				"config": "gui.session.notifications.attack"
 			},
 			{
 				"type": "boolean",
 				"label": "Chat notification tribute",
 				"tooltip": "Show a chat notification if an ally tributes resources to another team member if teams are locked, and all tributes in observer mode.",
 				"config": "gui.session.notifications.tribute"
 			},
 			{
 				"type": "boolean",
 				"label": "Chat notification barter",
 				"tooltip": "Show a chat notification to observers when a player bartered resources.",
 				"config": "gui.session.notifications.barter"
 			},
 			{
 				"type": "dropdown",
 				"label": "Chat notification phase",
 				"tooltip": "Show a chat notification if you or an ally have started, aborted or completed a new phase, and phases of all players in observer mode.",
 				"config": "gui.session.notifications.phase",
 				"list": [
 					{ "value": "none", "label": "Disable" },
 					{ "value": "completed", "label": "Completed" },
 					{ "value": "all", "label": "All displayed" }
 				]
 			},
 			{
 				"type": "boolean",
 				"label": "Attack range visualization",
 				"tooltip": "Display the attack range of selected defensive structures (can also be toggled in-game with the hotkey).",
 				"config": "gui.session.attackrange"
 			},
 			{
 				"type": "boolean",
 				"label": "Aura range visualization",
 				"tooltip": "Display the range of auras of selected units and structures (can also be toggled in-game with the hotkey).",
 				"config": "gui.session.aurasrange"
 			},
 			{
 				"type": "boolean",
 				"label": "Heal range visualization",
 				"tooltip": "Display the healing range of selected units (can also be toggled in-game with the hotkey).",
 				"config": "gui.session.healrange"
 			},
 			{
 				"type": "boolean",
 				"label": "Rank icon above status bar",
 				"tooltip": "Show rank icons above status bars.",
 				"config": "gui.session.rankabovestatusbar"
 			},
 			{
 				"type": "boolean",
 				"label": "Experience status bar",
 				"tooltip": "Show an experience status bar above each selected unit.",
 				"config": "gui.session.experiencestatusbar"
 			},
 			{
 				"type": "boolean",
 				"label": "Detailed tooltips",
 				"tooltip": "Show detailed tooltips for trainable units in unit-producing structures.",
 				"config": "showdetailedtooltips"
 			},
 			{
 				"type": "dropdown",
 				"label": "Sort resources and population tooltip",
 				"tooltip": "Dynamically sort players in the resources and population tooltip by value.",
 				"config": "gui.session.respoptooltipsort",
 				"list": [
 					{ "value": 0, "label": "Unordered" },
 					{ "value": -1, "label": "Ascending" },
 					{ "value": 1, "label": "Descending" }
 				]
 			},
 			{
 				"type": "color",
 				"label": "Diplomacy colors: self",
 				"tooltip": "Color of your units when diplomacy colors are enabled.",
 				"config": "gui.session.diplomacycolors.self"
 			},
 			{
 				"type": "color",
 				"label": "Diplomacy colors: ally",
 				"tooltip": "Color of allies when diplomacy colors are enabled.",
 				"config": "gui.session.diplomacycolors.ally"
 			},
 			{
 				"type": "color",
 				"label": "Diplomacy colors: neutral",
 				"tooltip": "Color of neutral players when diplomacy colors are enabled.",
 				"config": "gui.session.diplomacycolors.neutral"
 			},
 			{
 				"type": "color",
 				"label": "Diplomacy colors: enemy",
 				"tooltip": "Color of enemies when diplomacy colors are enabled.",
 				"config": "gui.session.diplomacycolors.enemy"
 			}
 		]
 	}
 ]
Index: ps/trunk/binaries/data/mods/public/gui/options/options.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/options/options.xml	(revision 23413)
+++ ps/trunk/binaries/data/mods/public/gui/options/options.xml	(revision 23414)
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <objects>
 
 	<script directory="gui/common/"/>
 	<script directory="gui/options/"/>
 
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" sprite="ModernFade"/>
 
 	<!-- Settings Window -->
 	<object name="options" type="image" style="ModernDialog" size="50%-350 50%-332 50%+350 50%+332">
 
 		<object style="ModernLabelText" type="text" size="50%-128 -16 50%+128 16">
 			<translatableAttribute id="caption">Game Options</translatableAttribute>
 		</object>
 
 		<!-- Category Tabs -->
 		<object size="15 16 210 100%-52">
 			<include file="gui/common/tab_buttons.xml"/>
 		</object>
 
 		<!-- Option Controls -->
 		<object name="option_controls" type="image" sprite="ModernDarkBoxGold" size="220 16 685 100%-52">
 			<repeat count="25">
 				<object name="option_control[n]" size="0 0 100% 0">
 					<object name="option_label[n]" size="0 0 60% 100%" type="text" style="ModernLeftLabelText"/>
 					<object name="option_control_boolean[n]" size="90% 2 100% 100%+2" type="checkbox" style="ModernTickBox"/>
 					<object name="option_control_string[n]" size="65% 0 100%-8 100%" type="input" style="ModernInput"/>
 					<object name="option_control_color[n]" size="65%+40 0 100%-8 100%" type="input" style="ModernInput">
 						<object type="image" size="-40 4 -4 100%-4" sprite="color:gold"/>
 						<object type="image" size="-39 5 -5 100%-5"/>
 					</object>
 					<object name="option_control_number[n]" size="65% 0 100%-8 100%" type="input" style="ModernInput"/>
-					<object name="option_control_dropdown[n]" size="65% 0 100%-8 100%" type="dropdown" style="ModernDropDown"/>
+					<object name="option_control_dropdown[n]" size="65% 0 100%-8 100%" type="dropdown" style="ModernDropDown" tooltip_style="tooltipInstant"/>
 					<object name="option_control_slider[n]" size="65% 0 100%-8 100%" type="slider" style="ModernSlider"/>
 				</object>
 			</repeat>
 		</object>
 
 		<object type="button" style="ModernButtonRed" size="50%-336 100%-44 50%-186 100%-16">
 			<translatableAttribute id="caption">Reset</translatableAttribute>
 			<translatableAttribute id="tooltip">Resets user settings to their game default</translatableAttribute>
 			<action on="Press">setDefaults();</action>
 		</object>
 
 		<object name="revertChanges" type="button" style="ModernButtonRed" size="50%-160 100%-44 50%-4 100%-16">
 			<translatableAttribute id="caption">Revert</translatableAttribute>
 			<translatableAttribute id="tooltip">Reverts to previous saved settings</translatableAttribute>
 			<action on="Press">revertChanges();</action>
 		</object>
 
 		<object name="saveChanges" type="button" style="ModernButtonRed" size="50%+4 100%-44 50%+160 100%-16">
 			<translatableAttribute id="caption">Save</translatableAttribute>
 			<translatableAttribute id="tooltip">Saves changes</translatableAttribute>
 			<action on="Press">saveChanges();</action>
 		</object>
 
 		<object type="button" style="ModernButtonRed" size="50%+186 100%-44 50%+336 100%-16" hotkey="cancel">
 			<translatableAttribute id="caption">Close</translatableAttribute>
 			<translatableAttribute id="tooltip">Unsaved changes affect this session only</translatableAttribute>
 			<action on="Press">closePage();</action>
 		</object>
 
 	</object>
 </objects>