Fixes water rendering on map borders.

Tested By: Differential Revision: https://code.wildfiregames.com/D4716 This was SVN commit r27102.
Fix translations script pipeline.
2026-06-21 22:06:33 +00:00 · 2022-09-12 21:53:36 +00:00 · 2022-09-12 11:35:27 +00:00 · 2022-09-12 07:37:47 +00:00 · 2022-09-11 17:28:32 +00:00 · 2022-09-11 15:58:28 +00:00
7754 changed files with 75079 additions and 54219 deletions
@@ -26,6 +26,11 @@
 ; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
 windowed = false

+; Switches between real fullscreen and borderless window on a full display size.
+borderless.fullscreen = true
+; Hides a window border in the windowed mode.
+borderless.window = false
+
 ; Show detailed tooltips (Unit stats)
 showdetailedtooltips = false

@@ -63,7 +68,7 @@ forceglmajorversion = 3
 forceglminorversion = 3

 ; Big screenshot tiles
-screenshot.tiles = 4
+screenshot.tiles = 8
 screenshot.tilewidth = 480
 screenshot.tileheight = 270

@@ -94,7 +99,6 @@ shadowscutoffdistance = 300.0
 ; If true shadows cover the whole map instead of the camera frustum.
 shadowscovermap = false

-texturequality = 5     ; Texture resolution and quality (0 - Lowest, 1 Very Low, 2 - Low, 3 - Medium, 4 - High, 5 - Very High, 6 - Ultra)
 vsync = false
 particles = true
 fog = true
@@ -105,29 +109,40 @@ showsky = true
 ; for a debugging of a system without GL_KHR_debug.
 gl.checkerrorafterswap = false

-; Disable hardware cursors
-nohwcursor = false
+; Different ways to draw a cursor, possible values are "sdl" and "system".
+; The "system" one doesn't support a visual change of the cursor.
+cursorbackend = "sdl"

-; Specify the render path. This can be one of:
-;   default       Automatically select one of the below, depending on system capabilities
-;   fixed         Only use OpenGL fixed function pipeline
-;   shader        Use vertex/fragment shaders for transform and lighting where possible
-; Using 'fixed' instead of 'default' may work around some graphics-related problems,
-; but will reduce performance and features when a modern graphics card is available.
+; Backends for all graphics rendering:
+;   glarb - GL with legacy assembler-like shaders, might used only for buggy drivers.
+;   gl - GL with GLSL shaders, should be used by default.
+;   dummy - backend that does nothing, allows to check performance without backend drivers.
+rendererbackend = "gl"
+
+; Enables additional debug information in renderer backend.
+renderer.backend.debugcontext = "false"
+renderer.backend.debugmessages = "false"
+renderer.backend.debuglabels = "false"
+renderer.backend.debugscopedlabels = "false"
+
+; Should not be edited. It's used only for preventing of running fixed pipeline.
 renderpath = default

-;;;;; EXPERIMENTAL ;;;;;
-; Prefer GLSL shaders over ARB shaders. Allows fancier graphical effects.
-preferglsl = false
+; (0 - low, 1 - medium, 2 - high), higher quality means worse performance.
+textures.quality = 2

-; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
+; (1, 2, 4, 8 and 16)
+textures.maxanisotropy = 2
+
+;;;;; EXPERIMENTAL ;;;;;
+; Experimental probably-non-working GPU skinning support; requires GLSL; use at own risk
 gpuskinning = false

 ; Use smooth LOS interpolation
-smoothlos = false
+smoothlos = true

 ; Use screen-space postprocessing filters (HDR, bloom, DOF, etc). Incompatible with fixed renderpath.
-postproc = false
+postproc = true

 ; Use anti-aliasing techniques.
 antialiasing = "disabled"
@@ -143,19 +158,10 @@ max_actor_quality=200
 variant_diversity = "full"

 ; Quality level of shader effects (set to 10 to display all effects)
-materialmgr.quality = 2.0
+materialmgr.quality = 10.0

-; Maximum distance to display parallax effect. Set to 0 to disable parallax.
-materialmgr.PARALLAX_DIST.max = 150
-; Maximum distance to display high quality parallax effect.
-materialmgr.PARALLAX_HQ_DIST.max = 75
-; Maximum distance to display very high quality parallax effect. Set to 30 to enable.
-materialmgr.PARALLAX_VHQ_DIST.max = 0
 ;;;;;;;;;;;;;;;;;;;;;;;;

-; Replace alpha-blending with alpha-testing, for performance experiments
-forcealphatest = false
-
 ; Color of the sky (in "r g b" format)
 skycolor = "0 0 0"

@@ -283,8 +289,8 @@ idleworker = Period, NumDecimal         ; Select next idle worker
 idlewarrior = Slash, NumDivide          ; Select next idle warrior
 idleunit = BackSlash                    ; Select next idle unit
 offscreen = Alt                         ; Include offscreen units in selection
+singleselection = "" ; Modifier to select units individually, opposed to per formation.
 [hotkey.selection.group.add]
-0 = "Shift+0", "Shift+Num0"
 1 = "Shift+1", "Shift+Num1"
 2 = "Shift+2", "Shift+Num2"
 3 = "Shift+3", "Shift+Num3"
@@ -294,8 +300,8 @@ offscreen = Alt                         ; Include offscreen units in selection
 7 = "Shift+7", "Shift+Num7"
 8 = "Shift+8", "Shift+Num8"
 9 = "Shift+9", "Shift+Num9"
+10 = "Shift+0", "Shift+Num0"
 [hotkey.selection.group.save]
-0 = "Ctrl+0", "Ctrl+Num0"
 1 = "Ctrl+1", "Ctrl+Num1"
 2 = "Ctrl+2", "Ctrl+Num2"
 3 = "Ctrl+3", "Ctrl+Num3"
@@ -305,8 +311,8 @@ offscreen = Alt                         ; Include offscreen units in selection
 7 = "Ctrl+7", "Ctrl+Num7"
 8 = "Ctrl+8", "Ctrl+Num8"
 9 = "Ctrl+9", "Ctrl+Num9"
+10 = "Ctrl+0", "Ctrl+Num0"
 [hotkey.selection.group.select]
-0 = 0, Num0
 1 = 1, Num1
 2 = 2, Num2
 3 = 3, Num3
@@ -316,6 +322,7 @@ offscreen = Alt                         ; Include offscreen units in selection
 7 = 7, Num7
 8 = 8, Num8
 9 = 9, Num9
+10 = 0, Num0

 [hotkey.gamesetup]
 mapbrowser.open = "M"
@@ -353,6 +360,7 @@ snaptoedges = Ctrl           ; Modifier to align new structures with nearby exis
 toggledefaultformation = ""  ; Switch between null default formation and the last default formation used (defaults to "box")
 flare = K                    ; Modifier to send a flare to your allies
 flareactivate = ""           ; Modifier to activate the mode to send a flare to your allies
+calltoarms = ""              ; Modifier to call the selected units to the arms.
 ; Overlays
 showstatusbars = Tab         ; Toggle display of status bars
 devcommands.toggle = "Alt+D" ; Toggle developer commands panel
@@ -414,6 +422,7 @@ settingsslide = true              ; Enable/Disable settings panel slide
 progressdescription = false       ; Whether to display the progress percent or a textual description

 [gui.session]
+dragdelta = 4                     ; Number of pixels the mouse can move before the action is considered a drag
 camerajump.threshold = 40         ; How close do we have to be to the actual location in order to jump back to the previous one?
 timeelapsedcounter = false        ; Show the game duration in the top right corner
 ceasefirecounter = false          ; Show the remaining ceasefire time in the top right corner
@@ -433,8 +442,13 @@ disjointcontrolgroups = "true"    ; Whether control groups are disjoint sets or
 defaultformation = "special/formations/box" ; For walking orders, automatically put units into this formation if they don't have one already.
 formationwalkonly = "true"                  ; Formations are disabled when giving gather/attack/... orders.
 howtoshownames = 0 ; Whether the specific names are show as default, as opposed to the generic names. And whether the secondary names are shown. (0 - show both; specific names primary, 1 - show both; generic names primary, 2 - show only specific names, 3 - show only generic names)
+selectformationasone = "true" ; Whether to select formations as a whole by default.

 [gui.session.minimap]
+; Icons that are displayed for some entities on a minimap.
+icons.enabled = "true"
+icons.opacity = 1.0
+icons.sizescale = 1.0
 blinkduration = 1.7               ; The blink duration while pinging
 pingduration = 50.0               ; The duration for which an entity will be pinged after an attack notification

@@ -466,7 +480,7 @@ extended = true                     ; Whether to display the chat history

 [lobby]
 history = 0                         ; Number of past messages to display on join
-room = "arena25"                    ; Default MUC room to join
+room = "arena26"                    ; Default MUC room to join
 server = "lobby.wildfiregames.com"  ; Address of lobby server
 tls = true                          ; Whether to use TLS encryption when connecting to the server.
 verify_certificate = false          ; Whether to reject connecting to the lobby if the TLS certificate is invalid (TODO: wait for Gloox GnuTLS trust implementation to be fixed)
@@ -474,8 +488,8 @@ terms_url = "https://trac.wildfiregames.com/browser/ps/trunk/binaries/data/mods/
 terms_of_service = "0"              ; Version (hash) of the Terms of Service that the user has accepted
 terms_of_use = "0"                  ; Version (hash) of the Terms of Use that the user has accepted
 privacy_policy = "0"                ; Version (hash) of the Privacy Policy that the user has accepted
-xpartamupp = "wfgbot25"             ; Name of the server-side XMPP-account that manage games
-echelon = "echelon25"               ; Name of the server-side XMPP-account that manages ratings
+xpartamupp = "wfgbot26"             ; Name of the server-side XMPP-account that manage games
+echelon = "echelon26"               ; Name of the server-side XMPP-account that manages ratings
 buddies = ","                       ; Comma separated list of playernames that the current user has marked as buddies
 rememberpassword = true             ; Whether to store the encrypted password in the user config

@@ -494,7 +508,8 @@ delay = 200                          ; Duration in milliseconds that is waited b
 enabledmods = "mod public"

 [modio]
-public_key = "RWTVElEmCfAMGk/jtMc2I9/ElBvoJituKdbDWqqj6D69qz2cKexU4gv+" ; Public key corresponding to the private key valid mods are signed with
+
+public_key = "RWQa4XiSn+BLxIYXNrXyz68wwTGWyZ7+kxDtZuLHBXkCtt+lLB8VnpdM" ; Public key corresponding to the private key valid mods are signed with
 disclaimer = "0"                     ; Version (hash) of the Disclaimer that the user has accepted

 [modio.v1]
@@ -506,7 +521,7 @@ name_id = "0ad"
 duplicateplayernames = false      ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
 lateobservers = everyone          ; Allow observers to join the game after it started. Possible values: everyone, buddies, disabled.
 observerlimit = 8                 ; Prevent further observer joins in running games if this limit is reached
-observermaxlag = 10               ; Make clients wait for observers if they lag more than X turns behind. -1 means "never wait for observers".
+observermaxlag = -1               ; Make clients wait for observers if they lag more than X turns behind. -1 means "never wait for observers".
 autocatchup = true        ; Auto-accelerate the sim rate if lagging behind (as an observer).

 [overlay]
@@ -516,9 +531,7 @@ netwarnings = "true"              ; Show warnings if the network connection is b

 [profiler2]
 autoenable = false                ; Enable HTTP server output at startup (default off for security/performance)
-gpu.arb.enable = true             ; Allow GL_ARB_timer_query timing mode when available
-gpu.ext.enable = true             ; Allow GL_EXT_timer_query timing mode when available
-gpu.intel.enable = true           ; Allow GL_INTEL_performance_queries timing mode when available
+gpu.arb.enable = true             ; Allow GL_ARB_timer_query timing mode when available.

 [rlinterface]
 address = "127.0.0.1:6000"
@@ -549,6 +562,7 @@ terms = "0"                       ; Version (hash) of the UserReporter Terms tha
 [view] ; Camera control settings
 scroll.speed = 120.0
 scroll.speed.modifier = 1.05      ; Multiplier for changing scroll speed
+scroll.mouse.detectdistance = 3
 rotate.x.speed = 1.2
 rotate.x.min = 28.0
 rotate.x.max = 60.0
@@ -1,7 +1,9 @@
-100
+101
 256 256
+a
 606
-20
+15
+12
 32 0 256 0 0 0 0 5
 33 250 154 3 11 1 11 4
 34 121 18 5 4 0 11 5
@@ -0,0 +1,23 @@
+/**
+ * This file is called from the visual & non-visual paths when autostarting.
+ * To avoid relying on the GUI, this script has access to a special 'LoadScript' function.
+ * See implementation in the public mod for more details.
+ */
+
+function autostartClient(initData)
+{
+	throw new Error("Autostart is not implemented in the 'mod' mod");
+}
+
+function autostartHost(initData, networked = false)
+{
+	throw new Error("Autostart is not implemented in the 'mod' mod");
+}
+
+/**
+ * @returns false if the loop should carry on.
+ */
+function onTick()
+{
+	return true;
+}
@@ -15,6 +15,25 @@ function messageBox(mbWidth, mbHeight, mbMessage, mbTitle, mbButtonCaptions, mbB
 		});
 }

+function timedConfirmation(width, height, message, timeParameter, timeout, title, buttonCaptions, btnCode, callbackArgs)
+{
+	Engine.PushGuiPage(
+		"page_timedconfirmation.xml",
+		{
+			"width": width,
+			"height": height,
+			"message": message,
+			"timeParameter": timeParameter,
+			"timeout": timeout,
+			"title": title,
+			"buttonCaptions": buttonCaptions
+		},
+		button => {
+			if (btnCode !== undefined && btnCode[button])
+				btnCode[button](callbackArgs ? callbackArgs[button] : undefined);
+		});
+}
+
 function openURL(url)
 {
 	Engine.OpenURL(url);
@@ -21,3 +21,12 @@ function setStringTags(text, tags)

 	return result;
 }
+
+
+/**
+ * Adds grey font if is not compatible.
+ */
+function compatibilityColor(text, isCompatible)
+{
+	return isCompatible ? text : coloredText(text, "96 96 96");
+}
@@ -122,7 +122,7 @@ function translatePluralWithContext(context, singularMessage, pluralMessage, num
 /**
 * The input object should contain either of the following properties:
 *
- *     • A ‘message’ property that contains a message to translate.
+ *     • A ‘_string’ property that contains a message to translate.
 *
 *     • A ‘list’ property that contains a list of messages to translate as a
 *     comma-separated list of translated.
@@ -137,8 +137,8 @@ function translateMessageObject(object)
 	if (object.context)
 		trans = msg => translateWithContext(object.context, msg);

-	if (object.message)
-		object = trans(object.message);
+	if (object._string)
+		object = trans(object._string);
 	else if (object.list)
 		object = object.list.map(trans).join(translateWithContext("enumeration", ", "));

@@ -152,19 +152,19 @@ function translateMessageObject(object)
 * it accepts an object in the form of
 *
 * {
- *   translatedString1: "my first message",
- *   unTranslatedString1: "some English string",
- *   ignoredObject: {
- *     translatedString2: "my second message",
- *     unTranslatedString2: "some English string"
+ *   "translatedString1": "my first message",
+ *   "unTranslatedString1": "some English string",
+ *   "ignoredObject": {
+ *     "translatedString2": "my second message",
+ *     "unTranslatedString2": "some English string"
 *   },
- *   translatedObject1: {
- *     message: "my third singular message",
- *     context: "message context",
+ *   "translatedObject1": {
+ *     "_string": "my third singular message",
+ *     "context": "message context",
 *   },
 *   translatedObject2: {
- *     list: ["list", "of", "strings"],
- *     context: "message context",
+ *     "list": ["list", "of", "strings"],
+ *     "context": "message context",
 *   },
 * }
 *
@@ -174,14 +174,14 @@ function translateMessageObject(object)
 *
 * The result will be (f.e. in Dutch)
 * {
- *  translatedString1: "mijn eerste bericht",
- *   unTranslatedString1: "some English string",
- *   ignoredObject: {
- *     translatedString2: "mijn tweede bericht",
- *     unTranslatedString2: "some English string"
+ *  "translatedString1": "mijn eerste bericht",
+ *   "unTranslatedString1": "some English string",
+ *   "ignoredObject": {
+ *     "translatedString2": "mijn tweede bericht",
+ *     "unTranslatedString2": "some English string"
 *   },
- *   translatedObject1: "mijn derde bericht",
- *   translatedObject2: "lijst, van, teksten",
+ *   "translatedObject1": "mijn derde bericht",
+ *   "translatedObject2": "lijst, van, teksten",
 * }
 *
 * So you see that the keys array can also contain lower-level keys,
@@ -127,7 +127,7 @@
 		<image texture = "global/modern/dialog-deco-bottom.png"
 			real_texture_placement = "0 0 64 32"
 			texture_size = "0 0 64 32"
-			size = "100%-31 100%-22 100%+33 100%+10"
+			size = "100%-33 100%-22 100%+31 100%+10"
 		/>

 		<!-- title frame -->
@@ -684,12 +684,26 @@
 			size="50%-10 50%-10 50%+11 50%+11"
 		/>
 	</sprite>
+	<sprite name="ModernSliderButtonDisabled">
+		<effect grayscale=""/>
+		<image texture="global/modern/tick-on.png"
+			real_texture_placement="0 0 27 27"
+			size="50%-10 50%-10 50%+11 50%+11"
+		/>
+	</sprite>
 	<sprite name="ModernSliderLine">
 		<image texture="global/modern/gold-separator.png"
 			real_texture_placement="0 0 806 1"
 			size="0 50%-1 100% 50%+1"
 		/>
 	</sprite>
+	<sprite name="ModernSliderLineDisabled">
+		<effect grayscale=""/>
+		<image texture="global/modern/gold-separator.png"
+			real_texture_placement="0 0 806 1"
+			size="0 50%-1 100% 50%+1"
+		/>
+	</sprite>

 	<sprite name="ModernArrowDownRed">
 		<effect add_color="123 53 53"/>
@@ -137,7 +137,7 @@
 	/>
 	<style name="ModernInput"
 		sprite="ModernDarkBox"
-		sprite_overlay="ModernDarkBoxWhiteBorder"
+		sprite_overlay="ModernDarkBoxGoldBorder"
 		sprite_selectarea="color:150 0 0"
 		textcolor="white"
 		textcolor_selected="white"
@@ -152,7 +152,9 @@
 	/>
 	<style name="ModernSlider"
 		sprite="ModernSliderButton"
+		sprite_disabled="ModernSliderButtonDisabled"
 		sprite_bar="ModernSliderLine"
+		sprite_bar_disabled="ModernSliderLineDisabled"
 		button_width="20"
 		tooltip_style="tooltipInstant"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
@@ -0,0 +1,35 @@
+function distributeButtonsHorizontally(button, captions)
+{
+	const y1 = "100%-46";
+	const y2 = "100%-18";
+	switch (captions.length)
+	{
+	case 1:
+		button[0].size = "18 " + y1 + " 100%-18 " + y2;
+		break;
+	case 2:
+		button[0].size = "18 " + y1 + " 50%-5 " + y2;
+		button[1].size = "50%+5 " + y1 + " 100%-18 " + y2;
+		break;
+	case 3:
+		button[0].size = "18 " + y1 + " 33%-5 " + y2;
+		button[1].size = "33%+5 " + y1 + " 66%-5 " + y2;
+		button[2].size = "66%+5 " + y1 + " 100%-18 " + y2;
+		break;
+	}
+}
+
+function setButtonCaptionsAndVisibitily(button, captions, cancelHotkey, name)
+{
+	captions.forEach((caption, i) => {
+		button[i] = Engine.GetGUIObjectByName(name + (i + 1));
+		button[i].caption = caption;
+		button[i].hidden = false;
+		button[i].onPress = () => {
+			Engine.PopGuiPage(i);
+		};
+
+		if (i == 0)
+			cancelHotkey.onPress = button[i].onPress;
+	});
+}
@@ -242,7 +242,7 @@
      </optional>
      <optional>
        <attribute name="flare_animation_speed">
-          <data type="nonNegativeInteger"/>
+          <data type="decimal"/>
        </attribute>
      </optional>
      <optional>
@@ -252,7 +252,17 @@
      </optional>
      <optional>
        <attribute name="flare_lifetime_seconds">
-          <data type="nonNegativeInteger"/>
+          <data type="decimal"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="flare_start_fade_seconds">
+          <data type="decimal"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="flare_stop_fade_seconds">
+          <data type="decimal"/>
        </attribute>
      </optional>
      <optional>
@@ -385,13 +395,13 @@
        <attribute name="sprite_asc"/>
      </optional>
      <optional>
-        <attribute name="sprite_heading"/>
+        <attribute name="sprite_background"/>
      </optional>
      <optional>
        <attribute name="sprite_bar"/>
      </optional>
      <optional>
-        <attribute name="sprite_background"/>
+        <attribute name="sprite_bar_disabled"/>
      </optional>
      <optional>
        <attribute name="sprite_desc"/>
@@ -399,6 +409,9 @@
      <optional>
        <attribute name="sprite_disabled"/>
      </optional>
+      <optional>
+        <attribute name="sprite_heading"/>
+      </optional>
      <optional>
        <attribute name="sprite_list"/>
      </optional>
@@ -6,7 +6,7 @@
 * A mod is defined by a mod.json file, for example
 *	{
 *		"name": "0ad",
- *		"version": "0.0.24",
+ *		"version": "0.0.26",
 *		"label": "0 A.D. - Empires Ascendant",
 *		"url": "https://wildfiregames.com/",
 *		"description": "A free, open-source, historical RTS game.",
@@ -19,7 +19,7 @@
 *		"label": "Mod 2",
 *		"version": "1.1",
 *		"description": "",
- *		"dependencies": ["0ad<=0.0.24", "rote"]
+ *		"dependencies": ["0ad<=0.0.26", "rote"]
 *	}
 *
 * A mod is identified by the directory name.
@@ -144,7 +144,7 @@ function initGUIFilters()
 function initGUIButtons(data)
 {
 	// Either get back to the previous page or quit if there is no previous page
-	let hasPreviousPage = !data || data.cancelbutton;
+	let hasPreviousPage = !data || data.cancelbutton || false;
 	Engine.GetGUIObjectByName("cancelButton").hidden = !hasPreviousPage;
 	Engine.GetGUIObjectByName("quitButton").hidden = hasPreviousPage;
 	// Turn 'save' off, it will be enabled on any change.
@@ -112,6 +112,7 @@

 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Enabled Mods</translatableAttribute>
+				<translatableAttribute id="tooltip">Enabled mods are loaded from top to bottom. Mods loaded later might overwrite settings of mods loaded earlier. It is advisable to have more complex mods loaded last. Use the arrows on the right to change the loading order.</translatableAttribute>
 			</object>

 			<object name="modsEnabledList"
@@ -5,7 +5,7 @@ const g_ModProperties = {
 		"type": "string",
 		"validate": validateName
 	},
-	// example: "0.0.24"
+	// example: "0.0.26"
 	"version": {
 		"required": true,
 		"type": "string",
@@ -19,7 +19,7 @@ const g_ModProperties = {
 	},
 	// example: "0 A.D. - Empires Ascendant"
 	"label": {
-		"require": true,
+		"required": true,
 		"type": "string",
 		"validate": validateLabel
 	},
@@ -24,37 +24,7 @@ function init(data)

 	let captions = data.buttonCaptions || [translate("OK")];

-	// Set button captions and visibility
 	let mbButton = [];
-	captions.forEach((caption, i) => {
-		mbButton[i] = Engine.GetGUIObjectByName("mbButton" + (i + 1));
-		mbButton[i].caption = caption;
-		mbButton[i].hidden = false;
-		mbButton[i].onPress = () => {
-			Engine.PopGuiPage(i);
-		};
-
-		// Convention: Cancel is the first button
-		if (i == 0)
-			mbCancelHotkey.onPress = mbButton[i].onPress;
-	});
-
-	// Distribute buttons horizontally
-	let y1 = "100%-46";
-	let y2 = "100%-18";
-	switch (captions.length)
-	{
-	case 1:
-		mbButton[0].size = "18 " + y1 + " 100%-18 " + y2;
-		break;
-	case 2:
-		mbButton[0].size = "18 " + y1 + " 50%-5 " + y2;
-		mbButton[1].size = "50%+5 " + y1 + " 100%-18 " + y2;
-		break;
-	case 3:
-		mbButton[0].size = "18 " + y1 + " 33%-5 " + y2;
-		mbButton[1].size = "33%+5 " + y1 + " 66%-5 " + y2;
-		mbButton[2].size = "66%+5 " + y1 + " 100%-18 " + y2;
-		break;
-	}
+	setButtonCaptionsAndVisibitily(mbButton, captions, mbCancelHotkey, "mbButton");
+	distributeButtonsHorizontally(mbButton, captions);
 }
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
+
+	<include>timedconfirmation/timedconfirmation.xml</include>
+</page>
@@ -0,0 +1,74 @@
+/**
+ * @class TimedConfirmation
+ * This class displays confirmation box, which will be closed after defined time in miliseconds.
+ */
+class TimedConfirmation
+{
+	/**
+	 * @param {Object} data
+	 * @param {Number} data.width - The width of the confirmation box
+	 * @param {Number} data.height - The height of the confirmation box
+	 * @param {String} data.message - The message to be displayed with parameter for time which will be displayed in seconds
+	 * @param {String} data.timeParameter - The string used in 'message' for time, e.g 'time' with %(time)s in message
+	 * @param {Number} data.timeout - The time in miliseconds after which confirmation box closes itself
+	 * @param {String} data.title - The string displayed in header
+	 * @param {String|undefined} data.buttonCaptions - The captions used for buttons (if not defined, defaults to 'OK')
+	 * @param {String|undefined} data.font - The used font
+	 */
+	constructor(data)
+	{
+		this.messageObject = Engine.GetGUIObjectByName("tmcText");
+		this.panel = Engine.GetGUIObjectByName("tmcMain");
+		this.panel.onTick = this.onTick.bind(this);
+		this.setup(data);
+	}
+
+	setup(data)
+	{
+		Engine.GetGUIObjectByName("tmcTitleBar").caption = data.title;
+
+		this.timeout = +data.timeout + Date.now();
+		this.message = data.message;
+		this.timeParameter = data.timeParameter;
+
+		if (data.font)
+			this.messageObject.font = data.font;
+
+		this.updateDisplayedTimer(data.timeout);
+
+		const cancelHotkey = Engine.GetGUIObjectByName("tmcCancelHotkey");
+		cancelHotkey.onPress = Engine.PopGuiPage;
+
+		const lRDiff = data.width / 2;
+		const uDDiff = data.height / 2;
+		this.panel.size = "50%-" + lRDiff + " 50%-" + uDDiff + " 50%+" + lRDiff + " 50%+" + uDDiff;
+
+		const captions = data.buttonCaptions || [translate("OK")];
+
+		const button = [];
+		setButtonCaptionsAndVisibitily(button, captions, cancelHotkey, "tmcButton");
+		distributeButtonsHorizontally(button, captions);
+	}
+
+	onTick()
+	{
+		const remaining = this.timeout - Date.now();
+		if (remaining < 1)
+			Engine.GetGUIObjectByName("tmcButton1").onPress();
+
+		this.updateDisplayedTimer(remaining);
+	}
+
+	updateDisplayedTimer(time)
+	{
+		this.messageObject.caption = sprintf(
+			this.message,
+			{ [this.timeParameter]: Math.ceil(time / 1000) }
+		);
+	}
+}
+
+function init(data)
+{
+	new TimedConfirmation(data);
+}
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<objects>
+
+	<script directory="gui/common/"/>
+	<script directory="gui/timedconfirmation/"/>
+
+	<!-- Fade out the background because it's non-interactable -->
+	<object sprite="ModernFade" type="image"/>
+	<object name="tmcCancelHotkey" hotkey="cancel" />
+	<object name="tmcMain"
+			style="ModernDialog"
+			type="image"
+	>
+		<object name="tmcTitleBar"
+				style="ModernLabelText"
+				type="text"
+				size="50%-128 -18 50%+128 14"
+		/>
+		<object name="tmcTimerDisplay"
+				type="text"
+				style="ModernLabelText"
+				size="18 28 100%-18 38"
+		/>
+		<object name="tmcText"
+				type="text"
+				style="ModernLabelText"
+				size="18 40 100%-18 100%-64"
+		/>
+		<!-- The size of the following buttons is set dynamically in timedconfirmation.js -->
+		<object name="tmcButton1"
+				style="ModernButtonRed"
+				type="button"
+				hidden="true"
+		/>
+		<object name="tmcButton2"
+				style="ModernButtonRed"
+				type="button"
+				hidden="true"
+		/>
+		<object name="tmcButton3"
+				style="ModernButtonRed"
+				type="button"
+				hidden="true"
+		/>
+	</object>
+</objects>
@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2022 Wildfire Games.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -209,10 +209,10 @@ function RunDetection(settings)
 	var gfx_mem = settings.gfx_mem;

 	// Values from glGetString
-	var GL_VENDOR = settings.GL_VENDOR;
-	var GL_RENDERER = settings.GL_RENDERER;
-	var GL_VERSION = settings.GL_VERSION;
-	var GL_EXTENSIONS = settings.GL_EXTENSIONS.split(" ");
+	var GL_VENDOR = settings.renderer_backend.GL_VENDOR;
+	var GL_RENDERER = settings.renderer_backend.GL_RENDERER;
+	var GL_VERSION = settings.renderer_backend.GL_VERSION;
+	var GL_EXTENSIONS = settings.renderer_backend.GL_EXTENSIONS.split(" ");

 	// Enable GLSL on OpenGL 3+, which should be able to properly
 	// manage GLSL shaders, needed for effects like windy trees
@@ -340,6 +340,10 @@ function RunDetection(settings)

 global.RunHardwareDetection = function(settings)
 {
+	// Currently we don't have limitations for other backends than GL and GL ARB.
+	if (settings.renderer_backend.name != 'gl' && settings.renderer_backend.name != 'glarb')
+		return;
+
 	//print(JSON.stringify(settings, null, 1)+"\n");

 	var output = RunDetection(settings);
@@ -15,9 +15,9 @@ print("<th>Output");
 print("<th>Warnings");

 hwdetectTestData.sort(function(a, b) {
-	if (a.GL_RENDERER < b.GL_RENDERER)
+	if (a.renderer_backend.GL_RENDERER < b.renderer_backend.GL_RENDERER)
 		return -1;
-	if (b.GL_RENDERER < a.GL_RENDERER)
+	if (b.renderer_backend.GL_RENDERER < a.renderer_backend.GL_RENDERER)
 		return +1;
 	return 0;
 });
@@ -35,7 +35,7 @@ for (var settings of hwdetectTestData)

 	print("<tr>");
 	print("<td>" + os);
-	print("<td>" + settings.GL_RENDERER);
+	print("<td>" + settings.renderer_backend.GL_RENDERER);
 	print("<td>" + disabled.join(" "));
 	print("<td>" + output.warnings.concat(output.dialog_warnings).join("\n"));
 }
@@ -18,7 +18,7 @@ DP3 colorGray.rgb, colorTex, grayscale;
 MOV colorGray.a, colorTex.a;

 TEMP color;
-LRP color, grayscaleFactor, colorGray, colorTex;
+LRP color, grayscaleFactor.r, colorGray, colorTex;
 MUL color, color, colorMul;
 ADD color, color, colorAdd;

@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <effect>

-    <technique>
-        <require shaders="arb"/>
-        <pass shader="arb/canvas2d"/>
-    </technique>
+	<technique>
+		<require shaders="arb"/>
+		<pass shader="arb/canvas2d">
+			<depth test="FALSE" mask="false"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>

-    <technique>
-        <require shaders="glsl"/>
-        <pass shader="glsl/canvas2d"/>
-    </technique>
+	<technique>
+		<require shaders="glsl"/>
+		<pass shader="glsl/canvas2d">
+			<depth test="FALSE" mask="false"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>

 </effect>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<pass shader="glsl/cas">
+			<depth test="FALSE" mask="false"/>
+		</pass>
+	</technique>
+</effect>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+	<technique>
+		<require shaders="glsl"/>
+		<pass shader="glsl/fxaa">
+			<depth test="FALSE" mask="false"/>
+		</pass>
+	</technique>
+</effect>
@@ -2,10 +2,8 @@
 <program type="glsl">

    <vertex file="glsl/canvas2d.vs">
-        <stream name="pos"/>
-        <stream name="uv0"/>
-        <attrib name="a_vertex" semantics="gl_Vertex"/>
-        <attrib name="a_uv0" semantics="gl_MultiTexCoord0"/>
+        <stream name="pos" attribute="a_vertex"/>
+        <stream name="uv0" attribute="a_uv0"/>
    </vertex>

    <fragment file="glsl/canvas2d.fs"/>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="glsl">
+
+	<vertex file="glsl/simple.vs">
+		<stream name="pos" attribute="a_vertex"/>
+		<stream name="uv0" attribute="a_uv0"/>
+	</vertex>
+
+	<fragment file="glsl/cas.fs"/>
+
+</program>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="glsl">
+
+	<vertex file="glsl/simple.vs">
+		<stream name="pos" attribute="a_vertex"/>
+		<stream name="uv0" attribute="a_uv0"/>
+	</vertex>
+
+	<fragment file="glsl/fxaa.fs"/>
+
+</program>
@@ -37,7 +37,7 @@
                        </zeroOrMore>
                    </element>
                </group>
-                
+
                <group>
                    <attribute name="type">
                        <value>glsl</value>
@@ -46,33 +46,7 @@
                    <element name="vertex">
                        <attribute name="file"><text/></attribute>
                        <zeroOrMore>
-                            <choice>
-                                <element name="attrib">
-                                    <ref name="conditional"/>
-                                    <attribute name="name"><text/></attribute>
-                                    <attribute name="semantics">
-                                        <choice>
-                                            <value>gl_Vertex</value>
-                                            <value>gl_Normal</value>
-                                            <value>gl_Color</value>
-                                            <value>gl_SecondaryColor</value>
-                                            <value>gl_FogCoord</value>
-                                            <value>gl_MultiTexCoord0</value>
-                                            <value>gl_MultiTexCoord1</value>
-                                            <value>gl_MultiTexCoord2</value>
-                                            <value>gl_MultiTexCoord3</value>
-                                            <value>gl_MultiTexCoord4</value>
-                                            <value>gl_MultiTexCoord5</value>
-                                            <value>gl_MultiTexCoord6</value>
-                                            <value>gl_MultiTexCoord7</value>
-                                            <value>CustomAttribute0</value>
-                                            <value>CustomAttribute1</value>
-                                            <value>CustomAttribute2</value>
-                                        </choice>
-                                    </attribute>
-                                </element>
-                                <ref name="streamContent"/>
-                            </choice>
+                            <ref name="streamContent"/>
                        </zeroOrMore>
                    </element>

@@ -120,8 +94,15 @@
                    <value>uv1</value>
                    <value>uv2</value>
                    <value>uv3</value>
+                    <value>uv4</value>
+                    <value>uv5</value>
+                    <value>uv6</value>
+                    <value>uv7</value>
                </choice>
            </attribute>
+            <optional>
+                <attribute name="attribute"><text/></attribute>
+            </optional>
        </element>
    </define>

@@ -11,8 +11,10 @@
  </group>
  <group>
    <variant name="texture">
-      <textures><texture file="gaia/tree_cypress_b.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_cypress_b.png" name="baseTex"/>
+      </textures>
    </variant>
  </group>
-  <material>alphatest.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant name="crow" frequency="1">
+      <animations>
+        <animation file="other/crow_flight.dae" frequency="1" name="Idle" speed="150"/>
+        <animation file="other/crow_flight.dae" frequency="1" name="Idle" speed="200"/>
+        <animation file="other/crow_glide.dae" frequency="2" name="Idle" speed="30"/>
+        <animation file="other/crow_glide.dae" frequency="2" name="Idle" speed="75"/>
+      </animations>
+      <textures>
+        <texture file="skeletal/animal_crow.png" name="baseTex"/>
+      </textures>
+      <mesh>skeletal/crow.dae</mesh>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="Murder of Crows">
+      <animations>
+        <animation file="others/bird_circle_idle_01.dae" name="Idle" speed="100"/>
+      </animations>
+      <mesh>skeletal/bird_circle.dae</mesh>
+      <textures>
+        <texture file="null_white.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Variant 01">
+      <props>
+        <prop actor="fauna/crow.xml" attachpoint="fish_01"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_09"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_19"/>
+      </props>
+    </variant>
+    <variant frequency="100" name="Variant 02">
+      <props>
+        <prop actor="fauna/crow.xml" attachpoint="fish_02"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_10"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_20"/>
+      </props>
+    </variant>
+    <variant frequency="100" name="Variant 03">
+      <props>
+        <prop actor="fauna/crow.xml" attachpoint="fish_05"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_20"/>
+      </props>
+    </variant>
+    <variant frequency="100" name="Variant 04">
+      <props>
+        <prop actor="fauna/crow.xml" attachpoint="fish_01"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_02"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_03"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_04"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_05"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_06"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_07"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_08"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_09"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_10"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_11"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_12"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_13"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_14"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_15"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_16"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_17"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_18"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_19"/>
+        <prop actor="fauna/crow.xml" attachpoint="fish_20"/>
+      </props>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
@@ -7,7 +7,7 @@
        <animation file="quadraped/deer_idle_01.dae" name="idle" speed="20"/>
        <animation file="quadraped/deer_idle_02.dae" name="idle" speed="20"/>
        <animation file="quadraped/deer_idle_03.dae" name="idle" speed="20"/>
-        <animation file="quadraped/deer_walk_01.dae" name="walk" speed="35"/>
+        <animation file="quadraped/deer_walk_01.dae" name="walk" speed="25"/>
        <animation file="quadraped/deer_run_01.dae" name="run" speed="15"/>
        <animation file="quadraped/deer_attack_01.dae" name="attack_melee" speed="20"/>
      </animations>
@@ -8,12 +8,13 @@
        <animation file="other/fish_generic_idle_b.dae" name="Idle" speed="50"/>
        <animation file="other/fish_generic_idle_c.dae" name="Idle" speed="35"/>
      </animations>
+      <props>
+        <prop actor="fauna/seagull_circle.xml" attachpoint="root"/>
+      </props>
      <mesh>skeletal/fish_generic.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="100" name="generic texture">
-      <textures><texture file="skeletal/animal_fish_generic.png" name="baseTex"/></textures>
+      <textures>
+        <texture file="skeletal/animal_fish_generic.png" name="baseTex"/>
+      </textures>
    </variant>
  </group>
  <material>basic_spec.xml</material>
@@ -7,7 +7,7 @@
        <animation file="quadraped/deer_idle_01.dae" name="idle" speed="20"/>
        <animation file="quadraped/deer_idle_02.dae" name="idle" speed="20"/>
        <animation file="quadraped/deer_idle_03.dae" name="idle" speed="20"/>
-        <animation file="quadraped/deer_walk_01.dae" name="walk" speed="35"/>
+        <animation file="quadraped/deer_walk_01.dae" name="walk" speed="25"/>
        <animation file="quadraped/deer_run_01.dae" name="run" speed="15"/>
        <animation file="quadraped/deer_attack_01.dae" name="attack_melee" speed="20"/>
      </animations>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/bay_01.xml" frequency="1" name="bay_01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/bay_02.xml" frequency="1" name="bay_02"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/beige.xml" frequency="1" name="beige"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/black.xml" frequency="1" name="black"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown.xml" frequency="1" name="brown"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_lusitano.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/brown_spotted_01.xml" frequency="1" name="Brown-Spotted-01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/cherrybay.xml" frequency="1" name="cherrybay"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/chestnut_01.xml" frequency="1" name="chestnut-01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/chestnut_02.xml" frequency="1" name="chestnut-02"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/cream_spotted_01.xml" frequency="1" name="cream_spotted_01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/cream_spotted_02.xml" frequency="1" name="cream_spotted_02"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/dark_chestnut.xml" frequency="1" name="dark_chestnut"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_persian.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/fading_black.xml" frequency="1" name="fading_black"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/gray.xml" frequency="1" name="gray"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/halflinger.xml" frequency="1" name="halflinger"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_lusitano.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/lusitano_01.xml" frequency="1" name="lusitano-01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_lusitano.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/lusitano_02.xml" frequency="1" name="lusitano-02"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_lusitano.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/palomino_01.xml" frequency="1" name="palomino_01"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_lusitano.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/palomino_02.xml" frequency="1" name="palomino_02"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_lusitano.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/pure_black.xml" frequency="1" name="pure_black"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_lusitano.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/pure_white.xml" frequency="1" name="pure_white"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/skewbald.xml" frequency="1" name="skewbald"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/tan.xml" frequency="1" name="tan"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>skeletal/horse_celtic.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/white.xml" frequency="1" name="white"/>
+  </group>
+  <group>
+    <variant file="quadraped/base_horse_fauna.xml" name="Horse-Fauna" frequency="1"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -19,12 +19,12 @@
  <group>
    <variant frequency="1" name="brown">
      <textures>
-        <texture file="skeletal/mastiff_new.png" name="baseTex"/>
+        <texture file="skeletal/brit/mastiff_b_01.png" name="baseTex"/>
      </textures>
    </variant>
    <variant frequency="1" name="taupe">
      <textures>
-        <texture file="skeletal/mastiff_new2.png" name="baseTex"/>
+        <texture file="skeletal/brit/mastiff_b_02.png" name="baseTex"/>
      </textures>
    </variant>
  </group>
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="1" file="quadraped/base_pony_fauna.xml" name="Pony">
-      <mesh>skeletal/pony.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant file="quadraped/horse/fauna/pony_brown.xml" frequency="1" name="horse-04"/>
-    <variant file="quadraped/horse/fauna/pony_beige.xml" frequency="1" name="horse-01"/>
-    <variant file="quadraped/horse/fauna/pony_bay_01.xml" frequency="1" name="horse-02"/>
-    <variant file="quadraped/horse/fauna/pony_bay_02.xml" frequency="1" name="horse-03"/>
-  </group>
-  <group>
-    <variant frequency="1" name="Idle"/>
-    <variant file="quadraped/base_horse_death.xml"/>
-    <variant file="quadraped/base_horse_run.xml"/>
-  </group>
-  <material>no_trans_parallax_spec.xml</material>
-</actor>
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" file="quadraped/base_pony_fauna.xml" name="Pony">
+      <mesh>skeletal/pony.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant file="quadraped/horse/fauna/pony_brown.xml" frequency="1" name="horse-04"/>
+    <variant file="quadraped/horse/fauna/pony_beige.xml" frequency="1" name="horse-01"/>
+    <variant file="quadraped/horse/fauna/pony_bay_01.xml" frequency="1" name="horse-02"/>
+    <variant file="quadraped/horse/fauna/pony_bay_02.xml" frequency="1" name="horse-03"/>
+  </group>
+  <group>
+    <variant frequency="1" name="Idle"/>
+    <variant file="quadraped/base_horse_death.xml"/>
+    <variant file="quadraped/base_horse_run.xml"/>
+  </group>
+  <material>no_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant name="Seagull" frequency="1">
+      <animations>
+        <animation file="other/seagull_flight_01.dae" name="Idle" speed="150"/>
+        <animation file="other/seagull_flight_02.dae" name="Idle" speed="100"/>
+      </animations>
+      <textures>
+        <texture file="skeletal/animal_seagull.png" name="baseTex"/>
+      </textures>
+      <mesh>skeletal/seagull.dae</mesh>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="100" name="fish mesh">
+      <animations>
+        <animation file="others/bird_circle_idle_01.dae" name="Idle" speed="100"/>
+      </animations>
+      <mesh>skeletal/bird_circle.dae</mesh>
+      <textures>
+        <texture file="null_white.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Variant A">
+      <props>
+        <prop actor="fauna/seagull.xml" attachpoint="fish_01"/>
+        <prop actor="fauna/seagull.xml" attachpoint="fish_09"/>
+        <prop actor="fauna/seagull.xml" attachpoint="fish_19"/>
+      </props>
+    </variant>
+    <variant frequency="100" name="Variant B">
+      <props>
+        <prop actor="fauna/seagull.xml" attachpoint="fish_02"/>
+        <prop actor="fauna/seagull.xml" attachpoint="fish_10"/>
+        <prop actor="fauna/seagull.xml" attachpoint="fish_20"/>
+      </props>
+    </variant>
+    <variant frequency="100" name="Variant C">
+      <props>
+        <prop actor="fauna/seagull.xml" attachpoint="fish_05"/>
+        <prop actor="fauna/seagull.xml" attachpoint="fish_20"/>
+      </props>
+    </variant>
+  </group>
+  <material>default.xml</material>
+</actor>
@@ -28,11 +28,8 @@
        <prop actor="fauna/tuna.xml" attachpoint="fish_18"/>
        <prop actor="fauna/tuna.xml" attachpoint="fish_19"/>
        <prop actor="fauna/tuna.xml" attachpoint="fish_20"/>
+        <prop actor="fauna/seagull_circle.xml" attachpoint="root"/>
      </props>
-    </variant>
-  </group>
-  <group>
-    <variant frequency="100" name="generic texture">
      <textures>
        <texture file="null_white.dds" name="baseTex"/>
      </textures>
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="bush_1">
+      <mesh>gaia/medit_bush_01.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_2">
+      <mesh>gaia/medit_bush_02.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_3">
+      <mesh>gaia/medit_bush_02.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_4">
+      <mesh>gaia/medit_bush_01.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_5">
+      <mesh>gaia/medit_bush_03.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_6">
+      <mesh>gaia/medit_bush_03.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_7">
+      <mesh>gaia/medit_bush_04.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_02.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bush_8">
+      <mesh>gaia/medit_bush_04.dae</mesh>
+      <textures>
+        <texture file="gaia/temperate_bush_01.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Rice Sprout">
+      <mesh>gaia/rice_sprout.dae</mesh>
+      <textures>
+        <texture file="gaia/rice_sprout.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Rice Sprout">
+      <mesh>gaia/rice_sprout_paddy.dae</mesh>
+      <textures>
+        <texture file="gaia/rice_sprout.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -25,18 +25,12 @@
    <variant frequency="1" name="Variant-04">
      <mesh>gaia/trees/trunks/acacia_04.dae</mesh>
    </variant>
-    <variant frequency="1" name="Variant-05">
-      <mesh>gaia/trees/trunks/acacia_05.dae</mesh>
-    </variant>
    <variant frequency="10" name="Variant-06">
      <mesh>gaia/trees/trunks/acacia_06.dae</mesh>
    </variant>
    <variant frequency="1" name="Variant-07">
      <mesh>gaia/trees/trunks/acacia_07.dae</mesh>
    </variant>
-    <variant frequency="2" name="Variant-08">
-      <mesh>gaia/trees/trunks/acacia_08.dae</mesh>
-    </variant>
    <variant frequency="1" name="Variant-09">
      <mesh>gaia/trees/trunks/acacia_09.dae</mesh>
    </variant>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Acacia">
+      <props>
+        <prop actor="flora/trees/acacia_large_top.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/acacia.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Variant-05">
+      <mesh>gaia/trees/trunks/acacia_05.dae</mesh>
+    </variant>
+    <variant frequency="1" name="Variant-08">
+      <mesh>gaia/trees/trunks/acacia_08.dae</mesh>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Acacia Top">
+      <textures>
+        <texture file="gaia/acacia.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <!-- Need to keep the variant names in sync with the parent. -->
+    <variant frequency="1" name="Variant-05">
+      <mesh>gaia/trees/leaves/acacia_05.dae</mesh>
+    </variant>
+    <variant frequency="1" name="Variant-08">
+      <mesh>gaia/trees/leaves/acacia_08.dae</mesh>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -22,18 +22,12 @@
    <variant frequency="1" name="Variant-04">
      <mesh>gaia/trees/leaves/acacia_04.dae</mesh>
    </variant>
-    <variant frequency="1" name="Variant-05">
-      <mesh>gaia/trees/leaves/acacia_05.dae</mesh>
-    </variant>
    <variant frequency="10" name="Variant-06">
      <mesh>gaia/trees/leaves/acacia_06.dae</mesh>
    </variant>
    <variant frequency="1" name="Variant-07">
      <mesh>gaia/trees/leaves/acacia_07.dae</mesh>
    </variant>
-    <variant frequency="2" name="Variant-08">
-      <mesh>gaia/trees/leaves/acacia_08.dae</mesh>
-    </variant>
    <variant frequency="1" name="Variant-09">
      <mesh>gaia/trees/leaves/acacia_09.dae</mesh>
    </variant>
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="apple_tree_a">
+      <mesh>gaia/tree_apple_trunk_a.dae</mesh>
+      <props>
+        <prop actor="flora/trees/apple_top_a.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="apple_tree_b">
+      <mesh>gaia/tree_apple_trunk_b.dae</mesh>
+      <props>
+        <prop actor="flora/trees/apple_top_b.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="apple_tree_c">
+      <mesh>gaia/tree_apple_trunk_a.dae</mesh>
+      <props>
+        <prop actor="flora/trees/apple_top_c.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="apple_tree_d">
+      <mesh>gaia/tree_apple_trunk_b.dae</mesh>
+      <props>
+        <prop actor="flora/trees/apple_top_d.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="trunk_texture_a">
+      <textures>
+        <texture file="gaia/trunk_deciduous_a.dds" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="trunk_texture_b">
+      <textures>
+        <texture file="gaia/trunk_deciduous_b.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -1,44 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
-    <variant frequency="1" name="apple_tree_a">
+    <variant frequency="1" name="Blooming Apple Tree 01">
      <mesh>gaia/tree_apple_trunk_a.dae</mesh>
      <props>
-        <prop actor="flora/trees/apple_top_a.xml" attachpoint="root"/>
+        <prop actor="flora/trees/apple_top_bloom_01.xml" attachpoint="root"/>
      </props>
    </variant>
-    <variant frequency="1" name="apple_tree_b">
+    <variant frequency="1" name="Blooming Apple Tree 02">
      <mesh>gaia/tree_apple_trunk_b.dae</mesh>
      <props>
-        <prop actor="flora/trees/apple_top_b.xml" attachpoint="root"/>
+        <prop actor="flora/trees/apple_top_bloom_02.xml" attachpoint="root"/>
      </props>
    </variant>
-    <variant frequency="1" name="apple_tree_c">
+    <variant frequency="1" name="Blooming Apple Tree 03">
      <mesh>gaia/tree_apple_trunk_a.dae</mesh>
      <props>
-        <prop actor="flora/trees/apple_top_c.xml" attachpoint="root"/>
+        <prop actor="flora/trees/apple_top_bloom_03.xml" attachpoint="root"/>
      </props>
    </variant>
-    <variant frequency="1" name="apple_tree_d">
+    <variant frequency="1" name="Blooming Apple Tree 04">
      <mesh>gaia/tree_apple_trunk_b.dae</mesh>
      <props>
-        <prop actor="flora/trees/apple_top_d.xml" attachpoint="root"/>
+        <prop actor="flora/trees/apple_top_bloom_04.xml" attachpoint="root"/>
      </props>
    </variant>
  </group>
-
  <group>
    <variant frequency="1" name="trunk_texture_a">
-      <textures><texture file="gaia/trunk_deciduous_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/trunk_deciduous_a.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant frequency="1" name="trunk_texture_b">
-      <textures><texture file="gaia/trunk_deciduous_b.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/trunk_deciduous_b.dds" name="baseTex"/>
+      </textures>
    </variant>
  </group>
-
  <material>basic_trans_wind.xml</material>
-
 </actor>
@@ -7,14 +7,15 @@
    </variant>
  </group>
  <group>
-    <variant name="a-bloom">
-      <textures><texture file="gaia/tree_apple_bloom.dds" name="baseTex"/></textures>
-    </variant>
    <variant name="a-ripe">
-      <textures><texture file="gaia/tree_apple_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_apple_a.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant name="a-ripe2">
-      <textures><texture file="gaia/orchard_apple_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/orchard_apple_a.dds" name="baseTex"/>
+      </textures>
    </variant>
  </group>
  <material>basic_trans_wind.xml</material>
@@ -7,14 +7,15 @@
    </variant>
  </group>
  <group>
-    <variant name="b-bloom">
-      <textures><texture file="gaia/tree_apple_bloom.dds" name="baseTex"/></textures>
-    </variant>
    <variant name="b-ripe">
-      <textures><texture file="gaia/tree_apple_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_apple_a.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant name="b-ripe2">
-      <textures><texture file="gaia/orchard_apple_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/orchard_apple_a.dds" name="baseTex"/>
+      </textures>
    </variant>
  </group>
  <material>basic_trans_wind.xml</material>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Blooming Apple Tree Top">
+      <mesh>gaia/tree_apple_top_a.dae</mesh>
+      <textures>
+        <texture file="gaia/tree_apple_bloom.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Blooming Apple Tree Top">
+      <mesh>gaia/tree_apple_top_b.dae</mesh>
+      <textures>
+        <texture file="gaia/tree_apple_bloom.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Blooming Apple Tree Top">
+      <mesh>gaia/tree_apple_top_b.dae</mesh>
+      <textures>
+        <texture file="gaia/tree_apple_bloom.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="Blooming Apple Tree Top">
+      <mesh>gaia/tree_apple_top_d.dae</mesh>
+      <textures>
+        <texture file="gaia/tree_apple_bloom.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -7,14 +7,15 @@
    </variant>
  </group>
  <group>
-    <variant name="c-bloom">
-      <textures><texture file="gaia/tree_apple_bloom.dds" name="baseTex"/></textures>
-    </variant>
    <variant name="c-ripe">
-      <textures><texture file="gaia/tree_apple_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_apple_a.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant name="c-ripe2">
-      <textures><texture file="gaia/orchard_apple_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/orchard_apple_a.dds" name="baseTex"/>
+      </textures>
    </variant>
  </group>
  <material>basic_trans_wind.xml</material>
@@ -7,14 +7,15 @@
    </variant>
  </group>
  <group>
-    <variant name="d-bloom">
-      <textures><texture file="gaia/tree_apple_bloom.dds" name="baseTex"/></textures>
-    </variant>
    <variant name="d-ripe">
-      <textures><texture file="gaia/tree_apple_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/tree_apple_a.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant name="d-ripe2">
-      <textures><texture file="gaia/orchard_apple_a.dds" name="baseTex"/></textures>
+      <textures>
+        <texture file="gaia/orchard_apple_a.dds" name="baseTex"/>
+      </textures>
    </variant>
  </group>
  <material>basic_trans_wind.xml</material>
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="5" name="bamboo-a">
+      <mesh>gaia/trees/bamboo_a.dae</mesh>
+      <textures>
+        <texture file="gaia/bamboo.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="bamboo-b">
+      <mesh>gaia/trees/bamboo_b.dae</mesh>
+      <textures>
+        <texture file="gaia/bamboo.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="bamboo-c">
+      <mesh>gaia/trees/bamboo_c.dae</mesh>
+      <textures>
+        <texture file="gaia/bamboo.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="base">
+      <textures>
+        <texture file="gaia/tree_baobab_dead.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_dead_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_dead_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="1">
+      <mesh>gaia/baobab_1_branches.dae</mesh>
+    </variant>
+    <variant frequency="1" name="2">
+      <mesh>gaia/baobab_2_branches.dae</mesh>
+    </variant>
+    <variant frequency="1" name="3">
+      <mesh>gaia/baobab_3_branches.dae</mesh>
+    </variant>
+    <variant frequency="1" name="d1">
+      <mesh>gaia/baobab_1_branches_dead.dae</mesh>
+    </variant>
+  </group>
+  <material>basic_trans_norm_spec.xml</material>
+</actor>
@@ -4,7 +4,7 @@
  <group>
    <variant name="base">
      <props>
-        <prop actor="flora/trees/baobab_new_branches.xml" attachpoint="root"/>
+        <prop actor="flora/trees/baobab_new_branches_dead.xml" attachpoint="root"/>
      </props>
      <textures>
        <texture file="gaia/tree_baobab_trunk.png" name="baseTex"/>
@@ -21,5 +21,5 @@
      <mesh>gaia/baobab_3_trunk.dae</mesh>
    </variant>
  </group>
-  <material>basic_trans_wind_norm_spec.xml</material>
+  <material>basic_trans_norm_spec.xml</material>
 </actor>
@@ -36,5 +36,5 @@
      <mesh>gaia/cedar_atlas_3.dae</mesh>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
@@ -28,5 +28,5 @@
      <mesh>gaia/cedar_atlas_3.dae</mesh>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
@@ -18,5 +18,5 @@
      <mesh>gaia/cedar_atlas_sapling_1.dae</mesh>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
@@ -36,5 +36,5 @@
      <mesh>gaia/cedar_atlas_young_3.dae</mesh>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant name="base">
+      <mesh>gaia/tree_apple_trunk_b.dae</mesh>
+      <props>
+        <prop actor="flora/trees/cherry_small_top_a.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/trunk_deciduous_b.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant>
+      <mesh>gaia/tree_apple_top_d.dae</mesh>
+      <textures>
+        <texture file="gaia/tree_apple_bloom.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="trunk-mesh-a">
+      <mesh>gaia/tree_carob_a.dae</mesh>
+      <props>
+        <prop actor="flora/trees/cherryblossom_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-b">
+      <mesh>gaia/tree_carob_b.dae</mesh>
+      <props>
+        <prop actor="flora/trees/cherryblossom_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-c">
+      <mesh>gaia/tree_carob_c.dae</mesh>
+      <props>
+        <prop actor="flora/trees/cherryblossom_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-d">
+      <mesh>gaia/tree_carob_d.dae</mesh>
+      <props>
+        <prop actor="flora/trees/cherryblossom_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-e">
+      <mesh>gaia/tree_carob_e.dae</mesh>
+      <props>
+        <prop actor="flora/trees/cherryblossom_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+    <variant frequency="1" name="trunk-mesh-f">
+      <mesh>gaia/tree_carob_f.dae</mesh>
+      <props>
+        <prop actor="flora/trees/cherryblossom_top.xml" attachpoint="tree"/>
+      </props>
+    </variant>
+  </group>
+  <group>
+    <variant name="trunk-texture">
+      <textures>
+        <texture file="gaia/trunk_deciduous_b.dds" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Falling Leaves">
+      <props>
+        <prop actor="particle/falling_leaf_cherryblossom.xml" attachpoint="root"/>
+      </props>
+    </variant>
+    <variant frequency="3" name="No Falling Leaves">
+      <props>
+        <prop attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="canopy-mesh-a">
+      <mesh>gaia/tree_carob_top_a.dae</mesh>
+    </variant>
+    <variant frequency="1" name="canopy-mesh-b">
+      <mesh>gaia/tree_carob_top_b.dae</mesh>
+    </variant>
+    <variant frequency="1" name="canopy-mesh-c">
+      <mesh>gaia/tree_carob_top_c.dae</mesh>
+    </variant>
+    <variant frequency="1" name="canopy-mesh-d">
+      <mesh>gaia/tree_carob_top_d.dae</mesh>
+    </variant>
+    <variant frequency="1" name="canopy-mesh-e">
+      <mesh>gaia/tree_carob_top_e.dae</mesh>
+    </variant>
+    <variant frequency="1" name="canopy-mesh-f">
+      <mesh>gaia/tree_carob_top_f.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="leaf-texture-a">
+      <textures>
+        <texture file="gaia/tree_cherryblossom_a.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="leaf-texture-b">
+      <textures>
+        <texture file="gaia/tree_cherryblossom_b.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="leaf-texture-c">
+      <textures>
+        <texture file="gaia/tree_cherryblossom_c.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="leaf-texture-d">
+      <textures>
+        <texture file="gaia/tree_cherryblossom_d.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="3" name="leaf-texture-e">
+      <textures>
+        <texture file="gaia/tree_cherryblossom_e.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -5,11 +5,11 @@
    <variant frequency="1" name="cypress branches large">
      <mesh>gaia/tree_cypress_large_branches.dae</mesh>
      <textures>
-      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress.png" name="baseTex"/>
        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
-        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>
      </textures>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
@@ -5,11 +5,11 @@
    <variant frequency="1" name="cypress branches med">
      <mesh>gaia/tree_cypress_med_branches.dae</mesh>
      <textures>
-      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress.png" name="baseTex"/>
        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
-        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>
      </textures>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
@@ -5,11 +5,11 @@
    <variant frequency="1" name="cypress skinny branches ">
      <mesh>gaia/tree_cypress_skinny_branches.dae</mesh>
      <textures>
-      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress.png" name="baseTex"/>
        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
-        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>
      </textures>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
@@ -5,11 +5,11 @@
    <variant frequency="1" name="cypress small branches ">
      <mesh>gaia/tree_cypress_sm_branches.dae</mesh>
      <textures>
-      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress.png" name="baseTex"/>
        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
-        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>
      </textures>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
@@ -5,11 +5,11 @@
    <variant frequency="1" name="cypress tall branches ">
      <mesh>gaia/tree_cypress_tall_branches.dae</mesh>
      <textures>
-      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress.png" name="baseTex"/>
        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
-        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>
      </textures>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans_wind_norm_spec.xml</material>
 </actor>
--- a/Show More
+++ b/Show More