Use Sunrise for Gauls.

This was SVN commit r19921.
This was SVN commit r19919.
2017-07-16 08:42:00 +00:00 · 2017-07-15 05:10:28 +00:00 · 2017-07-14 18:57:33 +00:00 · 2017-07-14 10:09:32 +00:00 · 2017-07-13 12:32:15 +00:00 · 2017-07-12 13:56:28 +00:00
6094 changed files with 123270 additions and 260007 deletions
@@ -0,0 +1,4 @@
+{
+  "phabricator.uri" : "https://code.wildfiregames.com/",
+  "repository.callsign" : "P"
+}
@@ -0,0 +1,18 @@
+{
+  "exclude": [
+    "(^binaries/system/)",
+    "(^source/third_party/)",
+    "(^libraries/)"
+  ],
+  "linters": {
+    "text": {
+      "type": "text",
+      "severity": {
+        "1": "disabled",
+        "2": "disabled",
+        "3": "disabled",
+        "5": "disabled"
+      }
+    }
+  }
+}
@@ -37,7 +37,7 @@ in particular, let us know and we can try to clarify it.
    BSD

  /build/premake/*.lua
-    MIT
+    MIT - see license_mit.txt

  /docs
    Various (unspecified)
@@ -49,7 +49,7 @@ in particular, let us know and we can try to clarify it.
    GPL version 2 (or later) - see license_gpl-2.0.txt

  /source/lib
-    MIT
+    MIT - see license_mit.txt

  /source/scriptinterface/third_party
    MPL 2.0
@@ -60,16 +60,16 @@ in particular, let us know and we can try to clarify it.
  /source/third_party/encryption
    GPL version 2 (or later)
    ISC (pkcs5_pbkdf2.cpp)
-    MIT (pkcs5_pbkdf2.h)
+    MIT (pkcs5_pbkdf2.h) - see license_mit.txt

  /source/third-party/jsonspirit
-    MIT
+    MIT - see license_mit.txt

  /source/third_party/mikktspace
    zlib

  /source/third_party/mongoose
-    MIT
+    MIT - see license_mit.txt

  /source/third_party/tinygettext
    zlib
@@ -5,6 +5,12 @@
 ; * create a text file called "local.cfg" instead, and copy    *
 ; * the lines from this file that you want to change.          *
 ; *                                                            *
+; * If a setting is part of a section (for instance [hotkey])  *
+; * you need to append the section name at the beginning of    *
+; * your custom line (for instance you need to write           *
+; * "hotkey.pause = Space" if you want to change the pausing   *
+; * hotkey to the spacebar).                                   *
+; *                                                            *
 ; * On Linux, create:                                          *
 ; *   $XDG_CONFIG_HOME/0ad/config/local.cfg                    *
 ; *   (Note: $XDG_CONFIG_HOME defaults to ~/.config)           *
@@ -23,12 +29,6 @@ windowed = false
 ; Show detailed tooltips (Unit stats)
 showdetailedtooltips = false

-; Enable/disable the splashscreen
-splashscreendisable = false
-
-; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch.
-splashscreenversion = 0
-
 ; Pause the game on window focus loss (Only applicable to single player mode)
 pauseonfocusloss = true

@@ -73,7 +73,7 @@ shadowpcf = true
 vsync = false
 particles = true
 silhouettes = true
-showsky = false
+showsky = true

 nos3tc = false
 noautomipmap = true
@@ -96,12 +96,9 @@ force_s3tc_enable = true
 renderpath = default

 ;;;;; EXPERIMENTAL ;;;;;
-; Prefer GLSL shaders over ARB shaders (not recommended). REQUIRES gentangents=true.
+; Prefer GLSL shaders over ARB shaders. Allows fancier graphical effects.
 preferglsl = false

-; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true.
-gentangents = false
-
 ; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
 gpuskinning = false

@@ -111,7 +108,7 @@ smoothlos = false
 ; Use screen-space postprocessing filters (HDR, bloom, DOF, etc). Incompatible with fixed renderpath.
 postproc = false

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

 ; Maximum distance to display parallax effect. Set to 0 to disable parallax.
@@ -128,6 +125,9 @@ forcealphatest = false
 ; Color of the sky (in "r g b" format)
 skycolor = "0 0 0"

+[adaptivefps]
+session = 60         ; Throttle FPS in running games (prevents 100% CPU workload).
+menu = 30            ; Throttle FPS in menus only.

 [hotkey]
 ; Each one of the specified keys will trigger the action on the left
@@ -135,7 +135,7 @@ skycolor = "0 0 0"
 ; See keys.txt for the list of key names.

 ; > SYSTEM SETTINGS
-exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop
+exit = "Ctrl+Break", "Super+Q"           ; Exit to desktop
 cancel = Escape                          ; Close or cancel the current dialog box/popup
 leave = Escape                           ; End current game or Exit
 confirm = Return                         ; Confirm the current command
@@ -160,16 +160,17 @@ console.toggle = BackQuote, F9        ; Open/close console
 fps.toggle = "Alt+F"                  ; Toggle frame counter
 realtime.toggle = "Alt+T"             ; Toggle current display of computer time
 session.devcommands.toggle = "Alt+D"  ; Toggle developer commands panel
-session.gui.toggle = "Alt+G"          ; Toggle visibility of session GUI
-menu.toggle = "F10"                   ; Toggle in-game menu
 timeelapsedcounter.toggle = "F12"     ; Toggle time elapsed counter
 session.showstatusbars = Tab          ; Toggle display of status bars
 session.highlightguarding = PgDn      ; Toggle highlight of guarding units
 session.highlightguarded = PgUp       ; Toggle highlight of guarded units
+session.toggleaurarange = "Alt+V"     ; Toggle display of aura range overlays of selected units and structures
+session.togglehealrange = "Alt+B"     ; Toggle display of heal range overlays of selected units

 ; > HOTKEYS ONLY
 chat = Return                         ; Toggle chat window
 teamchat = "T"                        ; Toggle chat window in team chat mode
+privatechat = "L"                     ; Toggle chat window and select the previous private chat partner

 ; > QUICKSAVE
 quicksave = "Shift+F5"
@@ -178,6 +179,7 @@ quickload = "Shift+F8"
 [hotkey.camera]
 reset = "R"                                   ; Reset camera rotation to default.
 follow = "F"                                  ; Follow the first unit in the selection
+rallypointfocus = unused                      ; Focus the camera on the rally point of the selected building
 zoom.in = Plus, Equals, NumPlus               ; Zoom camera in (continuous control)
 zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
 zoom.wheel.in = WheelUp                       ; Zoom camera in (stepped control)
@@ -234,7 +236,7 @@ add = Shift                  ; Add units to selection
 milonly = Alt                ; Add only military units to selection
 idleonly = "I"               ; Select only idle units
 remove = Ctrl                ; Remove units from selection
-cancel = Esc                 ; Un-select all units and cancel building placement 
+cancel = Esc                 ; Un-select all units and cancel building placement
 idleworker = Period          ; Select next idle worker
 idlewarrior = ForwardSlash   ; Select next idle warrior
 offscreen = Alt              ; Include offscreen units in selection
@@ -275,25 +277,35 @@ offscreen = Alt              ; Include offscreen units in selection
 [hotkey.session]
 kill = Delete                ; Destroy selected units
 stop = "H"                   ; Stop the current action
+backtowork = "Y"             ; The unit will go back to work
+unload = "U"                 ; Unload garrisoned units when a building/mechanical unit is selected
 attack = Ctrl                ; Modifier to attack instead of another action (eg capture)
 attackmove = Ctrl            ; Modifier to attackmove when clicking on a point
 attackmoveUnit = "Ctrl+Q"    ; Modifier to attackmove targeting only units when clicking on a point (should contain the attackmove keys)
 garrison = Ctrl              ; Modifier to garrison when clicking on building
 autorallypoint = Ctrl        ; Modifier to set the rally point on the building itself
 guard = "G"                  ; Modifier to escort/guard when clicking on unit/building
+patrol = "P"                 ; Modifier to patrol a unit
+repair = "J"                 ; Modifier to repair when clicking on building/mechanical unit
 queue = Shift                ; Modifier to queue unit orders instead of replacing
 batchtrain = Shift           ; Modifier to train units in batches
 massbarter = Shift           ; Modifier to barter bunch of resources
 masstribute = Shift          ; Modifier to tribute bunch of resources
+noconfirmation = Shift       ; Do not ask confirmation when deleting a building/unit
 fulltradeswap = Shift        ; Modifier to put the desired trade resource to 100%
 unloadtype = Shift           ; Modifier to unload all units of type
 deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
 rotate.cw = RightBracket     ; Rotate building placement preview clockwise
 rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise

+[hotkey.session.gui]
+toggle = "Alt+G"             ; Toggle visibility of session GUI
+menu.toggle = "F10"          ; Toggle in-game menu
+barter.toggle = "Ctrl+B"     ; Toggle in-game barter/trade page
+
 [hotkey.session.savedgames]
 delete = Delete               ; Delete the selected saved game asking confirmation
-noConfirmation = Shift        ; Do not ask confirmation when deleting a game
+noconfirmation = Shift        ; Do not ask confirmation when deleting a game

 [hotkey.session.queueunit]   ; > UNIT TRAINING
 1 = "Z"            ; add first unit type to queue
@@ -319,18 +331,31 @@ move.right = "Ctrl+RightArrow"    ; Move cursor to start of word to the right of
 cursorblinkrate = 0.5             ; Cursor blink rate in seconds (0.0 to disable blinking)
 scale = 1.0                       ; GUI scaling factor, for improved compatibility with 4K displays

-[gui.menu]
-limitfps = true                   ; Limit FPS in the menus and loading screen
+[gui.gamesetup]
+enabletips = true                 ; Enable/Disable tips during gamesetup (for newcomers)
+assignplayers = everyone          ; Whether to assign joining clients to free playerslots. Possible values: everyone, buddies, disabled.

 [gui.session]
-attacknotificationmessage = true  ; Show attack notification messages
 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
+batchtrainingsize = 5             ; Number of units to be trained per batch (when pressing the hotkey)
+aurarange = true                  ; Display aura range overlays of selected units and structures
+healrange = true                  ; Display heal range overlays of selected units

 [gui.session.minimap]
 blinkduration = 1.7               ; The blink duration while pinging
 pingduration = 50.0               ; The duration for which an entity will be pinged after an attack notification

+[gui.session.notifications]
+attack = true                     ; Show a chat notification if you are attacked by another player
+tribute = true                    ; Show a chat notification if an ally tributes resources to another team member if teams are locked, and all tributes in observer mode
+barter = true                     ; Show a chat notification to observers when a player bartered resources
+phase = completed                 ; 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. Possible values: none, completed, all.
+
+[gui.splashscreen]
+enable = true                     ; Enable/disable the splashscreen
+version = 0                       ; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch
+
 [joystick]        ; EXPERIMENTAL: joystick/gamepad settings
 enable = false
 deadzone = 8192
@@ -342,27 +367,45 @@ rotate.y = 2
 zoom.in = 5
 zoom.out = 4

-[jsdebugger]
-; The Debugger is currently broken and can't be enabled until the SpiderMonkey upgrade is done and the debugger is updated for the new API.
-enable = false                      ; Enable Javascript debugging.
+[chat]
+timestamp = true                    ; Show at which time chat messages have been sent
+
+[chat.session]
+extended = true                     ; Whether to display the chat history

 [lobby]
-chattimestamp = false               ; Show time chat message was posted
 history = 0                         ; Number of past messages to display on join
-room = "arena19"                    ; Default MUC room to join
+room = "arena22"                    ; Default MUC room to join
 server = "lobby.wildfiregames.com"  ; Address of lobby server
-xpartamupp = "wfgbot19"             ; Name of the server-side xmpp client that manage games
+xpartamupp = "wfgbot22"             ; Name of the server-side xmpp client that manage games
+buddies = ","                       ; Comma separated list of playernames that the current user has marked as buddies
+
+[lobby.columns]
+gamerating = false                  ; Show the average rating of the participating players in a column of the gamelist
+
+[lobby.stun]
+enabled = true                       ; The STUN protocol allows hosting games without configuring the firewall and router.
+                                     ; If STUN is disabled, the game relies on direct connection, UPnP and port forwarding.
+server = "lobby.wildfiregames.com"   ; Address of the STUN server.
+port = 3478                          ; Port of the STUN server.
+delay = 200                          ; Duration in milliseconds that is waited between STUN messages.
+                                     ; Smaller numbers speed up joins but also become less stable.

 [mod]
 enabledmods = "mod public"

+[network]
+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
+
 [overlay]
 fps = "false"                     ; Show frames per second in top right corner
 realtime = "false"                ; Show current system time in top right corner
+netwarnings = "true"              ; Show warnings if the network connection is bad

 [profiler2]
 autoenable = false                ; Enable HTTP server output at startup (default off for security/performance)
-script.enable = false             ; Enable Javascript profiling. Needs to be set before startup and can't be changed later. (default off for 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
@@ -374,6 +417,9 @@ ambientgain = 0.6
 actiongain = 0.7
 uigain = 0.7

+[sound.notify]
+nick = true                       ; Play a sound when someone mentions your name in the lobby or game
+
 [tinygettext]
 debug = false                     ; Print error messages each time a translation for an English string is not found.

@@ -1,5 +1,7 @@
 ## This file documents keynames that can be used in .cfg files for specifying hotkeys
 ## Note: the keynames are not actually configured or implemented here
+## Also note: if your keyboard supports keys that do not appear here (such as the French é letter),
+## you should be able to use it directly.

 Backspace, BkSp
 Tab
@@ -150,101 +152,3 @@ Mouse Wheel Down, WheelDown
 MouseButtonX, MouseNX # where X is a number 1-255, for extra mouse buttons
 ## (note that some mice start numbering their buttons at higher numbers
 ##  so the first extra button on your mouse might be #8 here)
-
-## Special keys for international and non-QWERTY keyboards:
-World0, W0
-World1, W1
-World2, W2
-World3, W3
-World4, W4
-World5, W5
-World6, W6
-World7, W7
-World8, W8
-World9, W9
-World10, W10
-World11, W11
-World12, W12
-World13, W13
-World14, W14
-World15, W15
-World16, W16
-World17, W17
-World18, W18
-World19, W19
-World20, W20
-World21, W21
-World22, W22
-World23, W23
-World24, W24
-World25, W25
-World26, W26
-World27, W27
-World28, W28
-World29, W29
-World30, W30
-World31, W31
-World32, W32
-World33, W33
-World34, W34
-World35, W35
-World36, W36
-World37, W37
-World38, W38
-World39, W39
-World40, W40
-World41, W41
-World42, W42
-World43, W43
-World44, W44
-World45, W45
-World46, W46
-World47, W47
-World48, W48
-World49, W49
-World50, W50
-World51, W51
-World52, W52
-World53, W53
-World54, W54
-World55, W55
-World56, W56
-World57, W57
-World58, W58
-World59, W59
-World60, W60
-World61, W61
-World62, W62
-World63, W63
-World64, W64
-World65, W65
-World66, W66
-World67, W67
-World68, W68
-World69, W69
-World70, W70
-World71, W71
-World72, W72
-World73, W73
-World74, W74
-World75, W75
-World76, W76
-World77, W77
-World78, W78
-World79, W79
-World80, W80
-World81, W81
-World82, W82
-World83, W83
-World84, W84
-World85, W85
-World86, W86
-World87, W87
-World88, W88
-World89, W89
-World90, W90
-World91, W91
-World92, W92
-World93, W93
-World94, W94
-World95, W95
@@ -22,6 +22,7 @@
 						"MarkForTranslationWithContext": [[1], 2]
 					},
 					"commentTags": [
+						"dennis-ignore:",
 						"Translation:"
 					]
 				}
@@ -2,3 +2,44 @@ function GlobalSubtractionHelper(a, b)
 {
 	return a-b;
 }
+
+function Vector2D(x, y)
+{
+	if (arguments.length == 2)
+	{
+		this.x = x;
+		this.y = y;
+	}
+	else
+		this.x = this.y = 0;
+}
+
+Vector2D.prototype.add = function(v)
+{
+	this.x += v.x;
+	this.y += v.y;
+	return this;
+};
+
+function Vector3D(x, y, z)
+{
+	if (arguments.length == 3)
+	{
+		this.x = x;
+		this.y = y;
+		this.z = z;
+	}
+	else
+		this.x = this.y = this.z = 0;
+}
+Vector3D.prototype.add = function(v)
+{
+	this.x += v.x;
+	this.y += v.y;
+	this.z += v.z;
+	return this;
+};
+
+// make the prototypes easily accessible to C++
+const Vector2Dprototype = Vector2D.prototype;
+const Vector3Dprototype = Vector3D.prototype;
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+	<Test2A datatype="tokens">
+		a b c
+	</Test2A>
+</Entity>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="inherit_a">
+	<Test2A datatype="tokens">
+		d
+	</Test2A>
+</Entity>
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+	<Test2A a="b">
+		a b c
+	</Test2A>
+</Entity>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="inherit_c">
+	<Test2A c="d"/>
+</Entity>
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity filtered="">
+  <AIProxy merge=""/>
+  <Armour merge=""/>
+  <BuildRestrictions merge=""/>
+  <!-- Don't provide population bonuses yet (but still do take up population cost) -->
+  <Cost merge="">
+    <PopulationBonus>0</PopulationBonus>
+  </Cost>
+  <Decay merge=""/>
+  <Health>
+    <Initial>1</Initial>
+  </Health>
+  <Fogging merge=""/>
+  <Footprint merge=""/>
+  <!-- Add the Foundation component, to deal with the construction process -->
+  <Foundation replace=""/>
+  <Health merge=""/>
+  <Identity merge=""/>
+  <!-- Foundations shouldn't initially block unit movement -->
+  <Obstruction merge="">
+    <DisableBlockMovement>true</DisableBlockMovement>
+    <DisableBlockPathfinding>true</DisableBlockPathfinding>
+  </Obstruction>
+  <OverlayRenderer merge=""/>
+  <Ownership merge=""/>
+  <Position merge=""/>
+  <RallyPoint merge=""/>
+  <RallyPointRenderer merge=""/>
+  <Selectable merge=""/>
+  <Sound merge=""/>
+  <StatusBars merge=""/>
+  <Visibility merge=""/>
+  <!-- Foundations should be visible themselves in fog-of-war if their base template is,
+       but shouldn't have any vision range -->
+  <Vision merge="">
+    <Range>0</Range>
+    <RevealShore merge="">false</RevealShore>
+  </Vision>
+  <!-- Switch the actor to foundation mode -->
+  <VisualActor>
+    <Foundation/>
+  </VisualActor>
+</Entity>
@@ -1,23 +1,14 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
 	<Gain>1</Gain>
-	<Pitch>1</Pitch>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
-	<ConeInner>360</ConeInner>
-	<ConeOuter>360</ConeOuter>
 	<Looping>0</Looping>
 	<RandOrder>1</RandOrder>
 	<RandGain>1</RandGain>
-	<GainUpper>1</GainUpper>
-	<GainLower>0.8</GainLower>
 	<RandPitch>1</RandPitch>
-	<PitchUpper>1.1</PitchUpper>
-	<PitchLower>0.9</PitchLower>
 	<Threshold>1</Threshold>
-	<Decay>3</Decay>
-	<Replacement>ui_button_click.ogg</Replacement>
 	<Path>audio/interface/ui</Path>
 	<Sound>ui_button_click.ogg</Sound>
 	<Sound>ui_button_longclick.ogg</Sound>
-</SoundGroup>
+</SoundGroup>
@@ -1,22 +1,13 @@
 <?xml version="1.0" encoding="utf-8" standalone="no" ?>
 <SoundGroup>
 	<Gain>1</Gain>
-	<Pitch>1</Pitch>
 	<Priority>100</Priority>
 	<ConeGain>1</ConeGain>
-	<ConeInner>360</ConeInner>
-	<ConeOuter>360</ConeOuter>
 	<Looping>0</Looping>
 	<RandOrder>1</RandOrder>
 	<RandGain>1</RandGain>
-	<GainUpper>1</GainUpper>
-	<GainLower>0.8</GainLower>
 	<RandPitch>1</RandPitch>
-	<PitchUpper>1.1</PitchUpper>
-	<PitchLower>0.9</PitchLower>
 	<Threshold>1</Threshold>
-	<Decay>3</Decay>
-	<Replacement>ui_button_longclick.ogg</Replacement>
 	<Path>audio/interface/ui</Path>
 	<Sound>ui_button_longclick.ogg</Sound>
 </SoundGroup>
@@ -29,7 +29,6 @@ SoundGroup = element SoundGroup {
    element ConeGain { xsd:float }? &
    element ConeInner { xsd:float }? &
    element ConeOuter { xsd:float }? &
-    element Replacement { text }? &
    element Threshold { xsd:float }? &
    element Decay { xsd:float }? &
    element Sound { text }+ &
@@ -106,11 +106,6 @@
            <data type="float"/>
          </element>
        </optional>
-        <optional>
-          <element name="Replacement">
-            <text/>
-          </element>
-        </optional>
        <optional>
          <element name="Threshold">
            <data type="float"/>
@@ -1,88 +1,74 @@
-var g_translations = {};
-var g_pluralTranslations = {};
-var g_translationsWithContext = {};
-var g_pluralTranslationsWithContext = {};
+/**
+ * These functions rely on the JS cache where possible and
+ * should be prefered over the Engine.Translate ones to optimize the performance.
+ */
+var g_Translations = {};
+var g_PluralTranslations = {};
+var g_TranslationsWithContext = {};
+var g_PluralTranslationsWithContext = {};

-// Checks if the specified variable is a string, and if it is, it checks that it
-// is not empty.
-function isNonEmptyString(variable)
+function isTranslatableString(message)
 {
-	if (typeof variable != "string")
-		return false;
-	else if (variable.trim())
-		return true;
-	else
-		return false;
+	return typeof message == "string" && !!message.trim();
 }

-// Translates the specified English message into the current language.
-//
-// This function relies on the g_translations cache when possible. You should use this function instead of
-// Engine.Translate() whenever you can to minimize the number of C++ calls and string conversions involved.
+/**
+ * Translates the specified English message into the current language.
+ */
 function translate(message)
 {
-	var translation = g_translations[message];
-	if (!translation)
-		return g_translations[message] = Engine.Translate(message);
-	return translation;
+	if (!g_Translations[message])
+		g_Translations[message] = Engine.Translate(message);
+
+	return g_Translations[message];
 }

-
-// Translates the specified English message into the current language for the specified number.
-//
-// This function relies on the g_pluralTranslations cache when possible. You should use this function instead of
-// Engine.TranslatePlural() whenever you can to minimize the number of C++ calls and string conversions involved.
+/**
+ * Translates the specified English message into the current language for the specified number.
+ */
 function translatePlural(singularMessage, pluralMessage, number)
 {
-	var translation = g_pluralTranslations[singularMessage];
-	if (!translation)
-		g_pluralTranslations[singularMessage] = {};
+	if (!g_PluralTranslations[singularMessage])
+		g_PluralTranslations[singularMessage] = {};

-	var pluralTranslation = g_pluralTranslations[singularMessage][number];
-	if (!pluralTranslation)
-		return g_pluralTranslations[singularMessage][number] = Engine.TranslatePlural(singularMessage, pluralMessage, number);
+	if (!g_PluralTranslations[singularMessage][number])
+		g_PluralTranslations[singularMessage][number] = Engine.TranslatePlural(singularMessage, pluralMessage, number);

-	return pluralTranslation;
+	return g_PluralTranslations[singularMessage][number];
 }


-// Translates the specified English message into the current language for the specified context.
-//
-// This function relies on the g_translationsWithContext cache when possible. You should use this function instead of
-// Engine.TranslateWithContext() whenever you can to minimize the number of C++ calls and string conversions involved.
+/**
+ * Translates the specified English message into the current language for the specified context.
+ */
 function translateWithContext(context, message)
 {
-	var translationContext = g_translationsWithContext[context];
-	if (!translationContext)
-		g_translationsWithContext[context] = {}
+	if (!g_TranslationsWithContext[context])
+		g_TranslationsWithContext[context] = {}

-	var translationWithContext = g_translationsWithContext[context][message];
-	if (!translationWithContext)
-		return g_translationsWithContext[context][message] = Engine.TranslateWithContext(context, message);
+	if (!g_TranslationsWithContext[context][message])
+		g_TranslationsWithContext[context][message] = Engine.TranslateWithContext(context, message);

-	return translationWithContext;
+	return g_TranslationsWithContext[context][message];
 }


-// Translates the specified English message into the current language for the specified context and number.
-//
-// This function relies on the g_pluralTranslationsWithContext cache when possible. You should use this function instead of
-// Engine.TranslatePluralWithContext() whenever you can to minimize the number of C++ calls and string conversions involved.
+/**
+ * Translates the specified English message into the current language for the specified context and number.
+ */
 function translatePluralWithContext(context, singularMessage, pluralMessage, number)
 {
-	var translationContext = g_pluralTranslationsWithContext[context];
-	if (!translationContext)
-		g_pluralTranslationsWithContext[context] = {};
+	if (!g_PluralTranslationsWithContext[context])
+		g_PluralTranslationsWithContext[context] = {};

-	var translationWithContext = g_pluralTranslationsWithContext[context][singularMessage];
-	if (!translationWithContext)
-		g_pluralTranslationsWithContext[context][singularMessage] = {};
+	if (!g_PluralTranslationsWithContext[context][singularMessage])
+		g_PluralTranslationsWithContext[context][singularMessage] = {};

-	var pluralTranslationWithContext = g_pluralTranslationsWithContext[context][singularMessage][number];
-	if (!pluralTranslationWithContext)
-		return g_pluralTranslationsWithContext[context][singularMessage][number] = Engine.TranslatePluralWithContext(context, singularMessage, pluralMessage, number);
+	if (!g_PluralTranslationsWithContext[context][singularMessage][number])
+		g_PluralTranslationsWithContext[context][singularMessage][number] =
+			Engine.TranslatePluralWithContext(context, singularMessage, pluralMessage, number);

-	return pluralTranslationWithContext;
+	return g_PluralTranslationsWithContext[context][singularMessage][number];
 }

 /**
@@ -99,28 +85,24 @@ function translatePluralWithContext(context, singularMessage, pluralMessage, num
 */
 function translateMessageObject(object)
 {
-	// the translation function
-	var trans = translate;
+	let trans = translate;
 	if (object.context)
-		trans = function(msg) { return translateWithContext(object.context, msg);};
+		trans = msg => translateWithContext(object.context, msg);

 	if (object.message)
 		object = trans(object.message);
 	else if (object.list)
-	{
-		var translatedList = object.list.map(trans);
-		object = translatedList.join(translateWithContext("enumeration", ", "));
-	}
+		object = object.list.map(trans).join(translateWithContext("enumeration", ", "));

 	return object;
 }

 /**
- * Translates any string value in the specified JavaScript object 
+ * Translates any string value in the specified JavaScript object
 * that is associated with a key included in the specified keys array.
 *
 * it accepts an object in the form of
- * 
+ *
 * {
 *   translatedString1: "my first message",
 *   unTranslatedString1: "some English string",
@@ -139,7 +121,7 @@ function translateMessageObject(object)
 * }
 *
 * Together with a keys list to translate the strings and objects
- * ["translatedString1", "translatedString2", "translatedObject1", 
+ * ["translatedString1", "translatedString2", "translatedObject1",
 * "translatedObject2"]
 *
 * The result will be (f.e. in Dutch)
@@ -151,30 +133,28 @@ function translateMessageObject(object)
 *     unTranslatedString2: "some English string"
 *   },
 *   translatedObject1: "mijn derde bericht",
- *   translatedObject2: "lijst, van, teksten", 
+ *   translatedObject2: "lijst, van, teksten",
 * }
 *
 * So you see that the keys array can also contain lower-level keys,
- * And that you can include objects in the keys array to translate 
+ * And that you can include objects in the keys array to translate
 * them with a context, or to join a list of translations.
 *
 * Also, the keys array may be an object where properties are keys to translate
 * and values are translation contexts to use for each key.
 */
-function translateObjectKeys(object, keys) {
-	// If ‘keys’ is an array, simply translate.
+function translateObjectKeys(object, keys)
+{
 	if (keys instanceof Array)
 	{
-		for (var property in object)
+		for (let property in object)
 		{
 			if (keys.indexOf(property) > -1)
 			{
-				if (isNonEmptyString(object[property]))
+				if (isTranslatableString(object[property]))
 					object[property] = translate(object[property]);
 				else if (object[property] instanceof Object)
-				{
 					object[property] = translateMessageObject(object[property]);
-				}
 			}
 			else if (object[property] instanceof Object)
 				translateObjectKeys(object[property], keys);
@@ -185,11 +165,11 @@ function translateObjectKeys(object, keys) {
 	// An empty value means no context.
 	else
 	{
-		for (var property in object)
+		for (let property in object)
 		{
 			if (property in keys)
 			{
-				if (isNonEmptyString(object[property]))
+				if (isTranslatableString(object[property]))
 					if (keys[property])
 						object[property] = translateWithContext(keys[property], object[property]);
 					else
@@ -208,11 +188,21 @@ function translateObjectKeys(object, keys) {
 * So it may only be used on a plain string,
 * it won't have any effect on a calculated string.
 */
-function markForTranslation(message) {
+function markForTranslation(message)
+{
 	return message;
 }

-function markForTranslationWithContext(context, message) {
+function markForTranslationWithContext(context, message)
+{
 	return message;
 }
-	
+
+function markForPluralTranslation(singularMessage, pluralMessage, number)
+{
+	return {
+		"message": singularMessage,
+		"pluralMessage": pluralMessage,
+		"pluralCount": number
+	};
+}
@@ -223,4 +223,4 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
            })
        }
    }
-})(typeof window === "undefined" ? this : window);
+})(typeof window === "undefined" ? this : window);
@@ -15,6 +15,7 @@
 			sprite_back_vertical = "ModernScrollBack"
 			sprite_bar_vertical = "ModernScrollBar"
 	/>
+
 	<!--
 	==========================================
 	- TOOLTIPS -
@@ -30,6 +31,18 @@
 			sprite="BlackBorderOnGray"
 			textcolor="255 255 255"
 	/>
+
+	<tooltip name="sliderTooltip"
+		anchor="top"
+		buffer_zone="4"
+		delay="0"
+		font="sans-14"
+		maxwidth="300"
+		offset="16 32"
+		sprite="BlackBorderOnGray"
+		textcolor="255 255 255"
+	/>
+
 	<!--
 	==========================================
 	- COLORS -
@@ -199,6 +199,22 @@
 			size = "0 1 100% 100%-1"
 		/>
 	</sprite>
+	<sprite name="ModernDarkBoxGoldDisabled">
+		<effect grayscale=""/>
+		<!-- borders -->
+		<image texture = "global/modern/gold-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 0 100% 1"
+		/>
+		<image texture = "global/modern/gold-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 100%-1 100% 100%"
+		/>
+		<!-- background -->
+		<image backcolor = "12 12 12 100"
+			size = "0 1 100% 100%-1"
+		/>
+	</sprite>
 	<sprite name="ModernDarkBoxWhite">
 		<!-- borders -->
 		<image texture = "global/modern/white-separator.png"
@@ -555,6 +571,150 @@
 			size="100%-8 100%-8 100% 100%"
 		/>
 	</sprite>
+	<!-- GRAY -->
+	<sprite name="ModernButtonGray">
+		<!-- Background -->
+		<image texture="global/modern/button/gray-unselected-background.png"
+			real_texture_placement="0 0 512 128"
+			texture_size="0 0 512 128"
+			size="2 2 100%-2 100%-2"
+		/>
+		<!-- Left -->
+		<image texture="global/modern/button/gray-unselected-left-top.png"
+			real_texture_placement="0 0 8 8"
+			size="0 0 8 8"
+		/>
+		<image texture="global/modern/button/gray-unselected-left-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="0 8 8 100%-8"
+		/>
+		<image texture="global/modern/button/gray-unselected-left-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="0 100%-8 8 100%"
+		/>
+		<!-- Center -->
+		<image texture="global/modern/button/gray-unselected-center-top.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 0 100%-8 8"
+		/>
+		<image texture="global/modern/button/gray-unselected-center-bottom.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 100%-8 100%-8 100%"
+		/>
+		<!-- Right -->
+		<image texture="global/modern/button/gray-unselected-right-top.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 0 100% 8"
+		/>
+		<image texture="global/modern/button/gray-unselected-right-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="100%-8 8 100% 100%-8"
+		/>
+		<image texture="global/modern/button/gray-unselected-right-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 100%-8 100% 100%"
+		/>
+	</sprite>
+	<sprite name="ModernButtonGrayOver">
+		<!-- Background -->
+		<image texture="global/modern/button/gray-unselected-background.png"
+			real_texture_placement="0 0 512 128"
+			texture_size="0 0 512 128"
+			size="2 2 100%-2 100%-2"
+		>
+			<effect add_color="42 42 42 0"/>
+		</image>
+		<!-- Left -->
+		<image texture="global/modern/button/gray-unselected-left-top.png"
+			real_texture_placement="0 0 8 8"
+			size="0 0 8 8"
+		/>
+		<image texture="global/modern/button/gray-unselected-left-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="0 8 8 100%-8"
+		/>
+		<image texture="global/modern/button/gray-unselected-left-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="0 100%-8 8 100%"
+		/>
+		<!-- Center -->
+		<image texture="global/modern/button/gray-unselected-center-top.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 0 100%-8 8"
+		/>
+		<image texture="global/modern/button/gray-unselected-center-bottom.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 100%-8 100%-8 100%"
+		/>
+		<!-- Right -->
+		<image texture="global/modern/button/gray-unselected-right-top.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 0 100% 8"
+		/>
+		<image texture="global/modern/button/gray-unselected-right-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="100%-8 8 100% 100%-8"
+		/>
+		<image texture="global/modern/button/gray-unselected-right-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 100%-8 100% 100%"
+		/>
+	</sprite>
+	<sprite name="ModernButtonGrayDisabled">
+		<!-- Background -->
+		<image texture="global/modern/button/gray-unselected-background.png"
+			real_texture_placement="0 0 512 128"
+			texture_size="0 0 512 128"
+			size="2 2 100%-2 100%-2"
+		/>
+		<!-- Left -->
+		<image texture="global/modern/button/gray-unselected-left-top.png"
+			real_texture_placement="0 0 8 8"
+			size="0 0 8 8"
+		/>
+		<image texture="global/modern/button/gray-unselected-left-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="0 8 8 100%-8"
+		/>
+		<image texture="global/modern/button/gray-unselected-left-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="0 100%-8 8 100%"
+		/>
+		<!-- Center -->
+		<image texture="global/modern/button/gray-unselected-center-top.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 0 100%-8 8"
+		/>
+		<image texture="global/modern/button/gray-unselected-center-bottom.png"
+			real_texture_placement="0 0 128 8"
+			texture_size="0 0 128 8"
+			size="8 100%-8 100%-8 100%"
+		/>
+		<!-- Right -->
+		<image texture="global/modern/button/gray-unselected-right-top.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 0 100% 8"
+		/>
+		<image texture="global/modern/button/gray-unselected-right-center.png"
+			real_texture_placement="0 0 8 16"
+			texture_size="0 0 8 16"
+			size="100%-8 8 100% 100%-8"
+		/>
+		<image texture="global/modern/button/gray-unselected-right-bottom.png"
+			real_texture_placement="0 0 8 8"
+			size="100%-8 100%-8 100% 100%"
+		/>
+	</sprite>
 	<!--
 	==========================================
 	- Basic. -
@@ -585,6 +745,14 @@
 			size="0 6 16 22"
 		/>
 	</sprite>
+	<sprite name = "ModernDropDownArrowDisabled">
+		<effect grayscale=""/>
+		<image texture = "global/modern/dropdown-arrow.png"
+			real_texture_placement = "0 0 16 16"
+			texture_size="0 0 16 16"
+			size="0 6 16 22"
+		/>
+	</sprite>
 	<sprite name = "ModernNotSorted">
 		<image texture = "global/modern/arrow-up-down.png"
 			real_texture_placement = "0 0 16 16"
@@ -625,13 +793,20 @@
 			size="0 0 22 22"
 		/>
 	</sprite>
-	<sprite name="ModernTickDisabled">
+	<sprite name="ModernTickDisabledOn">
 		<effect grayscale=""/>
 		<image texture="global/modern/tick-on.png"
 			real_texture_placement="0 0 27 27"
 			size="0 0 22 22"
 		/>
 	</sprite>
+	<sprite name="ModernTickDisabledOff">
+		<effect	add_color="35 35 35 0"/>
+		<image texture="global/modern/tick-off.png"
+			real_texture_placement="0 0 27 27"
+			size="0 0 22 22"
+		/>
+	</sprite>
 	<sprite name="ModernGear">
 		<image texture="global/modern/gear.png"
 			texture_size="0 0 24 24"
@@ -647,4 +822,16 @@
 			texture_size="0 0 24 24"
 		/>
 	</sprite>
+	<sprite name="ModernSliderButton">
+		<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>
 </sprites>
@@ -39,6 +39,7 @@
 	<style name = "ModernList"
 		buffer_zone = "5"
 		font = "sans-bold-stroke-14"
+		heading_height="25"
 		scrollbar = "true"
 		scrollbar_style = "ModernScrollBar"
 		sprite = "ModernDarkBoxGoldNoTop"
@@ -58,8 +59,10 @@
 		text_valign="center"

 		sprite="ModernDarkBoxGold"
+		sprite_disabled="ModernDarkBoxGoldDisabled"
 		button_width="16"
 		sprite2="ModernDropDownArrow"
+		sprite2_disabled="ModernDropDownArrowDisabled"
 		sprite2_pressed="ModernDropDownArrowHighlight"

 		buffer_zone="8"
@@ -67,6 +70,7 @@
 		sprite_list="BlackBorderOnGray"
 		sprite_selectarea="ModernDarkBoxWhite"
 		textcolor_selected="white"
+		textcolor_disabled="140 140 140 255"

 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
@@ -78,18 +82,21 @@
 	<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"
 	/>
@@ -128,11 +135,17 @@
 	<style name="ModernTickBox"
 		sprite="ModernTickOff"
 		sprite2="ModernTickOn"
-		sprite_disabled="ModernTickDisabled"
-		sprite2_disabled="ModernTickDisabled"
+		sprite_disabled="ModernTickDisabledOff"
+		sprite2_disabled="ModernTickDisabledOn"
 		square_side="22"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
 	/>
+	<style name="ModernSlider"
+		sprite="ModernSliderButton"
+		sprite_bar="ModernSliderLine"
+		button_width="20"
+		tooltip_style="sliderTooltip"
+	/>
 	<style name="ModernButtonRed"
 		sprite="ModernButtonRed"
 		sprite_disabled="ModernButtonRedDisabled"
@@ -140,6 +153,7 @@
 		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"
@@ -148,9 +162,20 @@
 		sprite="ModernButtonYellow"
 		sprite_disabled="ModernButtonYellowDisabled"
 		sprite_over="ModernButtonYellowOver"
-		sprite_pressed="ModernButtonRed"
-		font="sans-bold-14"
-		textcolor="black"
+		sprite_pressed="ModernButtonYellow"
+		font="sans-bold-stroke-14"
+		textcolor="white"
+		text_align="center"
+		text_valign="center"
+		sound_pressed="audio/interface/ui/ui_button_click.ogg"
+	/>
+	<style name="ModernButtonGray"
+		sprite="ModernButtonGray"
+		sprite_disabled="ModernButtonGrayDisabled"
+		sprite_over="ModernButtonGrayOver"
+		sprite_pressed="ModernButtonGray"
+		font="sans-bold-stroke-14"
+		textcolor="white"
 		text_align="center"
 		text_valign="center"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"
@@ -52,12 +52,12 @@ ex_settings =
  attribute button_width { xsd:decimal }?&
  attribute checked { bool }?&
  attribute clip { bool }?&
-  attribute default_column { text }?&
  attribute dropdown_size { xsd:decimal }?&
  attribute dropdown_buffer { xsd:decimal }?&
  attribute enabled { bool }?&
  attribute font { text }?&
  attribute fov_wedge_color { ccolor }?&
+  attribute heading_height { text }?&
  attribute hotkey { text }?&
  attribute cell_id { xsd:integer }?&
  attribute independent { bool }?&
@@ -71,6 +71,9 @@ ex_settings =
  attribute scrollbar { bool }?&
  attribute scrollbar_style { text }?&
  attribute scroll_bottom { bool }?&
+  attribute scroll_top { bool }?&
+  attribute selected_column { text }?&
+  attribute selected_column_order { text }?&
  attribute sortable { bool }?&
  attribute sound_closed { text }?&
  attribute sound_disabled { text }?&
@@ -121,7 +124,7 @@ object =
    ((object
      | action
      | \attribute
-      | def
+      | column
      | \include
      | item
      | repeat
@@ -142,14 +145,15 @@ action =
    (keep | translate)*,
    attribute id { text }
  }
-def =
-  element def {
+column =
+  element column {
    translatableAttribute?,
    (
    attribute id { text }&
    attribute color { ccolor }?&
    attribute heading { text }?&
-    attribute width { text }?
+    attribute width { text }?&
+    attribute hidden { bool }?
    )
  }
 \include =
@@ -199,9 +199,6 @@
          <ref name="bool"/>
        </attribute>
      </optional>
-      <optional>
-        <attribute name="default_column"/>
-      </optional>
      <optional>
        <attribute name="dropdown_size">
          <data type="decimal"/>
@@ -225,6 +222,9 @@
          <ref name="ccolor"/>
        </attribute>
      </optional>
+      <optional>
+        <attribute name="heading_height"/>
+      </optional>
      <optional>
        <attribute name="hotkey"/>
      </optional>
@@ -290,7 +290,20 @@
        </attribute>
      </optional>
      <optional>
-        <attribute name="sortable"/>
+        <attribute name="scroll_top">
+          <ref name="bool"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="selected_column"/>
+      </optional>
+      <optional>
+        <attribute name="selected_column_order"/>
+      </optional>
+      <optional>
+        <attribute name="sortable">
+          <ref name="bool"/>
+        </attribute>
      </optional>
      <optional>
        <attribute name="sound_closed"/>
@@ -319,6 +332,9 @@
      <optional>
        <attribute name="sprite2"/>
      </optional>
+      <optional>
+        <attribute name="sprite_asc"/>
+      </optional>
      <optional>
        <attribute name="sprite_heading"/>
      </optional>
@@ -328,6 +344,9 @@
      <optional>
        <attribute name="sprite_background"/>
      </optional>
+      <optional>
+        <attribute name="sprite_desc"/>
+      </optional>
      <optional>
        <attribute name="sprite_disabled"/>
      </optional>
@@ -337,6 +356,9 @@
      <optional>
        <attribute name="sprite2_disabled"/>
      </optional>
+      <optional>
+        <attribute name="sprite_not_sorted"/>
+      </optional>
      <optional>
        <attribute name="sprite_over"/>
      </optional>
@@ -352,15 +374,6 @@
      <optional>
        <attribute name="sprite_selectarea"/>
      </optional>
-      <optional>
-        <attribute name="sprite_asc"/>
-      </optional>
-      <optional>
-        <attribute name="sprite_desc"/>
-      </optional>
-      <optional>
-        <attribute name="sprite_not_sorted"/>
-      </optional>
      <optional>
        <attribute name="square_side">
          <data type="decimal"/>
@@ -443,7 +456,7 @@
            <ref name="object"/>
            <ref name="action"/>
            <ref name="attribute"/>
-            <ref name="def"/>
+            <ref name="column"/>
            <ref name="include"/>
            <ref name="item"/>
            <ref name="repeat"/>
@@ -477,8 +490,8 @@
      <attribute name="id"/>
    </element>
  </define>
-  <define name="def">
-    <element name="def">
+  <define name="column">
+    <element name="column">
      <optional>
        <ref name="translatableAttribute"/>
      </optional>
@@ -495,6 +508,11 @@
        <optional>
          <attribute name="width"/>
        </optional>
+        <optional>
+          <attribute name="hidden">
+            <ref name="bool"/>
+          </attribute>
+        </optional>
      </interleave>
    </element>
  </define>
@@ -192,7 +192,7 @@ function generateModsList(listObjectName, mods)
 	});

 	// Update the list
-	var obj  = Engine.GetGUIObjectByName(listObjectName);
+	var obj = Engine.GetGUIObjectByName(listObjectName);
 	obj.list_name = names;
 	obj.list_modFolderName = folders;
 	obj.list_modLabel = labels;
@@ -269,19 +269,32 @@ function disableMod()

 function resetFilters()
 {
-	// Reset states of gui objects.
-	Engine.GetGUIObjectByName("modTypeFilter").selected = 0;
-	Engine.GetGUIObjectByName("negateFilter").checked = false;
 	Engine.GetGUIObjectByName("modGenericFilter").caption = "";
+	Engine.GetGUIObjectByName("negateFilter").checked = false;

 	// NOTE: Calling generateModsLists() is not needed as the selection changes and that calls applyFilters()
+	Engine.GetGUIObjectByName("modTypeFilter").selected = 0;
 }

 function applyFilters()
 {
-	Engine.GetGUIObjectByName("modsAvailableList").selected = -1;
-	Engine.GetGUIObjectByName("modsEnabledList").selected = -1;
+	// Save selected rows
+	let modsAvailableList = Engine.GetGUIObjectByName("modsAvailableList");
+	let modsEnabledList = Engine.GetGUIObjectByName("modsEnabledList");
+	let selectedModAvailableFolder = modsAvailableList.list_modFolderName[modsAvailableList.selected];
+	let selectedModEnabledFolder = modsEnabledList.list_modFolderName[modsEnabledList.selected];
+
+	// Remove selected rows to prevent a link to a non existing item
+	modsAvailableList.selected = -1;
+	modsEnabledList.selected = -1;
+
 	generateModsLists();
+
+	// Restore previously selected rows
+	modsAvailableList.selected = modsAvailableList.list_modFolderName.indexOf(selectedModAvailableFolder);
+	modsEnabledList.selected = modsEnabledList.list_modFolderName.indexOf(selectedModEnabledFolder);
+
+	Engine.GetGUIObjectByName("globalModDescription").caption = "";
 }

 /**
@@ -360,7 +373,7 @@ function moveCurrItem(objectName, up)
 function areDependenciesMet(mod)
 {
 	var guiObject = Engine.GetGUIObjectByName("message");
-	for each (var dependency in g_mods[mod].dependencies)
+	for (var dependency of g_mods[mod].dependencies)
 	{
 		if (isDependencyMet(dependency))
 			continue;
@@ -397,7 +410,7 @@ function isDependencyMet(dependency_idAndVersion, modsEnabled = null)
 		var dependency_id = dependency_idAndVersion;

 	// modsEnabled_key currently is the mod folder name.
-	for each (var modsEnabled_key in modsEnabled)
+	for (var modsEnabled_key of modsEnabled)
 	{
 		var modJson = g_mods[modsEnabled_key];
 		if (modJson.name != dependency_id)
@@ -86,30 +86,35 @@
 				<translatableAttribute id="caption">Available Mods</translatableAttribute>
 			</object>

-			<object name="modsAvailableList" style="ModernList" type="olist" size="0 25 100%-2 100%" font="sans-stroke-13">
+			<object name="modsAvailableList"
+				style="ModernList"
+				type="olist"
+				size="0 25 100%-2 100%"
+				font="sans-stroke-13"
+			>
 				<action on="SelectionChange">showModDescription(this.name);</action>
 				<!-- List headers -->
-				<def id="name" color="100 100 200" width="10%">
+				<column id="name" color="100 100 200" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
-				</def>
-				<def id="modVersion" color="128 128 128" width="7%">
+				</column>
+				<column id="modVersion" color="128 128 128" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
-				</def>
-				<def id="modFolderName" color="100 100 200" width="13%">
+				</column>
+				<column id="modFolderName" color="100 100 200" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
-				</def>
-				<def id="modLabel" color="0 60 0" width="18%">
+				</column>
+				<column id="modLabel" color="0 60 0" width="18%">
 					<translatableAttribute id="heading">Mod Label</translatableAttribute>
-				</def>
-				<def id="modType" color="0 128 128" width="12%">
+				</column>
+				<column id="modType" color="0 128 128" width="12%">
 					<translatableAttribute id="heading">Mod Type</translatableAttribute>
-				</def>
-				<def id="modDependencies" color="128 128 128" width="20%">
+				</column>
+				<column id="modDependencies" color="128 128 128" width="20%">
 					<translatableAttribute id="heading">Dependencies</translatableAttribute>
-				</def>
-				<def id="modURL" color="128 128 128" width="24%">
+				</column>
+				<column id="modURL" color="128 128 128" width="24%">
 					<translatableAttribute id="heading">Website</translatableAttribute>
-				</def>
+				</column>
 			</object>
 			<object name="globalModDescription" type="text" style="ModmodScrollbar" size="0 100%-28 100%-16 100%">
 				<attribute id="caption"><keep>[color="100 100 100"]</keep><translate>Description</translate><keep>[/color]</keep></attribute>
@@ -127,30 +132,36 @@
 				<translatableAttribute id="caption">Enabled Mods</translatableAttribute>
 			</object>

-			<object name="modsEnabledList" style="ModernList" type="olist" size="0 25 96%-5 100%" font="sans-stroke-13" tooltip_style="pgToolTip">
+			<object name="modsEnabledList"
+				style="ModernList"
+				type="olist"
+				size="0 25 96%-5 100%"
+				font="sans-stroke-13"
+				tooltip_style="pgToolTip"
+			>
 				<action on="SelectionChange">showModDescription(this.name);</action>
 				<!-- List headers -->
-				<def id="name" color="100 100 200" width="10%">
+				<column id="name" color="100 100 200" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
-				</def>
-				<def id="modVersion" color="128 128 128" width="7%">
+				</column>
+				<column id="modVersion" color="128 128 128" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
-				</def>
-				<def id="modFolderName" color="100 100 200" width="13%">
+				</column>
+				<column id="modFolderName" color="100 100 200" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
-				</def>
-				<def id="modLabel" color="0 60 0" width="18%">
+				</column>
+				<column id="modLabel" color="0 60 0" width="18%">
 					<translatableAttribute id="heading">Mod Label</translatableAttribute>
-				</def>
-				<def id="modType" color="0 128 128" width="12%">
+				</column>
+				<column id="modType" color="0 128 128" width="12%">
 					<translatableAttribute id="heading">Mod Type</translatableAttribute>
-				</def>
-				<def id="modDependencies" color="128 128 128" width="20%">
+				</column>
+				<column id="modDependencies" color="128 128 128" width="20%">
 					<translatableAttribute id="heading">Dependencies</translatableAttribute>
-				</def>
-				<def id="modURL" color="128 128 128" width="20%">
+				</column>
+				<column id="modURL" color="128 128 128" width="20%">
 					<translatableAttribute id="heading">Website</translatableAttribute>
-				</def>
+				</column>
 			</object>

 			<object type="button" style="ModernButtonRed" size="96% 23 100% 40%+12">
@@ -1,9 +1,9 @@
 <?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>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>

-    <include>modmod/styles.xml</include>
-    <include>modmod/modmod.xml</include>
+	<include>modmod/styles.xml</include>
+	<include>modmod/modmod.xml</include>
 </page>
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013 Wildfire Games
+/* Copyright (C) 2015 Wildfire Games.
 *
 * Permission is hereby granted, free of charge, to any person obtaining
 * a copy of this software and associated documentation files (the
@@ -7,10 +7,10 @@
 * distribute, sublicense, and/or sell copies of the Software, and to
 * permit persons to whom the Software is furnished to do so, subject to
 * the following conditions:
- * 
+ *
 * The above copyright notice and this permission notice shall be included
 * in all copies or substantial portions of the Software.
- * 
+ *
 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -174,12 +174,17 @@ function RunDetection(settings)
 	// List of warning strings to log
 	var warnings = [];

+	// If variable value is not undefined it overrides default.cfg,
+	// local preferences have a higher priority anyway
 	var disable_audio = undefined;
 	var disable_s3tc = undefined;
 	var disable_shadows = undefined;
 	var disable_shadowpcf = undefined;
 	var disable_allwater = undefined;
 	var disable_fancywater = undefined;
+	var enable_glsl = undefined;
+	var enable_postproc = undefined;
+	var enable_smoothlos = undefined;
 	var override_renderpath = undefined;

 	// TODO: add some mechanism for setting config values
@@ -209,6 +214,35 @@ function RunDetection(settings)
 	var GL_VERSION = settings.GL_VERSION;
 	var GL_EXTENSIONS = settings.GL_EXTENSIONS.split(" ");

+	// Enable GLSL on OpenGL 3+, which should be able to properly
+	// manage GLSL shaders, needed for effects like windy trees
+	if (GL_VERSION.match(/^[3-9]/))
+		enable_glsl = true;
+
+	// Enable most graphics options on OpenGL 4+, which should be
+	// able to properly manage them
+	if (GL_VERSION.match(/^[4-9]/))
+	{
+		enable_postproc = true;
+		enable_smoothlos = true;
+		// enable all water effects
+		disable_allwater = false;
+	}
+
+	// Disable most graphics features on software renderers
+	if (GL_RENDERER.match(/^(Software Rasterizer|.*(llvm|soft)pipe.*|Mesa X11|Apple Software Renderer|GDI Generic)$/))
+	{
+		warnings.push("You are using '" + GL_RENDERER + "' graphics driver, expect very poor performance!");
+		warnings.push("If possible install a proper graphics driver for your hardware.");
+		enable_glsl = false;
+		enable_postproc = false;
+		enable_smoothlos = false;
+		// s3tc on software renderers halves fps and makes textures weird
+		disable_s3tc = true;
+		disable_shadows = true;
+		disable_shadowpcf = true;
+		disable_allwater = true;
+	}

 	// NVIDIA 260.19.* UNIX drivers cause random crashes soon after startup.
 	// http://www.wildfiregames.com/forum/index.php?showtopic=13668
@@ -235,7 +269,7 @@ function RunDetection(settings)
 	//   Intel 4500MHD
 	// In the interests of performance, we'll disable them on lots of devices
 	// (with a fairly arbitrary cutoff for Intels)
-	if ((os_unix && GL_RENDERER.match(/^(Software Rasterizer|Gallium \S* on llvmpipe|Mesa X11|Apple Software Renderer)$/)) ||
+	if (
 		(os_unix && GL_RENDERER.match(/^Mesa DRI R[123]00 /)) ||
 		(os_macosx && IsWorseThanIntelMac(GL_RENDERER, "Intel HD Graphics 3000")) ||
 		(os_unix && IsWorseThanIntelMesa(GL_RENDERER, "Intel(R) Ironlake Desktop")) ||
@@ -247,14 +281,13 @@ function RunDetection(settings)
 	}

 	// Fragment-shader water is really slow on most Intel devices (especially the
-	// "use actual depth" option) and on software renderers, so disable it on all of them
-	if ((os_unix && GL_RENDERER.match(/^(Software Rasterizer|Gallium \S* on llvmpipe|Apple Software Renderer)$/)) ||
+	// "use actual depth" option), so disable it on all of them
+	if (
 		(os_macosx && IsWorseThanIntelMac(GL_RENDERER, "*")) ||
 		(os_unix && IsWorseThanIntelMesa(GL_RENDERER, "*")) ||
 		(os_win && IsWorseThanIntelWindows(GL_RENDERER, "*"))
 	)
 	{
-		disable_allwater = false;
 		disable_fancywater = true;
 		disable_shadowpcf = true;
 	}
@@ -293,6 +326,9 @@ function RunDetection(settings)
 		"disable_shadowpcf": disable_shadowpcf,
 		"disable_allwater": disable_allwater,
 		"disable_fancywater": disable_fancywater,
+		"enable_glsl": enable_glsl,
+		"enable_postproc": enable_postproc,
+		"enable_smoothlos": enable_smoothlos,
 		"override_renderpath": override_renderpath,
 	};
 }
@@ -327,11 +363,20 @@ global.RunHardwareDetection = function(settings)
 		Engine.SetDisableShadowPCF(output.disable_shadowpcf);

 	if (output.disable_allwater !== undefined)
-		Engine.SetDisableFancyWater(output.disable_allwater);
-	
+		Engine.SetDisableAllWater(output.disable_allwater);
+
 	if (output.disable_fancywater !== undefined)
 		Engine.SetDisableFancyWater(output.disable_fancywater);

+	if (output.enable_glsl !== undefined)
+		Engine.SetEnableGLSL(output.enable_glsl);
+
+	if (output.enable_postproc !== undefined)
+		Engine.SetEnablePostProc(output.enable_postproc);
+
+	if (output.enable_smoothlos !== undefined)
+		Engine.SetEnableSmoothLOS(output.enable_smoothlos);
+
 	if (output.override_renderpath !== undefined)
 		Engine.SetRenderPath(output.override_renderpath);
 };
@@ -22,14 +22,14 @@ hwdetectTestData.sort(function(a, b) {
 	return 0;
 });

-for each (var settings in hwdetectTestData)
+for (var settings of hwdetectTestData)
 {
 	var output = RunDetection(settings);

 	var os = (settings.os_linux ? "linux" : settings.os_macosx ? "macosx" : settings.os_win ? "win" : "???");

 	var disabled = [];
-	for each (var d in ["disable_audio", "disable_s3tc", "disable_shadows", "disable_shadowpcf", "disable_allwater", "disable_fancywater", "override_renderpath"])
+	for (var d of ["disable_audio", "disable_s3tc", "disable_shadows", "disable_shadowpcf", "disable_allwater", "disable_fancywater", "override_renderpath"])
 		if (output[d] !== undefined)
 			disabled.push(d+"="+output[d])

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+
+    <technique>
+        <require shaders="fixed"/>
+        <pass shader="fixed:gui_solid"/>
+    </technique>
+
+    <technique>
+        <require shaders="glsl"/>
+        <pass shader="glsl/gui_solid_mask"/>
+    </technique>
+
+</effect>
@@ -7,5 +7,7 @@ varying vec2 v_tex;

 void main()
 {
-  gl_FragColor = texture2D(tex, v_tex) + color;
+	vec4 t = texture2D(tex, v_tex);
+	gl_FragColor.rgb = t.rgb + color.rgb * t.a;
+	gl_FragColor.a = t.a;
 }
@@ -0,0 +1,13 @@
+#version 110
+
+uniform sampler2D tex;
+uniform vec4 color;
+
+varying vec2 v_tex;
+
+void main()
+{
+  vec4 t = texture2D(tex, v_tex);
+  gl_FragColor.rgb = color.rgb;
+  gl_FragColor.a = t.a*color.a;
+}
@@ -0,0 +1,15 @@
+#version 110
+
+uniform mat4 transform;
+
+varying vec2 v_tex;
+
+attribute vec3 a_vertex;
+attribute vec2 a_uv0;
+
+void main()
+{
+  gl_Position = transform * vec4(a_vertex, 1.0);
+
+  v_tex = a_uv0;
+}
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="glsl">
+
+    <vertex file="glsl/gui_solid_mask.vs">
+        <stream name="pos"/>
+        <stream name="uv0"/>
+        <attrib name="a_vertex" semantics="gl_Vertex"/>
+        <attrib name="a_uv0" semantics="gl_MultiTexCoord0"/>
+    </vertex>
+
+    <fragment file="glsl/gui_solid_mask.fs"/>
+
+</program>
@@ -9,6 +9,7 @@ element actor {
    element group {
        element variant {
            attribute name { text }? &
+            attribute file { text }? &
            attribute frequency { xsd:nonNegativeInteger }? &
            element mesh {
                text
@@ -37,6 +38,8 @@ element actor {
            element animations {
                element animation {
                    attribute name { text } &
+                    attribute id { text }? &
+                    attribute frequency { xsd:nonNegativeInteger }? &
                    attribute file { text }? &
                    attribute speed { xsd:nonNegativeInteger } &
                    attribute event { xsd:decimal { minInclusive = "0" maxInclusive = "1" } }? &
@@ -18,6 +18,9 @@
              <optional>
                <attribute name="name"/>
              </optional>
+              <optional>
+                <attribute name="file"/>
+              </optional>
              <optional>
                <attribute name="frequency">
                  <data type="nonNegativeInteger"/>
@@ -90,6 +93,14 @@
                    <element name="animation">
                      <interleave>
                        <attribute name="name"/>
+                        <optional>
+                          <attribute name="id"/>
+                        </optional>
+                        <optional>
+                          <attribute name="frequency">
+                            <data type="nonNegativeInteger"/>
+                          </attribute>
+                        </optional>
                        <optional>
                          <attribute name="file"/>
                        </optional>
@@ -5,18 +5,26 @@
    <variant frequency="100" name="Base">
      <mesh>skeletal/pig.dae</mesh>
      <props>
-        <prop actor="particle/flame_catapult.xml" attachpoint="root"/>
-        <prop actor="particle/smoke.xml" attachpoint="root"/>
+        <prop actor="particle/flame_pig.xml" attachpoint="root"/>
+        <prop actor="particle/smoke_blacksmith.xml" attachpoint="root"/>
      </props>
-      <textures><texture file="skeletal/animal_pig_a.dds" name="baseTex"/></textures>
    </variant>
  </group>
  <group>
-    <variant frequency="100" name="Idle"/>
+    <variant name="healthy" frequency="1">
+      <textures><texture file="skeletal/animal_pig_b.png" name="baseTex"/></textures>
+    </variant>
+    <variant name="lightDamage">
+      <textures><texture file="skeletal/animal_pig_c.png" name="baseTex"/></textures>
+    </variant>
+    <variant name="mediumDamage">
+      <textures><texture file="skeletal/animal_pig_d.png" name="baseTex"/></textures>
+    </variant>
+    <variant name="heavyDamage">
+      <textures><texture file="skeletal/animal_pig_e.png" name="baseTex"/></textures>
+    </variant>
    <variant name="death">
-      <props>
-        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
-      </props>
+      <textures><texture file="skeletal/animal_pig_e.png" name="baseTex"/></textures>
    </variant>
  </group>
 </actor>
@@ -17,7 +17,10 @@
  </group>
  <group>
    <variant frequency="1" name="standard">
-      <textures><texture file="skeletal/animal_rhino.png" name="baseTex"/></textures>
+      <textures>
+		<texture file="skeletal/animal_rhino.png" name="baseTex"/>
+		<texture file="skeletal/animal_rhino_spec.png" name="specTex"/>
+	  </textures>
    </variant>
  </group>
  <group>
@@ -28,4 +31,5 @@
      </props>
    </variant>
  </group>
+  <material>basic_specmap.xml</material>
 </actor>
@@ -5,14 +5,14 @@
  <group>
    <variant frequency="100" name="Mesh">
      <animations>
-        <animation file="other/whale_fin_idle_a.dae" name="Idle" speed="5"/>
-        <animation file="other/whale_fin_idle_a.dae" name="Idle" speed="6"/>
-        <animation file="other/whale_fin_idle_b.dae" name="Idle" speed="5"/>
-        <animation file="other/whale_fin_idle_b.dae" name="Idle" speed="5"/>
-        <animation file="other/whale_fin_idle_c.dae" name="Idle" speed="5"/>
-        <animation file="other/whale_fin_idle_c.dae" name="Idle" speed="7"/>
-        <animation file="other/whale_fin_idle_d.dae" name="Idle" speed="6"/>
-        <animation file="other/whale_fin_idle_d.dae" name="Idle" speed="5"/>
+        <animation file="other/whale_fin_idle_a.dae" name="Idle" speed="2"/>
+        <animation file="other/whale_fin_idle_a.dae" name="Idle" speed="3"/>
+        <animation file="other/whale_fin_idle_b.dae" name="Idle" speed="2"/>
+        <animation file="other/whale_fin_idle_b.dae" name="Idle" speed="3"/>
+        <animation file="other/whale_fin_idle_c.dae" name="Idle" speed="2"/>
+        <animation file="other/whale_fin_idle_c.dae" name="Idle" speed="3"/>
+        <animation file="other/whale_fin_idle_d.dae" name="Idle" speed="3"/>
+        <animation file="other/whale_fin_idle_d.dae" name="Idle" speed="2"/>
      </animations>
      <mesh>skeletal/whale_fin.dae</mesh>
    </variant>
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="trunk-a">
+      <mesh>gaia/tree_acacia_a.dae</mesh>
+	   <props>
+        <prop actor="flora/trees/acacia_top_a.xml" attachpoint="root"/>
+        <prop actor="flora/trees/acacia_branches_a.xml" attachpoint="root"/>
+     </props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-b">
+      <mesh>gaia/tree_acacia_b.dae</mesh>
+	  	  <props>
+          <prop actor="flora/trees/acacia_top_b.xml" attachpoint="root"/>
+          <prop actor="flora/trees/acacia_branches_b.xml" attachpoint="root"/>
+        </props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-c">
+      <mesh>gaia/tree_acacia_c.dae</mesh>
+	    <props>
+        <prop actor="flora/trees/acacia_top_c.xml" attachpoint="root"/>
+        <prop actor="flora/trees/acacia_branches_c.xml" attachpoint="root"/>
+      </props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-d">
+      <mesh>gaia/tree_acacia_d.dae</mesh>
+	  	  <props>
+          <prop actor="flora/trees/acacia_top_d.xml" attachpoint="root"/>
+          <prop actor="flora/trees/acacia_branches_d.xml" attachpoint="root"/>
+        </props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-e">
+      <mesh>gaia/tree_acacia_e.dae</mesh>
+	  	  <props>
+          <prop actor="flora/trees/acacia_top_e.xml" attachpoint="root"/>
+          <prop actor="flora/trees/acacia_branches_e.xml" attachpoint="root"/>
+        </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant name="trunk-texture">
+      <textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-branches-mesh-a">
+      <mesh>gaia/tree_acacia_branches_a.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="acacia-dead-branches">
+      <textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-branches-mesh-b">
+      <mesh>gaia/tree_acacia_branches_b.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="acacia-dead-branches">
+      <textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-branches-mesh-c">
+      <mesh>gaia/tree_acacia_branches_c.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="acacia-dead-branches">
+      <textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-branches-mesh-d">
+      <mesh>gaia/tree_acacia_branches_d.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="acacia-dead-branches">
+      <textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-branches-mesh-e">
+      <mesh>gaia/tree_acacia_branches_e.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="acacia-dead-branches">
+      <textures><texture file="gaia/tree_dead_branches.png" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-top-mesh-a">
+      <mesh>gaia/tree_acacia_top_a.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="acacia-top-texture-a">
+      <textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="acacia-top-texture-b">
+      <textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-top-mesh-b">
+      <mesh>gaia/tree_acacia_top_b.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="acacia-top-texture-a">
+      <textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="acacia-top-texture-b">
+      <textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-top-mesh-c">
+      <mesh>gaia/tree_acacia_top_c.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="acacia-top-texture-a">
+      <textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="acacia-top-texture-b">
+      <textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-top-mesh-d">
+      <mesh>gaia/tree_acacia_top_d.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="acacia-top-texture-a">
+      <textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="acacia-top-texture-b">
+      <textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="acacia-top-mesh-e">
+      <mesh>gaia/tree_acacia_top_e.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="acacia-top-texture-a">
+      <textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="acacia-top-texture-b">
+      <textures><texture file="gaia/tree_baobab_b.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -13,15 +13,30 @@
    </variant>
  </group>
  <group>
-    <variant frequency="1" name="Foliage-small">
+    <variant frequency="1" name="Aleppo-1">
      <mesh>gaia/tree_pine_aleppo_1.dae</mesh>
    </variant>
-    <variant frequency="1" name="Foliage-double">
+    <variant frequency="1" name="Aleppo-2">
      <mesh>gaia/tree_pine_aleppo_2.dae</mesh>
    </variant>
-    <variant frequency="2" name="Foliage-single">
+    <variant frequency="1" name="Aleppo-3">
      <mesh>gaia/tree_pine_aleppo_3.dae</mesh>
    </variant>
+	<variant frequency="1" name="Aleppo-4">
+      <mesh>gaia/tree_pine_aleppo_4.dae</mesh>
+    </variant>
+	<variant frequency="1" name="Aleppo-5">
+      <mesh>gaia/tree_pine_aleppo_5.dae</mesh>
+    </variant>
+	<variant frequency="1" name="Aleppo-6">
+      <mesh>gaia/tree_pine_aleppo_6.dae</mesh>
+    </variant>
+  <variant frequency="1" name="Aleppo-7">
+      <mesh>gaia/tree_pine_aleppo_7.dae</mesh>
+    </variant>
+  <variant frequency="1" name="Aleppo-8">
+      <mesh>gaia/tree_pine_aleppo_8.dae</mesh>
+    </variant>        
  </group>
  <material>basic_trans_wind.xml</material>
 </actor>
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
-      <animations/>
      <mesh>gaia/tree_dead_a_1.dae</mesh>
-      <props/>
-      <textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
+      <props>
+        <prop actor="props/flora/tree_dead_a1_branches.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/tree_dead.dds" name="baseTex"/>
+      </textures>
    </variant>
  </group>

  <material>basic_trans_wind.xml</material>
-
 </actor>
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant name="EuropeanBeech-Trunk-a">
      <mesh>gaia/tree_oak_a.dae</mesh>
@@ -11,13 +9,11 @@
      <mesh>gaia/tree_oak_b.dae</mesh>
    </variant>
  </group>
-
  <group>
    <variant name="Trunk-Texture">
      <textures><texture file="gaia/trunk_beech_a.dds" name="baseTex"/></textures>
    </variant>
  </group>
-
  <group>
    <variant name="prop-canopy">
      <props>
@@ -25,5 +21,5 @@
      </props>
    </variant>
  </group>
-
+  <material>basic_trans_wind.xml</material>
 </actor>
@@ -32,5 +32,5 @@
      <textures><texture file="gaia/tree_euro_beech_c_aut.dds" name="baseTex"/></textures>
    </variant>
  </group>
-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
@@ -1,17 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 <actor version="1">
-
  <castshadow/>
-
  <group>
    <variant frequency="100" name="Base">
      <animations/>
      <mesh>gaia/wrld_grass_1.dae</mesh>
      <props/>
-      <textures><texture file="gaia/wrld_med_plant.dds" name="baseTex"/></textures>
+      <textures><texture file="gaia/wrld_med_plant.png" name="baseTex"/></textures>
    </variant>
  </group>
-
  <material>basic_trans_wind.xml</material>
-
 </actor>
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>	
+    <variant frequency="1" name="trunk-b">
+      <mesh>gaia/tree_oak_new_b.dae</mesh>
+    </variant>
+	
+    <variant frequency="1" name="trunk-c">
+      <mesh>gaia/tree_oak_new_c.dae</mesh>
+    </variant>
+	
+    <variant frequency="1" name="trunk-d">
+      <mesh>gaia/tree_oak_new_d.dae</mesh>
+    </variant>
+	
+    <variant frequency="1" name="trunk-e">
+      <mesh>gaia/tree_oak_new_e.dae</mesh>
+    </variant>
+	
+    <variant frequency="1" name="trunk-f">
+      <mesh>gaia/tree_oak_new_f.dae</mesh>
+    </variant>	
+  </group>
+
+  <group>
+    <variant name="trunk-texture">
+      <textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="trunk-a">
+      <mesh>gaia/tree_oak_new_a.dae</mesh>
+	  <props><prop actor="flora/trees/oak_new_top_a.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-b">
+      <mesh>gaia/tree_oak_new_b.dae</mesh>
+	  	  <props><prop actor="flora/trees/oak_new_top_b.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-c">
+      <mesh>gaia/tree_oak_new_c.dae</mesh>
+	  <props><prop actor="flora/trees/oak_new_top_c.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-d">
+      <mesh>gaia/tree_oak_new_d.dae</mesh>
+	  	  <props><prop actor="flora/trees/oak_new_top_d.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-e">
+      <mesh>gaia/tree_oak_new_e.dae</mesh>
+	  	  <props><prop actor="flora/trees/oak_new_top_e.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-f">
+      <mesh>gaia/tree_oak_new_f.dae</mesh>
+	  	  <props><prop actor="flora/trees/oak_new_top_f.xml" attachpoint="root"/></props>
+    </variant>	
+  </group>
+
+  <group>
+    <variant name="trunk-texture">
+      <textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="trunk-a">
+      <mesh>gaia/tree_oak_new_a.dae</mesh>
+	  <props><prop actor="flora/trees/oak_new_top_aut_a.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-b">
+      <mesh>gaia/tree_oak_new_b.dae</mesh>
+	  	  <props><prop actor="flora/trees/oak_new_top_aut_b.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-c">
+      <mesh>gaia/tree_oak_new_c.dae</mesh>
+	  <props><prop actor="flora/trees/oak_new_top_aut_c.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-d">
+      <mesh>gaia/tree_oak_new_d.dae</mesh>
+	  	  <props><prop actor="flora/trees/oak_new_top_aut_d.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-e">
+      <mesh>gaia/tree_oak_new_e.dae</mesh>
+	  	  <props><prop actor="flora/trees/oak_new_top_aut_e.xml" attachpoint="root"/></props>
+    </variant>
+	
+    <variant frequency="1" name="trunk-f">
+      <mesh>gaia/tree_oak_new_f.dae</mesh>
+	  	  <props><prop actor="flora/trees/oak_new_top_aut_f.xml" attachpoint="root"/></props>
+    </variant>	
+  </group>
+
+  <group>
+    <variant name="trunk-texture">
+      <textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-a">
+      <mesh>gaia/tree_oak_new_top_a.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-a">
+      <mesh>gaia/tree_oak_new_top_a.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="a-oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="a-oak-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="a-oak-aut-top-texture-b1">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="a-oak-aut-top-texture-c1">
+      <textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="a-oak-aut-top-texture-d">
+      <textures><texture file="gaia/tree_oak_d_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="a-oak-aut-top-texture-e">
+      <textures><texture file="gaia/tree_oak_e_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="3" name="a-beech-aut-top-texture-c">
+      <textures><texture file="gaia/tree_euro_beech_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="Falling Leaves">
+      <props>
+        <prop actor="particle/falling_leaf_dry_a.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,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-b">
+      <mesh>gaia/tree_oak_new_top_b.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="b-oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="b-oak-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="b-oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="b-oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="b-oak-aut-top-texture-d">
+      <textures><texture file="gaia/tree_oak_d_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="b-oak-aut-top-texture-e">
+      <textures><texture file="gaia/tree_oak_e_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="3" name="b-beech-aut-top-texture-c">
+      <textures><texture file="gaia/tree_euro_beech_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="Falling Leaves">
+      <props>
+        <prop actor="particle/falling_leaf_dry_a.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,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-c">
+      <mesh>gaia/tree_oak_new_top_c.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="c-oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="c-oak-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="c-oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="c-oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="c-oak-aut-top-texture-d">
+      <textures><texture file="gaia/tree_oak_d_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="c-oak-aut-top-texture-e">
+      <textures><texture file="gaia/tree_oak_e_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="3" name="c-beech-aut-top-texture-c">
+      <textures><texture file="gaia/tree_euro_beech_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="Falling Leaves">
+      <props>
+        <prop actor="particle/falling_leaf_dry_a.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,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-d">
+      <mesh>gaia/tree_oak_new_top_d.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="d-oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="d-oak-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="3" name="d-oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="d-oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="d-oak-aut-top-texture-d">
+      <textures><texture file="gaia/tree_oak_d_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="d-oak-aut-top-texture-e">
+      <textures><texture file="gaia/tree_oak_e_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="3" name="d-beech-aut-top-texture-c">
+      <textures><texture file="gaia/tree_euro_beech_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="Falling Leaves">
+      <props>
+        <prop actor="particle/falling_leaf_dry_a.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,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-e">
+      <mesh>gaia/tree_oak_new_top_e.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="e-oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="e-oak-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="e-oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="e-oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="e-oak-aut-top-texture-d">
+      <textures><texture file="gaia/tree_oak_d_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="e-oak-aut-top-texture-e">
+      <textures><texture file="gaia/tree_oak_e_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="3" name="e-beech-aut-top-texture-c">
+      <textures><texture file="gaia/tree_euro_beech_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="Falling Leaves">
+      <props>
+        <prop actor="particle/falling_leaf_dry_a.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,50 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-f">
+      <mesh>gaia/tree_oak_new_top_f.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="2" name="f-oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="1" name="f-oak-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="f-oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="f-oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="f-oak-aut-top-texture-d">
+      <textures><texture file="gaia/tree_oak_d_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="f-oak-aut-top-texture-e">
+      <textures><texture file="gaia/tree_oak_e_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="3" name="f-beech-aut-top-texture-c">
+      <textures><texture file="gaia/tree_euro_beech_c_aut.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="2" name="Falling Leaves">
+      <props>
+        <prop actor="particle/falling_leaf_dry_a.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,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-b">
+      <mesh>gaia/tree_oak_new_top_b.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-c">
+      <mesh>gaia/tree_oak_new_top_c.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-d">
+      <mesh>gaia/tree_oak_new_top_d.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-e">
+      <mesh>gaia/tree_oak_new_top_e.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="oak-new-top-mesh-f">
+      <mesh>gaia/tree_oak_new_top_f.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="oak-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="2" name="Cretan-Date-Palm-02">
+      <mesh>gaia/tree_cretan_date_palm_02.dae</mesh>
+    </variant>
+    <variant frequency="3" name="Cretan-Date-Palm-04">
+      <mesh>gaia/tree_cretan_date_palm_04.dae</mesh>
+    </variant>
+    <variant frequency="3" name="Cretan-Date-Palm-05">
+      <mesh>gaia/tree_cretan_date_palm_05.dae</mesh>
+    </variant>
+    <variant frequency="0" name="Weird_Crooked_One">
+      <mesh>gaia/tree_cretan_date_palm_08.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="Palm Fronds-a">
+      <textures>
+        <texture file="gaia/tree_palm_senegal_a.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Palm Fronds-b">
+      <textures>
+        <texture file="gaia/tree_palm_senegal_b.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Palm Fronds-c">
+      <textures>
+        <texture file="gaia/tree_palm_senegal_c.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="Palm Fronds-d">
+      <textures>
+        <texture file="gaia/tree_palm_senegal_d.dds" name="baseTex"/>
+        <texture file="gaia/tree_palm_senegal_spec.png" name="specTex"/>
+        <texture file="gaia/tree_palm_senegal_norm.png" name="normTex"/>
+      </textures>
+    </variant>
+  </group>
+  <material>trans_wind_parallax_spec.xml</material>
+</actor>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>gaia/palm_d.dae</mesh>
-      <props/>
-      <textures><texture file="gaia/wrld_palm.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-
-  <material>basic_trans_wind.xml</material>
-
-</actor>
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<actor version="1">
-
-  <castshadow/>
-
-  <group>
-    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>gaia/palm_e.dae</mesh>
-      <props/>
-      <textures><texture file="gaia/wrld_palm.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-
-  <material>basic_trans_wind.xml</material>
-
-</actor>
@@ -14,5 +14,5 @@
      <textures><texture file="gaia/tree_dead.dds" name="baseTex"/></textures>
    </variant>
  </group>
-  <material>basic_trans_wind.xml</material>
+  <material>basic_trans.xml</material>
 </actor>
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="tree test top">
+      <mesh>gaia/tree_test.dae</mesh>
+        <props>
+        <prop actor="flora/trees/tree_test_top.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="trunk">
+      <textures><texture file="gaia/trunk_deciduous_a.dds" name="baseTex"/></textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="1" name="tree test top">
+      <mesh>gaia/tree_test_top.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="leaf-color-a">
+      <textures><texture file="gaia/tree_carob_a.dds" name="baseTex"/>
+          <texture file="props/yellow.png" name="specTex"/>
+    </textures>
+    </variant>
+    <variant frequency="1" name="leaf-color-b">
+      <textures><texture file="gaia/tree_carob_b.dds" name="baseTex"/>
+    <texture file="props/yellow.png" name="specTex"/>
+    </textures>
+    </variant>
+    <variant frequency="1" name="leaf-color-c">
+      <textures><texture file="gaia/tree_carob_c.dds" name="baseTex"/>
+    <texture file="props/yellow.png" name="specTex"/>
+    </textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="straight_a">
-      <mesh>gaia/cliff_a.dae</mesh>
-    </variant>
-    <variant name="corner_inside">
-      <mesh>gaia/cliff_a_corner_inside.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures><texture file="gaia/cliff_desert_a.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <material>basic_trans.xml</material>
-</actor>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant name="Base">
+      <particles file="dust_storm_reddish.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
+
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant name="Falling Dry Leaf">
+      <particles file="leaf_dry_a.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant name="Base">
+      <particles file="flame_pig.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <float/>
+  <group>
+    <variant name="Base">
+      <particles file="smoke_curved.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <group>
+    <variant name="Base">
+      <particles file="sparks_blacksmith.xml"/>
+    </variant>
+  </group>
+  <material>basic_trans.xml</material>
+</actor>
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-  <castshadow/>
  <group>
    <variant name="a">
      <mesh>gaia/cross_large_short.dae</mesh>
@@ -17,5 +16,5 @@
      </textures>
    </variant>
  </group>
-  <material>basic_glow.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
  <group>
-    <variant name="Barley">
-      <mesh>gaia/wrld_barley.dae</mesh>
+    <variant name="Patch Small">
+      <mesh>gaia/grass_la_tall_a.dae</mesh>
+    </variant>
+    <variant name="Patch Large">
+      <mesh>gaia/grass_la_tall_b.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant name="Barley Texture">
      <textures>
        <texture file="gaia/farming_barley_harvest_a.png" name="baseTex"/>
 		<texture file="props/yellow.png" name="specTex"/>
      </textures>
    </variant>
  </group>
-  <material>basic_glow.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
-  <castshadow/>
  <group>
    <variant name="a">
      <mesh>gaia/cross_large_short.dae</mesh>
@@ -17,5 +16,5 @@
      </textures>
    </variant>
  </group>
-  <material>basic_glow.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
@@ -16,5 +16,5 @@
      </textures>
    </variant>
  </group>
-  <material>basic_glow.xml</material>
+  <material>basic_trans_wind.xml</material>
 </actor>
@@ -8,7 +8,7 @@
  </group>
  <group>
    <variant name="grapes">
-      <textures><texture file="gaia/bush_grapes.dds" name="baseTex"/></textures>
+      <textures><texture file="gaia/bush_grapes.png" name="baseTex"/></textures>
    </variant>
  </group>
  <group>
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/tree_dead_a1_branches.dae</mesh>
+       <textures>
+		<texture file="gaia/tree_dead_branches.png" name="baseTex"/>
+	  </textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+
+  <castshadow/>
+
+  <group>
+    <variant frequency="100" name="Base">
+      <mesh>props/tree_dead_a2_branches.dae</mesh>
+       <textures>
+		<texture file="gaia/tree_dead_branches.png" name="baseTex"/>
+	  </textures>
+    </variant>
+  </group>
+
+  <material>basic_trans_wind.xml</material>
+
+</actor>
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant frequency="100">
-      <mesh>props/special/marker_object_sound.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant name="base">
-      <textures>
-        <texture file="props/marker_object.png" name="baseTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
--- a/Show More
+++ b/Show More