Update Translators credits and add texane to the list of contributors (refs #3863 ).

This was SVN commit r17964.
Update the creditTranslators script for the A20 languages.
2026-06-21 14:43:52 +00:00 · 2016-03-28 00:23:04 +00:00 · 2016-03-28 00:18:13 +00:00 · 2016-03-27 23:27:37 +00:00 · 2016-03-27 22:08:25 +00:00 · 2016-03-27 12:46:18 +00:00
3848 changed files with 100844 additions and 261832 deletions
@@ -51,6 +51,12 @@ in particular, let us know and we can try to clarify it.
  /source/lib
    MIT

+  /source/scriptinterface/third_party
+    MPL 2.0
+
+  /source/third_party/cppformat
+    BSD
+
  /source/third_party/encryption
    GPL version 2 (or later)
    ISC (pkcs5_pbkdf2.cpp)
@@ -66,7 +72,7 @@ in particular, let us know and we can try to clarify it.
    MIT

  /source/third_party/tinygettext
-    GPL version 2 (or later) - see license_gpl-2.0.txt
+    zlib

  /source/tools
    Various - see LICENSE.txt within that directory
@@ -4,6 +4,8 @@
 ; * DO NOT EDIT THIS FILE if you want personal customisations: *
 ; * create a text file called "local.cfg" instead, and copy    *
 ; * the lines from this file that you want to change.          *
+; * You also need to copy the section tags ([hotkey], [gui],   *
+; * etc.) for the things you change.                           *
 ; *                                                            *
 ; * On Linux, create:                                          *
 ; *   $XDG_CONFIG_HOME/0ad/config/local.cfg                    *
@@ -32,6 +34,9 @@ splashscreenversion = 0
 ; Pause the game on window focus loss (Only applicable to single player mode)
 pauseonfocusloss = true

+; Persist settings after leaving the game setup screen
+persistmatchsettings = true
+
 ; Default player name to use in multiplayer
 ; playername = "anonymous"

@@ -50,6 +55,9 @@ bpp = 0
 ; Preferred display (for multidisplay setups, only works with SDL 2.0)
 display = 0

+; Emulate right-click with Ctrl+Click on Mac mice
+macmouse = false
+
 ; System settings:

 ; if false, actors won't be rendered but anything entity will be.
@@ -67,7 +75,7 @@ shadowpcf = true
 vsync = false
 particles = true
 silhouettes = true
-showsky = false
+showsky = true

 nos3tc = false
 noautomipmap = true
@@ -90,23 +98,20 @@ 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

-; Use smooth LOS interpolation; REQUIRES preferglsl=true.
+; Use smooth LOS interpolation
 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)
-materialmgr.quality = 0.0
+materialmgr.quality = 2.0

 ; Maximum distance to display parallax effect. Set to 0 to disable parallax.
 materialmgr.PARALLAX_DIST.max = 150
@@ -119,263 +124,287 @@ materialmgr.PARALLAX_VHQ_DIST.max = 0
 ; Replace alpha-blending with alpha-testing, for performance experiments
 forcealphatest = false

-; Opt-in online user reporting system
-userreport.url = "http://feedback.wildfiregames.com/report/upload/v1/"
-
-; Colour of the sky (in "r g b" format)
+; Color of the sky (in "r g b" format)
 skycolor = "0 0 0"

-; GENERAL PREFERENCES:
-
-sound.mastergain = 0.9
-sound.musicgain = 0.2
-sound.ambientgain = 0.6
-sound.actiongain = 0.7
-sound.uigain = 0.7
-
-; Camera control settings
-view.scroll.speed = 120.0
-view.scroll.speed.modifier = 1.05           ; Multiplier for changing scroll speed
-view.rotate.x.speed = 1.2
-view.rotate.x.min = 28.0
-view.rotate.x.max = 60.0
-view.rotate.x.default = 35.0
-view.rotate.y.speed = 2.0
-view.rotate.y.speed.wheel = 0.45
-view.rotate.y.default = 0.0
-view.rotate.speed.modifier = 1.05           ; Multiplier for changing rotation speed
-view.drag.speed = 0.5
-view.zoom.speed = 256.0
-view.zoom.speed.wheel = 32.0
-view.zoom.min = 50.0
-view.zoom.max = 200.0
-view.zoom.default = 120.0
-view.zoom.speed.modifier = 1.05             ; Multiplier for changing zoom speed
-view.pos.smoothness = 0.1
-view.zoom.smoothness = 0.4
-view.rotate.x.smoothness = 0.5
-view.rotate.y.smoothness = 0.3
-view.near = 2.0                             ; Near plane distance
-view.far = 4096.0                           ; Far plane distance
-view.fov = 45.0                             ; Field of view (degrees), lower is narrow, higher is wide
-view.height.smoothness = 0.5
-view.height.min = 16
-
-; How close do we have to be to the actual location in order to jump back to the previous one?
-camerajump.threshold = 40
-
-; HOTKEY MAPPINGS:

+[hotkey]
 ; Each one of the specified keys will trigger the action on the left
-; for multiple-key combinations, separate keys with '+' and enclose the entire thing
-;   in doublequotes.
+; for multiple-key combinations, separate keys with '+'.
 ; See keys.txt for the list of key names.

 ; > SYSTEM SETTINGS
-hotkey.exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop
-hotkey.leave = Escape                       ; End current game or Exit
-hotkey.confirm = Return                     ; Confirm the current command.
-hotkey.pause = Pause                        ; Pause/unpause game
-hotkey.screenshot = F2                      ; Take PNG screenshot
-hotkey.bigscreenshot = "Shift+F2"           ; Take large BMP screenshot
-hotkey.togglefullscreen = "Alt+Return"      ; Toggle fullscreen/windowed mode
-hotkey.screenshot.watermark = "Alt+K"       ; Toggle product/company watermark for official screenshots
-hotkey.wireframe = "Alt+W"                  ; Toggle wireframe mode
-hotkey.silhouettes = "Alt+S"                ; Toggle unit silhouettes
-hotkey.showsky = "Alt+Z"                    ; Toggle sky
-
-; > CAMERA SETTINGS
-hotkey.camera.reset = "R"                                   ; Reset camera rotation to default.
-hotkey.camera.follow = "F"                                  ; Follow the first unit in the selection
-hotkey.camera.zoom.in = Plus, Equals, NumPlus               ; Zoom camera in (continuous control)
-hotkey.camera.zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
-hotkey.camera.zoom.wheel.in = WheelUp                       ; Zoom camera in (stepped control)
-hotkey.camera.zoom.wheel.out = WheelDown                    ; Zoom camera out (stepped control)
-hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W"          ; Rotate camera to look upwards
-hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S"      ; Rotate camera to look downwards
-hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q     ; Rotate camera clockwise around terrain
-hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E   ; Rotate camera anticlockwise around terrain
-hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1    ; Rotate camera clockwise around terrain (stepped control)
-hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
-hotkey.camera.pan = MouseMiddle                             ; Enable scrolling by moving mouse
-hotkey.camera.left = A, LeftArrow                           ; Scroll or rotate left
-hotkey.camera.right = D, RightArrow                         ; Scroll or rotate right
-hotkey.camera.up = W, UpArrow                               ; Scroll or rotate up/forwards
-hotkey.camera.down = S, DownArrow                           ; Scroll or rotate down/backwards
-hotkey.camera.scroll.speed.increase = "Ctrl+Shift+S"        ; Increase scroll speed
-hotkey.camera.scroll.speed.decrease = "Ctrl+Alt+S"          ; Decrease scroll speed
-hotkey.camera.rotate.speed.increase = "Ctrl+Shift+R"        ; Increase rotation speed
-hotkey.camera.rotate.speed.decrease = "Ctrl+Alt+R"          ; Decrease rotation speed
-hotkey.camera.zoom.speed.increase = "Ctrl+Shift+Z"          ; Increase zoom speed
-hotkey.camera.zoom.speed.decrease = "Ctrl+Alt+Z"            ; Decrease zoom speed
-hotkey.camera.jump.1 = F5                                   ; Jump to position N
-hotkey.camera.jump.2 = F6
-hotkey.camera.jump.3 = F7
-hotkey.camera.jump.4 = F8
-;hotkey.camera.jump.5 =
-;hotkey.camera.jump.6 =
-;hotkey.camera.jump.7 =
-;hotkey.camera.jump.8 =
-;hotkey.camera.jump.9 =
-;hotkey.camera.jump.10 =
-hotkey.camera.jump.set.1 = "Ctrl+F5"                        ; Set jump position N
-hotkey.camera.jump.set.2 = "Ctrl+F6"
-hotkey.camera.jump.set.3 = "Ctrl+F7"
-hotkey.camera.jump.set.4 = "Ctrl+F8"
-;hotkey.camera.jump.set.5 =
-;hotkey.camera.jump.set.6 =
-;hotkey.camera.jump.set.7 =
-;hotkey.camera.jump.set.8 =
-;hotkey.camera.jump.set.9 =
-;hotkey.camera.jump.set.10 =
-
-; > CONSOLE SETTINGS
-hotkey.console.toggle = BackQuote, F9       ; Open/close console
+exit = "Alt+F4", "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
+pause = Pause                            ; Pause/unpause game
+screenshot = F2                          ; Take PNG screenshot
+bigscreenshot = "Shift+F2"               ; Take large BMP screenshot
+togglefullscreen = "Alt+Return"          ; Toggle fullscreen/windowed mode
+screenshot.watermark = "Alt+K"           ; Toggle product/company watermark for official screenshots
+wireframe = "Alt+W"                      ; Toggle wireframe mode
+silhouettes = "Alt+S"                    ; Toggle unit silhouettes
+showsky = "Alt+Z"                        ; Toggle sky

 ; > CLIPBOARD CONTROLS
-hotkey.copy = "Ctrl+C"              ; Copy to clipboard
-hotkey.paste = "Ctrl+V"             ; Paste from clipboard
-hotkey.cut = "Ctrl+X"               ; Cut selected text and copy to the clipboard
+copy = "Ctrl+C"                       ; Copy to clipboard
+paste = "Ctrl+V"                      ; Paste from clipboard
+cut = "Ctrl+X"                        ; Cut selected text and copy to the clipboard

-; > ENTITY SELECTION
-hotkey.selection.add = Shift                ; Add units to selection
-hotkey.selection.milonly = Alt              ; Add only military units to selection
-hotkey.selection.remove = Ctrl              ; Remove units from selection
-hotkey.selection.cancel = Esc               ; Un-select all units and cancel building placement 
-hotkey.selection.idleworker = Period        ; Select next idle worker
-hotkey.selection.idlewarrior = ForwardSlash ; Select next idle warrior
-hotkey.selection.offscreen = Alt            ; Include offscreen units in selection
-hotkey.selection.group.select.0 = 0
-hotkey.selection.group.save.0 = "Ctrl+0"
-hotkey.selection.group.add.0 = "Shift+0"
-hotkey.selection.group.select.1 = 1
-hotkey.selection.group.save.1 = "Ctrl+1"
-hotkey.selection.group.add.1 = "Shift+1"
-hotkey.selection.group.select.2 = 2
-hotkey.selection.group.save.2 = "Ctrl+2"
-hotkey.selection.group.add.2 = "Shift+2"
-hotkey.selection.group.select.3 = 3
-hotkey.selection.group.save.3 = "Ctrl+3"
-hotkey.selection.group.add.3 = "Shift+3"
-hotkey.selection.group.select.4 = 4
-hotkey.selection.group.save.4 = "Ctrl+4"
-hotkey.selection.group.add.4 = "Shift+4"
-hotkey.selection.group.select.5 = 5
-hotkey.selection.group.save.5 = "Ctrl+5"
-hotkey.selection.group.add.5 = "Shift+5"
-hotkey.selection.group.select.6 = 6
-hotkey.selection.group.save.6 = "Ctrl+6"
-hotkey.selection.group.add.6 = "Shift+6"
-hotkey.selection.group.select.7 = 7
-hotkey.selection.group.save.7 = "Ctrl+7"
-hotkey.selection.group.add.7 = "Shift+7"
-hotkey.selection.group.select.8 = 8
-hotkey.selection.group.save.8 = "Ctrl+8"
-hotkey.selection.group.add.8 = "Shift+8"
-hotkey.selection.group.select.9 = 9
-hotkey.selection.group.save.9 = "Ctrl+9"
-hotkey.selection.group.add.9 = "Shift+9"
-
-; > SESSION CONTROLS
-hotkey.session.kill = Delete                ; Destroy selected units
-hotkey.session.stop = "H"                   ; Stop the current action
-hotkey.session.attack = "Ctrl+Alt"          ; Modifier to force attack instead of another action
-hotkey.session.attackmove = Ctrl            ; Modifier to attackmove when clicking on a point
-hotkey.session.attackmoveUnit = "Ctrl+Q"    ; Modifier to attackmove targeting only units when clicking on a point (should contain the attackmove keys)
-hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building
-hotkey.session.autorallypoint = Ctrl        ; Modifier to set the rally point on the building itself
-hotkey.session.guard = "G"                  ; Modifier to escort/guard when clicking on unit/building
-hotkey.session.queue = Shift                ; Modifier to queue unit orders instead of replacing
-hotkey.session.batchtrain = Shift           ; Modifier to train units in batches
-hotkey.session.massbarter = Shift           ; Modifier to barter bunch of resources
-hotkey.session.masstribute = Shift          ; Modifier to tribute bunch of resources
-hotkey.session.fulltradeswap = Shift        ; Modifier to put the desired trade resource to 100%
-hotkey.session.unloadtype = Shift           ; Modifier to unload all units of type
-hotkey.session.deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
-hotkey.session.rotate.cw = RightBracket     ; Rotate building placement preview clockwise
-hotkey.session.rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise
-hotkey.timewarp.fastforward = Space         ; If timewarp mode enabled, speed up the game
-hotkey.timewarp.rewind = Backspace          ; If timewarp mode enabled, go back to earlier point in the game
-
-; > UNIT TRAINING
-hotkey.session.queueunit.1 = "Z"            ; add first unit type to queue
-hotkey.session.queueunit.2 = "X"            ; add second unit type to queue
-hotkey.session.queueunit.3 = "C"            ; add third unit type to queue
-hotkey.session.queueunit.4 = "V"            ; add fourth unit type to queue
-hotkey.session.queueunit.5 = "B"            ; add fivth unit type to queue
-hotkey.session.queueunit.6 = "N"            ; add sixth unit type to queue
-hotkey.session.queueunit.7 = "M"            ; add seventh unit type to queue
-hotkey.session.queueunit.8 = Comma          ; add eighth unit type to queue
+; > CONSOLE SETTINGS
+console.toggle = BackQuote, F9        ; Open/close console

 ; > OVERLAY KEYS
-hotkey.fps.toggle = "Alt+F"                  ; Toggle frame counter
-hotkey.realtime.toggle = "Alt+T"             ; Toggle current display of computer time
-hotkey.session.devcommands.toggle = "Alt+D"  ; Toggle developer commands panel
-hotkey.session.gui.toggle = "Alt+G"          ; Toggle visibility of session GUI
-hotkey.menu.toggle = "F10"                   ; Toggle in-game menu
-hotkey.timeelapsedcounter.toggle = "F12"     ; Toggle time elapsed counter
-hotkey.session.showstatusbars = Tab          ; Toggle display of status bars
-hotkey.session.highlightguarding = PgDn      ; Toggle highlight of guarding units
-hotkey.session.highlightguarded = PgUp       ; Toggle highlight of guarded units
+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

 ; > HOTKEYS ONLY
-hotkey.chat = Return                        ; Toggle chat window
-hotkey.teamchat = "T"                       ; Toggle chat window in team chat mode
-
-; > GUI TEXTBOX HOTKEYS
-hotkey.text.delete.left = "Ctrl+Backspace"    ; Delete word to the left of cursor
-hotkey.text.delete.right = "Ctrl+Del"         ; Delete word to the right of cursor
-hotkey.text.move.left = "Ctrl+LeftArrow"      ; Move cursor to start of word to the left of cursor
-hotkey.text.move.right = "Ctrl+RightArrow"    ; Move cursor to start of word to the right of cursor
-
-; > PROFILER
-hotkey.profile.toggle = "F11"               ; Enable/disable real-time profiler
-hotkey.profile.save = "Shift+F11"           ; Save current profiler data to logs/profile.txt
-hotkey.profile2.toggle = "Ctrl+F11"         ; Enable/disable HTTP/GPU modes for new profiler
-
-profiler2.autoenable = false                ; Enable HTTP server output at startup (default off for security/performance)
-profiler2.script.enable = false             ; Enable Javascript profiling. Needs to be set before startup and can't be changed later. (default off for performance)
-profiler2.gpu.arb.enable = true             ; Allow GL_ARB_timer_query timing mode when available
-profiler2.gpu.ext.enable = true             ; Allow GL_EXT_timer_query timing mode when available
-profiler2.gpu.intel.enable = true           ; Allow GL_INTEL_performance_queries timing mode when available
-
-; Developer options
-jsdebugger.enable = false                   ; Enable Javascript debugging. 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.
-tinygettext.debug = false                   ; Enable Tinygettext debugging information. If true, Tinygettext prints error messages each time that a translation for an English string is not found.
+chat = Return                         ; Toggle chat window
+teamchat = "T"                        ; Toggle chat window in team chat mode

 ; > QUICKSAVE
-hotkey.quicksave = "Shift+F5"
-hotkey.quickload = "Shift+F8"
+quicksave = "Shift+F5"
+quickload = "Shift+F8"

-; EXPERIMENTAL: joystick/gamepad settings
-joystick.enable = false
-joystick.deadzone = 8192
-joystick.camera.pan.x = 0
-joystick.camera.pan.y = 1
-joystick.camera.rotate.x = 3
-joystick.camera.rotate.y = 2
-joystick.camera.zoom.in = 5
-joystick.camera.zoom.out = 4
+[hotkey.camera]
+reset = "R"                                   ; Reset camera rotation to default.
+follow = "F"                                  ; Follow the first unit in the selection
+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)
+zoom.wheel.out = WheelDown                    ; Zoom camera out (stepped control)
+rotate.up = "Ctrl+UpArrow", "Ctrl+W"          ; Rotate camera to look upwards
+rotate.down = "Ctrl+DownArrow", "Ctrl+S"      ; Rotate camera to look downwards
+rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q     ; Rotate camera clockwise around terrain
+rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E   ; Rotate camera anticlockwise around terrain
+rotate.wheel.cw = "Shift+WheelUp", MouseX1    ; Rotate camera clockwise around terrain (stepped control)
+rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
+pan = MouseMiddle                             ; Enable scrolling by moving mouse
+left = A, LeftArrow                           ; Scroll or rotate left
+right = D, RightArrow                         ; Scroll or rotate right
+up = W, UpArrow                               ; Scroll or rotate up/forwards
+down = S, DownArrow                           ; Scroll or rotate down/backwards
+scroll.speed.increase = "Ctrl+Shift+S"        ; Increase scroll speed
+scroll.speed.decrease = "Ctrl+Alt+S"          ; Decrease scroll speed
+rotate.speed.increase = "Ctrl+Shift+R"        ; Increase rotation speed
+rotate.speed.decrease = "Ctrl+Alt+R"          ; Decrease rotation speed
+zoom.speed.increase = "Ctrl+Shift+Z"          ; Increase zoom speed
+zoom.speed.decrease = "Ctrl+Alt+Z"            ; Decrease zoom speed

-; SESSION GUI SETTINGS
-gui.session.timeelapsedcounter = false          ; Show the game duration in the top right corner
-gui.session.attacknotificationmessage = true    ; Show attack notification messages
-gui.session.minimap.pingduration = 50.0         ; The duration for which an entity will be pinged after an attack notification
-gui.session.minimap.blinkduration = 1.7         ; The blink duration while pinging
+[hotkey.camera.jump]
+1 = F5                       ; Jump to position N
+2 = F6
+3 = F7
+4 = F8
+;5 =
+;6 =
+;7 =
+;8 =
+;9 =
+;10 =
+[hotkey.camera.jump.set]
+1 = "Ctrl+F5"                ; Set jump position N
+2 = "Ctrl+F6"
+3 = "Ctrl+F7"
+4 = "Ctrl+F8"
+;5 =
+;6 =
+;7 =
+;8 =
+;9 =
+;10 =

-; GENERAL GUI SETTINGS
-gui.cursorblinkrate = 0.5          ; Cursor blink rate in seconds (0.0 to disable blinking)
+[hotkey.profile]
+toggle = "F11"               ; Enable/disable real-time profiler
+save = "Shift+F11"           ; Save current profiler data to logs/profile.txt
+[hotkey.profile2]
+toggle = "Ctrl+F11"          ; Enable/disable HTTP/GPU modes for new profiler

-; Multiplayer lobby preferences
-lobby.server = "lobby.wildfiregames.com"  ; Address of lobby server
-lobby.xpartamupp = "wfgbot17"             ; Name of the server-side xmpp client that manage games
-lobby.chattimestamp = false               ; Show time chat message was posted
-lobby.room = "arena17"                    ; Default MUC room to join
-lobby.history = 0                         ; Number of past messages to display on join
+[hotkey.selection]
+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 
+idleworker = Period          ; Select next idle worker
+idlewarrior = ForwardSlash   ; Select next idle warrior
+offscreen = Alt              ; Include offscreen units in selection
+[hotkey.selection.group.add]
+0 = "Shift+0"
+1 = "Shift+1"
+2 = "Shift+2"
+3 = "Shift+3"
+4 = "Shift+4"
+5 = "Shift+5"
+6 = "Shift+6"
+7 = "Shift+7"
+8 = "Shift+8"
+9 = "Shift+9"
+[hotkey.selection.group.save]
+0 = "Ctrl+0"
+1 = "Ctrl+1"
+2 = "Ctrl+2"
+3 = "Ctrl+3"
+4 = "Ctrl+4"
+5 = "Ctrl+5"
+6 = "Ctrl+6"
+7 = "Ctrl+7"
+8 = "Ctrl+8"
+9 = "Ctrl+9"
+[hotkey.selection.group.select]
+0 = 0
+1 = 1
+2 = 2
+3 = 3
+4 = 4
+5 = 5
+6 = 6
+7 = 7
+8 = 8
+9 = 9

-; Overlay Preferences
-overlay.fps = "false"                     ; Show frames per second in top right corner
-overlay.realtime = "false"                ; Show current system time in top right corner
+[hotkey.session]
+kill = Delete                ; Destroy selected units
+stop = "H"                   ; Stop the current action
+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
+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
+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

-; MOD SETTINGS
-mod.enabledmods = "mod public"
+[hotkey.session.savedgames]
+delete = Delete               ; Delete the selected saved game asking confirmation
+noConfirmation = Shift        ; Do not ask confirmation when deleting a game
+
+[hotkey.session.queueunit]   ; > UNIT TRAINING
+1 = "Z"            ; add first unit type to queue
+2 = "X"            ; add second unit type to queue
+3 = "C"            ; add third unit type to queue
+4 = "V"            ; add fourth unit type to queue
+5 = "B"            ; add fivth unit type to queue
+6 = "N"            ; add sixth unit type to queue
+7 = "M"            ; add seventh unit type to queue
+8 = Comma          ; add eighth unit type to queue
+
+[hotkey.session.timewarp]
+fastforward = Space               ; If timewarp mode enabled, speed up the game
+rewind = Backspace                ; If timewarp mode enabled, go back to earlier point in the game
+
+[hotkey.text]    ; > GUI TEXTBOX HOTKEYS
+delete.left = "Ctrl+Backspace"    ; Delete word to the left of cursor
+delete.right = "Ctrl+Del"         ; Delete word to the right of cursor
+move.left = "Ctrl+LeftArrow"      ; Move cursor to start of word to the left of cursor
+move.right = "Ctrl+RightArrow"    ; Move cursor to start of word to the right of cursor
+
+[gui]
+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.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
+
+[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
+
+[joystick]        ; EXPERIMENTAL: joystick/gamepad settings
+enable = false
+deadzone = 8192
+[joystick.camera]
+pan.x = 0
+pan.y = 1
+rotate.x = 3
+rotate.y = 2
+zoom.in = 5
+zoom.out = 4
+
+[lobby]
+chattimestamp = false               ; Show time chat message was posted
+history = 0                         ; Number of past messages to display on join
+room = "arena20"                    ; Default MUC room to join
+server = "lobby.wildfiregames.com"  ; Address of lobby server
+xpartamupp = "wfgbot20"             ; Name of the server-side xmpp client that manage games
+
+[mod]
+enabledmods = "mod public"
+
+[network]
+duplicateplayernames = false      ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
+lateobserverjoins = false         ; Allow observers to join the game after it started
+observerlimit = 6                 ; 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
+
+[sound]
+mastergain = 0.9
+musicgain = 0.2
+ambientgain = 0.6
+actiongain = 0.7
+uigain = 0.7
+
+[tinygettext]
+debug = false                     ; Print error messages each time a translation for an English string is not found.
+
+[userreport] ; Opt-in online user reporting system
+url = "http://feedback.wildfiregames.com/report/upload/v1/"
+
+[view] ; Camera control settings
+scroll.speed = 120.0
+scroll.speed.modifier = 1.05      ; Multiplier for changing scroll speed
+rotate.x.speed = 1.2
+rotate.x.min = 28.0
+rotate.x.max = 60.0
+rotate.x.default = 35.0
+rotate.y.speed = 2.0
+rotate.y.speed.wheel = 0.45
+rotate.y.default = 0.0
+rotate.speed.modifier = 1.05      ; Multiplier for changing rotation speed
+drag.speed = 0.5
+zoom.speed = 256.0
+zoom.speed.wheel = 32.0
+zoom.min = 50.0
+zoom.max = 200.0
+zoom.default = 120.0
+zoom.speed.modifier = 1.05        ; Multiplier for changing zoom speed
+pos.smoothness = 0.1
+zoom.smoothness = 0.4
+rotate.x.smoothness = 0.5
+rotate.y.smoothness = 0.3
+near = 2.0                        ; Near plane distance
+far = 4096.0                      ; Far plane distance
+fov = 45.0                        ; Field of view (degrees), lower is narrow, higher is wide
+height.smoothness = 0.5
+height.min = 16
@@ -12,6 +12,7 @@
 					"excludeMasks": ["third_party/**", "tools/**"]
 				},
 				"options": {
+					"format": "c-format",
 					"keywords": {
 						"Translate": [1],
 						"TranslatePlural": [1, 2],
@@ -9,7 +9,7 @@ uniform float shininess;		// Blinn-Phong specular strength
 uniform float specularStrength;	// Scaling for specular reflection (specular color is (this,this,this))
 uniform float waviness;			// "Wildness" of the reflections and refractions; choose based on texture
 uniform vec3 tint;				// Tint for refraction (used to simulate particles in water)
-uniform float murkiness;		// Amount of tint to blend in with the refracted colour
+uniform float murkiness;		// Amount of tint to blend in with the refracted color
 uniform float fullDepth;		// Depth at which to use full murkiness (shallower water will be clearer)
 uniform vec3 reflectionTint;	// Tint for reflection (used for really muddy water)
 uniform float reflectionTintStrength;	// Strength of reflection tint (how much of it to mix in)
@@ -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;
@@ -1,78 +1,78 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<element name="Textures" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <a:documentation/>
-  <!--
-    NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
-      and use a converter tool like trang to generate the Relax NG XML (.rng) file
-  -->
-  <a:documentation/>
-  <zeroOrMore>
-    <element name="File">
-      <interleave>
-        <optional>
-          <attribute name="pattern"/>
-        </optional>
-        <optional>
-          <attribute name="format">
-            <choice>
-              <value>dxt1</value>
-              <value>dxt3</value>
-              <value>dxt5</value>
-              <value>rgba</value>
-              <value>alpha</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="mipmap">
-            <choice>
-              <value>true</value>
-              <value>false</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="normal">
-            <choice>
-              <value>true</value>
-              <value>false</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="alpha">
-            <choice>
-              <value>none</value>
-              <value>player</value>
-              <value>transparency</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="filter">
-            <choice>
-              <value>box</value>
-              <value>triangle</value>
-              <value>kaiser</value>
-            </choice>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="kaiserwidth">
-            <data type="float"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="kaiseralpha">
-            <data type="float"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="kaiserstretch">
-            <data type="float"/>
-          </attribute>
-        </optional>
-      </interleave>
-    </element>
-  </zeroOrMore>
-</element>
+<?xml version="1.0" encoding="UTF-8"?>
+<element name="Textures" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <a:documentation/>
+  <!--
+    NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
+      and use a converter tool like trang to generate the Relax NG XML (.rng) file
+  -->
+  <a:documentation/>
+  <zeroOrMore>
+    <element name="File">
+      <interleave>
+        <optional>
+          <attribute name="pattern"/>
+        </optional>
+        <optional>
+          <attribute name="format">
+            <choice>
+              <value>dxt1</value>
+              <value>dxt3</value>
+              <value>dxt5</value>
+              <value>rgba</value>
+              <value>alpha</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="mipmap">
+            <choice>
+              <value>true</value>
+              <value>false</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="normal">
+            <choice>
+              <value>true</value>
+              <value>false</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="alpha">
+            <choice>
+              <value>none</value>
+              <value>player</value>
+              <value>transparency</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="filter">
+            <choice>
+              <value>box</value>
+              <value>triangle</value>
+              <value>kaiser</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="kaiserwidth">
+            <data type="float"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="kaiseralpha">
+            <data type="float"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="kaiserstretch">
+            <data type="float"/>
+          </attribute>
+        </optional>
+      </interleave>
+    </element>
+  </zeroOrMore>
+</element>
@@ -1,135 +1,135 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <define name="flag">
-    <a:documentation/>
-    <!--
-      NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
-        and use a converter tool like trang to generate the Relax NG XML (.rng) file
-    -->
-    <a:documentation/>
-    <a:documentation/>
-    <!-- Types # -->
-    <a:documentation/>
-    <choice>
-      <value>0</value>
-      <value>1</value>
-    </choice>
-  </define>
-  <start>
-    <ref name="SoundGroup"/>
-  </start>
-  <define name="SoundGroup">
-    <element name="SoundGroup">
-      <interleave>
-        <optional>
-          <element name="Gain">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="Looping">
-            <ref name="flag"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="Omnipresent">
-            <ref name="flag"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="HeardBy">
-            <value>owner</value>
-          </element>
-        </optional>
-        <optional>
-          <element name="Distanceless">
-            <ref name="flag"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="Pitch">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="Priority">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="RandOrder">
-            <ref name="flag"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="RandGain">
-            <ref name="flag"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="GainUpper">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="GainLower">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="RandPitch">
-            <ref name="flag"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="PitchUpper">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="PitchLower">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="ConeGain">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="ConeInner">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="ConeOuter">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="Replacement">
-            <text/>
-          </element>
-        </optional>
-        <optional>
-          <element name="Threshold">
-            <data type="float"/>
-          </element>
-        </optional>
-        <optional>
-          <element name="Decay">
-            <data type="float"/>
-          </element>
-        </optional>
-        <oneOrMore>
-          <element name="Sound">
-            <text/>
-          </element>
-        </oneOrMore>
-        <element name="Path">
-          <text/>
-        </element>
-      </interleave>
-    </element>
-  </define>
-</grammar>
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="flag">
+    <a:documentation/>
+    <!--
+      NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
+        and use a converter tool like trang to generate the Relax NG XML (.rng) file
+    -->
+    <a:documentation/>
+    <a:documentation/>
+    <!-- Types # -->
+    <a:documentation/>
+    <choice>
+      <value>0</value>
+      <value>1</value>
+    </choice>
+  </define>
+  <start>
+    <ref name="SoundGroup"/>
+  </start>
+  <define name="SoundGroup">
+    <element name="SoundGroup">
+      <interleave>
+        <optional>
+          <element name="Gain">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Looping">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Omnipresent">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="HeardBy">
+            <value>owner</value>
+          </element>
+        </optional>
+        <optional>
+          <element name="Distanceless">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Pitch">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Priority">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="RandOrder">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="RandGain">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="GainUpper">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="GainLower">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="RandPitch">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="PitchUpper">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="PitchLower">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="ConeGain">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="ConeInner">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="ConeOuter">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Replacement">
+            <text/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Threshold">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Decay">
+            <data type="float"/>
+          </element>
+        </optional>
+        <oneOrMore>
+          <element name="Sound">
+            <text/>
+          </element>
+        </oneOrMore>
+        <element name="Path">
+          <text/>
+        </element>
+      </interleave>
+    </element>
+  </define>
+</grammar>
@@ -208,11 +208,22 @@ 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
+	};
+}
 	
@@ -1,183 +1,226 @@
 /**
-sprintf() for JavaScript 0.7-beta1
-http://www.diveintojavascript.com/projects/javascript-sprintf
+sprintf() for JavaScript v1.0.2
+https://github.com/alexei/sprintf.js

-Copyright (c) Alexandru Marasteanu <alexaholic [at) gmail (dot] com>
+Copyright (c) 2007-2013, Alexandru Marasteanu <hello [at) alexei (dot] ro>
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of sprintf() for JavaScript nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
+* Redistributions of source code must retain the above copyright
+  notice, this list of conditions and the following disclaimer.
+* Redistributions in binary form must reproduce the above copyright
+  notice, this list of conditions and the following disclaimer in the
+  documentation and/or other materials provided with the distribution.
+* Neither the name of this software nor the names of its contributors may be
+  used to endorse or promote products derived from this software without
+  specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL Alexandru Marasteanu BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

-
-Changelog:
-2010.09.06 - 0.7-beta1
-  - features: vsprintf, support for named placeholders
-  - enhancements: format cache, reduced global namespace pollution
-
-2010.05.22 - 0.6:
- - reverted to 0.4 and fixed the bug regarding the sign of the number 0
- Note:
- Thanks to Raphael Pigulla <raph (at] n3rd [dot) org> (http://www.n3rd.org/)
- who warned me about a bug in 0.5, I discovered that the last update was
- a regress. I appologize for that.
-
-2010.05.09 - 0.5:
- - bug fix: 0 is now preceeded with a + sign
- - bug fix: the sign was not at the right position on padded results (Kamal Abdali)
- - switched from GPL to BSD license
-
-2007.10.21 - 0.4:
- - unit test and patch (David Baird)
-
-2007.09.17 - 0.3:
- - bug fix: no longer throws exception on empty paramenters (Hans Pufal)
-
-2007.09.11 - 0.2:
- - feature: added argument swapping
-
-2007.04.03 - 0.1:
- - initial release
 **/

-var sprintf = (function() {
-	function get_type(variable) {
-		return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase();
-	}
-	function str_repeat(input, multiplier) {
-		for (var output = []; multiplier > 0; output[--multiplier] = input) {/* do nothing */}
-		return output.join('');
-	}
+(function(window) {
+    var re = {
+        not_string: /[^s]/,
+        number: /[dief]/,
+        text: /^[^\x25]+/,
+        modulo: /^\x25{2}/,
+        placeholder: /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fiosuxX])/,
+        key: /^([a-z_][a-z_\d]*)/i,
+        key_access: /^\.([a-z_][a-z_\d]*)/i,
+        index_access: /^\[(\d+)\]/,
+        sign: /^[\+\-]/
+    }

-	var str_format = function() {
-		if (!str_format.cache.hasOwnProperty(arguments[0])) {
-			str_format.cache[arguments[0]] = str_format.parse(arguments[0]);
-		}
-		return str_format.format.call(null, str_format.cache[arguments[0]], arguments);
-	};
+    function sprintf() {
+        var key = arguments[0], cache = sprintf.cache
+        if (!(cache[key] && cache.hasOwnProperty(key))) {
+            cache[key] = sprintf.parse(key)
+        }
+        return sprintf.format.call(null, cache[key], arguments)
+    }

-	str_format.format = function(parse_tree, argv) {
-		var cursor = 1, tree_length = parse_tree.length, node_type = '', arg, output = [], i, k, match, pad, pad_character, pad_length;
-		for (i = 0; i < tree_length; i++) {
-			node_type = get_type(parse_tree[i]);
-			if (node_type === 'string') {
-				output.push(parse_tree[i]);
-			}
-			else if (node_type === 'array') {
-				match = parse_tree[i]; // convenience purposes only
-				if (match[2]) { // keyword argument
-					arg = argv[cursor];
-					for (k = 0; k < match[2].length; k++) {
-						if (!arg.hasOwnProperty(match[2][k])) {
-							throw(new Error('[sprintf] property "' + match[2][k] + '" does not exist.'));
-						}
-						arg = arg[match[2][k]];
-					}
-				}
-				else if (match[1]) { // positional argument (explicit)
-					arg = argv[match[1]];
-				}
-				else { // positional argument (implicit)
-					arg = argv[cursor++];
-				}
+    sprintf.format = function(parse_tree, argv) {
+        var cursor = 1, tree_length = parse_tree.length, node_type = "", arg, output = [], i, k, match, pad, pad_character, pad_length, is_positive = true, sign = ""
+        for (i = 0; i < tree_length; i++) {
+            node_type = get_type(parse_tree[i])
+            if (node_type === "string") {
+                output[output.length] = parse_tree[i]
+            }
+            else if (node_type === "array") {
+                match = parse_tree[i] // convenience purposes only
+                if (match[2]) { // keyword argument
+                    arg = argv[cursor]
+                    for (k = 0; k < match[2].length; k++) {
+                        if (!arg.hasOwnProperty(match[2][k])) {
+                            throw new Error(sprintf("[sprintf] property '%s' does not exist", match[2][k]))
+                        }
+                        arg = arg[match[2][k]]
+                    }
+                }
+                else if (match[1]) { // positional argument (explicit)
+                    arg = argv[match[1]]
+                }
+                else { // positional argument (implicit)
+                    arg = argv[cursor++]
+                }

-				if (/[^s]/.test(match[8]) && (get_type(arg) != 'number')) {
-					throw(new Error('[sprintf] expecting number but found ' + get_type(arg) + '.'));
-				}
-				switch (match[8]) {
-					case 'b': arg = arg.toString(2); break;
-					case 'c': arg = String.fromCharCode(arg); break;
-					case 'd': arg = parseInt(arg, 10); break;
-					case 'e': arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential(); break;
-					case 'f': arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg); break;
-					case 'o': arg = arg.toString(8); break;
-					case 's': arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg); break;
-					case 'u': arg = Math.abs(arg); break;
-					case 'x': arg = arg.toString(16); break;
-					case 'X': arg = arg.toString(16).toUpperCase(); break;
-				}
-				arg = (/[def]/.test(match[8]) && match[3] && arg >= 0 ? '+'+ arg : arg);
-				pad_character = match[4] ? match[4] == '0' ? '0' : match[4].charAt(1) : ' ';
-				pad_length = match[6] - String(arg).length;
-				pad = match[6] ? str_repeat(pad_character, pad_length) : '';
-				output.push(match[5] ? arg + pad : pad + arg);
-			}
-		}
-		return output.join('');
-	};
+                if (get_type(arg) == "function") {
+                    arg = arg()
+                }

-	str_format.cache = {};
+                if (re.not_string.test(match[8]) && (get_type(arg) != "number" && isNaN(arg))) {
+                    throw new TypeError(sprintf("[sprintf] expecting number but found %s", get_type(arg)))
+                }

-	str_format.parse = function(fmt) {
-		var _fmt = fmt, match = [], parse_tree = [], arg_names = 0;
-		while (_fmt) {
-			if ((match = /^[^\x25]+/.exec(_fmt)) !== null) {
-				parse_tree.push(match[0]);
-			}
-			else if ((match = /^\x25{2}/.exec(_fmt)) !== null) {
-				parse_tree.push('%');
-			}
-			else if ((match = /^\x25(?:([1-9]\d*)\$|\(([^\)]+)\))?(\+)?(0|'[^$])?(-)?(\d+)?(?:\.(\d+))?([b-fosuxX])/.exec(_fmt)) !== null) {
-				if (match[2]) {
-					arg_names |= 1;
-					var field_list = [], replacement_field = match[2], field_match = [];
-					if ((field_match = /^([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
-						field_list.push(field_match[1]);
-						while ((replacement_field = replacement_field.substring(field_match[0].length)) !== '') {
-							if ((field_match = /^\.([a-z_][a-z_\d]*)/i.exec(replacement_field)) !== null) {
-								field_list.push(field_match[1]);
-							}
-							else if ((field_match = /^\[(\d+)\]/.exec(replacement_field)) !== null) {
-								field_list.push(field_match[1]);
-							}
-							else {
-								throw(new Error('[sprintf] huh?'));
-							}
-						}
-					}
-					else {
-						throw(new Error('[sprintf] huh?'));
-					}
-					match[2] = field_list;
-				}
-				else {
-					arg_names |= 2;
-				}
-				if (arg_names === 3) {
-					throw(new Error('[sprintf] mixing positional and named placeholders is not (yet) supported'));
-				}
-				parse_tree.push(match);
-			}
-			else {
-				throw(new Error('[sprintf] No placeholder found in the ‘' + _fmt + '’ format string. Maybe you used an incorrect syntax for your placeholder?'));
-			}
-			_fmt = _fmt.substring(match[0].length);
-		}
-		return parse_tree;
-	};
+                if (re.number.test(match[8])) {
+                    is_positive = arg >= 0
+                }

-	return str_format;
-})();
+                switch (match[8]) {
+                    case "b":
+                        arg = arg.toString(2)
+                    break
+                    case "c":
+                        arg = String.fromCharCode(arg)
+                    break
+                    case "d":
+                    case "i":
+                        arg = parseInt(arg, 10)
+                    break
+                    case "e":
+                        arg = match[7] ? arg.toExponential(match[7]) : arg.toExponential()
+                    break
+                    case "f":
+                        arg = match[7] ? parseFloat(arg).toFixed(match[7]) : parseFloat(arg)
+                    break
+                    case "o":
+                        arg = arg.toString(8)
+                    break
+                    case "s":
+                        arg = ((arg = String(arg)) && match[7] ? arg.substring(0, match[7]) : arg)
+                    break
+                    case "u":
+                        arg = arg >>> 0
+                    break
+                    case "x":
+                        arg = arg.toString(16)
+                    break
+                    case "X":
+                        arg = arg.toString(16).toUpperCase()
+                    break
+                }
+                if (re.number.test(match[8]) && (!is_positive || match[3])) {
+                    sign = is_positive ? "+" : "-"
+                    arg = arg.toString().replace(re.sign, "")
+                }
+                else {
+                    sign = ""
+                }
+                pad_character = match[4] ? match[4] === "0" ? "0" : match[4].charAt(1) : " "
+                pad_length = match[6] - (sign + arg).length
+                pad = match[6] ? (pad_length > 0 ? str_repeat(pad_character, pad_length) : "") : ""
+                output[output.length] = match[5] ? sign + arg + pad : (pad_character === "0" ? sign + pad + arg : pad + sign + arg)
+            }
+        }
+        return output.join("")
+    }

-var vsprintf = function(fmt, argv) {
-	argv.unshift(fmt);
-	return sprintf.apply(null, argv);
-};
+    sprintf.cache = {}
+
+    sprintf.parse = function(fmt) {
+        var _fmt = fmt, match = [], parse_tree = [], arg_names = 0
+        while (_fmt) {
+            if ((match = re.text.exec(_fmt)) !== null) {
+                parse_tree[parse_tree.length] = match[0]
+            }
+            else if ((match = re.modulo.exec(_fmt)) !== null) {
+                parse_tree[parse_tree.length] = "%"
+            }
+            else if ((match = re.placeholder.exec(_fmt)) !== null) {
+                if (match[2]) {
+                    arg_names |= 1
+                    var field_list = [], replacement_field = match[2], field_match = []
+                    if ((field_match = re.key.exec(replacement_field)) !== null) {
+                        field_list[field_list.length] = field_match[1]
+                        while ((replacement_field = replacement_field.substring(field_match[0].length)) !== "") {
+                            if ((field_match = re.key_access.exec(replacement_field)) !== null) {
+                                field_list[field_list.length] = field_match[1]
+                            }
+                            else if ((field_match = re.index_access.exec(replacement_field)) !== null) {
+                                field_list[field_list.length] = field_match[1]
+                            }
+                            else {
+                                throw new SyntaxError("[sprintf] failed to parse named argument key")
+                            }
+                        }
+                    }
+                    else {
+                        throw new SyntaxError("[sprintf] failed to parse named argument key")
+                    }
+                    match[2] = field_list
+                }
+                else {
+                    arg_names |= 2
+                }
+                if (arg_names === 3) {
+                    throw new Error("[sprintf] mixing positional and named placeholders is not (yet) supported")
+                }
+                parse_tree[parse_tree.length] = match
+            }
+            else {
+                throw new SyntaxError("[sprintf] unexpected placeholder")
+            }
+            _fmt = _fmt.substring(match[0].length)
+        }
+        return parse_tree
+    }
+
+    var vsprintf = function(fmt, argv, _argv) {
+        _argv = (argv || []).slice(0)
+        _argv.splice(0, 0, fmt)
+        return sprintf.apply(null, _argv)
+    }
+
+    /**
+     * helpers
+     */
+    function get_type(variable) {
+        return Object.prototype.toString.call(variable).slice(8, -1).toLowerCase()
+    }
+
+    function str_repeat(input, multiplier) {
+        return Array(multiplier + 1).join(input)
+    }
+
+    /**
+     * export to either browser or node.js
+     */
+    if (typeof exports !== "undefined") {
+        exports.sprintf = sprintf
+        exports.vsprintf = vsprintf
+    }
+    else {
+        window.sprintf = sprintf
+        window.vsprintf = vsprintf
+
+        if (typeof define === "function" && define.amd) {
+            define(function() {
+                return {
+                    sprintf: sprintf,
+                    vsprintf: vsprintf
+                }
+            })
+        }
+    }
+})(typeof window === "undefined" ? this : window);
@@ -1,177 +0,0 @@
-/*
-	DESCRIPTION	: Functions to manipulate objects with a 'list' property
-			  (used to handle the items in list, dropdown, etc.)
-	NOTES		: To ensure the selection is properly updated, it is important to
-			  use these functions and not manually access the list.
-*/
-
-// ====================================================================
-
-// Remove the item at the given index (pos) from the given list object (objectName).
-function removeItem(objectName, pos)
-{
-	if (Engine.GetGUIObjectByName(objectName) == null)
-	{
-		warn("removeItem(): " + objectName + " not found.");
-		return;
-	}
-
-	var list = Engine.GetGUIObjectByName(objectName).list;
-	var selected = Engine.GetGUIObjectByName(objectName).selected;
-
-	list.splice(pos, 1);
-
-	Engine.GetGUIObjectByName(objectName).list = list;
-
-	// It's important that we update the selection *after*
-	//  we've committed the changes to the list.
-
-	// Update the selected so the same element remains selected.
-	if (selected == pos)
-		Engine.GetGUIObjectByName(objectName).selected = -1;
-	else if (selected > pos)
-		Engine.GetGUIObjectByName(objectName).selected = selected - 1;
-}
-
-// ====================================================================
-
-// Add the item at the given index (pos) to the given list object (objectName) with the given value (value).
-function addItem(objectName, pos, value)
-{
-	if (Engine.GetGUIObjectByName(objectName) == null)
-	{
-		warn("addItem(): " + objectName + " not found.");
-		return;
-	}
-
-	var list = Engine.GetGUIObjectByName(objectName).list;
-	var selected = Engine.GetGUIObjectByName(objectName).selected;
-
-	list.splice(pos, 0, value);
-
-	Engine.GetGUIObjectByName(objectName).list = list;
-
-	// It's important that we update the selection *after*
-	//  we've committed the changes to the list.
-
-	// Update the selected so the same element remains selected.
-	if (selected >= pos)
-		Engine.GetGUIObjectByName(objectName).selected = selected + 1;
-}
-
-// ====================================================================
-
-// Adds an element to the end of the list
-function pushItem(objectName, value)
-{
-	if (Engine.GetGUIObjectByName(objectName) == null)
-	{
-		warn("pushItem(): " + objectName + " not found.");
-		return;
-	}
-
-	var list = Engine.GetGUIObjectByName(objectName).list;
-	list.push(value);
-	Engine.GetGUIObjectByName(objectName).list = list;
-	// Point to the new item.
-	Engine.GetGUIObjectByName(objectName).selected = getNumItems(objectName)-1;
-}
-
-// ====================================================================
-
-// Removes the last element
-function popItem(objectName)
-{
-	if (Engine.GetGUIObjectByName(objectName) == null)
-	{
-		warn("popItem(): " + objectName + " not found.");
-		return;
-	}
-
-	var selected = Engine.GetGUIObjectByName(objectName).selected;
-	removeItem(objectName, getNumItems(objectName)-1);
-
-	if (selected == getNumItems(objectName)-1)
-		Engine.GetGUIObjectByName(objectName).selected = -1;
-}
-
-// ====================================================================
-
-// Retrieves the number of elements in the list
-function getNumItems(objectName)
-{
-	if (Engine.GetGUIObjectByName(objectName) == null)
-	{
-		warn("getNumItems(): " + objectName + " not found.");
-		return 0;
-	}
-
-	var list = Engine.GetGUIObjectByName(objectName).list;
-	return list.length;
-}
-
-// ====================================================================
-
-// Retrieves the value of the item at 'pos'
-function getItemValue(objectName, pos)
-{
-	if (Engine.GetGUIObjectByName(objectName) == null)
-	{
-		warn("getItemValue(): " + objectName + " not found.");
-		return "";
-	}
-
-	var list = Engine.GetGUIObjectByName(objectName).list;
-	return list[pos];
-}
-
-// ====================================================================
-
-// Retrieves the value of the currently selected item
-function getCurrItemValue(objectName)
-{
-	if (Engine.GetGUIObjectByName(objectName) == null)
-	{
-		warn("getCurrItemValue(): " + objectName + " not found.");
-		return "";
-	}
-
-	if (Engine.GetGUIObjectByName(objectName).selected == -1)
-		return "";
-	var list = Engine.GetGUIObjectByName(objectName).list;
-	return list[Engine.GetGUIObjectByName(objectName).selected];
-}
-
-// ====================================================================
-
-// Sets current item to a given string (which must be one of those
-// already in the list).
-function setCurrItemValue(objectName, string)
-{
-	if (Engine.GetGUIObjectByName(objectName) == null)
-	{
-		warn("setCurrItemValue(): " + objectName + " not found.");
-		return -1;
-	}
-
-	if (Engine.GetGUIObjectByName(objectName).selected == -1)
-		return -1;	// Return -1 if nothing selected.
-	var list = Engine.GetGUIObjectByName(objectName).list;
-	// Seek through list.
-	for (var ctr = 0; ctr < list.length; ctr++)
-	{
-		// If we have found the string in the list,
-		if (list[ctr] == string)
-		{
-			// Point selected to this item.
-			Engine.GetGUIObjectByName(objectName).selected = ctr;
-			return ctr;	// Return position of item.
-		}
-	}
-
-	// Return -2 if failed to find value in list.
-	warn("Requested string '" + string + "' not found in " + objectName + "'s list.");
-	return -2;
-}
-
-// ====================================================================
@@ -27,8 +27,8 @@
 			font="sans-14"
 			maxwidth="300"
 			offset="16 32"
-			sprite="colour:255 255 255"
-			textcolor="0 0 0"
+			sprite="BlackBorderOnGray"
+			textcolor="255 255 255"
 	/>
 	<!--
 	==========================================
@@ -555,6 +555,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 +729,27 @@
 			size="0 6 16 22"
 		/>
 	</sprite>
+	<sprite name = "ModernNotSorted">
+		<image texture = "global/modern/arrow-up-down.png"
+			real_texture_placement = "0 0 16 16"
+			texture_size="0 0 16 16"
+			size="0 6 16 22"
+		/>
+	</sprite>
+	<sprite name = "ModernArrowUp">
+		<image texture = "global/modern/arrow-up.png"
+			real_texture_placement = "0 0 16 16"
+			texture_size="0 0 16 16"
+			size="0 6 16 22"
+		/>
+	</sprite>
+	<sprite name = "ModernArrowDown">
+		<image texture = "global/modern/arrow-down.png"
+			real_texture_placement = "0 0 16 16"
+			texture_size="0 0 16 16"
+			size="0 6 16 22"
+		/>
+	</sprite>
 	<sprite name = "ModernDropDownArrowHighlight">
 		<image texture = "global/modern/dropdown-arrow.png"
 			real_texture_placement = "0 0 16 16"
@@ -121,7 +121,7 @@
 	/>
 	<style name="ModernInput"
 		sprite="ModernDarkBoxWhite"
-		sprite_selectarea="colour:150 0 0"
+		sprite_selectarea="color:150 0 0"
 		textcolor="white"
 		textcolor_selected="white"
 	/>
@@ -148,9 +148,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"
@@ -15,7 +15,7 @@ bool = "true" | "false"
 align = "left" | "center" | "right"
 valign = "top" | "center" | "bottom"
 wrapmode = "repeat" | "mirrored_repeat" | "clamp_to_edge"
-coord = xsd:string { pattern = "-?\d*\.?\d+(%([\+\-]\d*\.?\d+)?)?" }
+coord = xsd:string { pattern = "-?\d*\.?\d+%?([\+\-]\d*\.?\d+%?)*" }
 clientarea = list { coord, coord, coord, coord }
 # color can be a name or "R G B A" format string
 rgba = list { xsd:integer { minInclusive = "0" maxInclusive = "255" },
@@ -52,6 +52,8 @@ ex_settings =
  attribute button_width { xsd:decimal }?&
  attribute checked { bool }?&
  attribute clip { bool }?&
+  attribute default_column { text }?&
+  attribute default_column_order { text }?&
  attribute dropdown_size { xsd:decimal }?&
  attribute dropdown_buffer { xsd:decimal }?&
  attribute enabled { bool }?&
@@ -70,6 +72,7 @@ ex_settings =
  attribute scrollbar { bool }?&
  attribute scrollbar_style { text }?&
  attribute scroll_bottom { bool }?&
+  attribute sortable { bool }?&
  attribute sound_closed { text }?&
  attribute sound_disabled { text }?&
  attribute sound_enter { text }?&
@@ -79,12 +82,15 @@ ex_settings =
  attribute sound_selected { text }?&
  attribute sprite { text }?&
  attribute sprite2 { text }?&
+  attribute sprite_asc { text }?&
  attribute sprite_heading { text }?&
  attribute sprite_bar { text }?&
  attribute sprite_background { text }?&
+  attribute sprite_desc { text }?&
  attribute sprite_disabled { text }?&
  attribute sprite_list { text }?&
  attribute sprite2_disabled { text }?&
+  attribute sprite_not_sorted { text }?&
  attribute sprite_over { text }?&
  attribute sprite2_over { text }?&
  attribute sprite_pressed { text }?&
@@ -161,7 +167,8 @@ keep = element keep { text }
 repeat =
  element repeat {
    object+,
-    attribute count { text }
+    attribute count { xsd:nonNegativeInteger },
+    attribute var { text }?
  }
 translate = element translate { text }
 translatableAttribute =
@@ -51,7 +51,7 @@
  </define>
  <define name="coord">
    <data type="string">
-      <param name="pattern">-?\d*\.?\d+(%([\+\-]\d*\.?\d+)?)?</param>
+      <param name="pattern">-?\d*\.?\d+%?([\+\-]\d*\.?\d+%?)*</param>
    </data>
  </define>
  <define name="clientarea">
@@ -199,6 +199,12 @@
          <ref name="bool"/>
        </attribute>
      </optional>
+      <optional>
+        <attribute name="default_column"/>
+      </optional>
+      <optional>
+        <attribute name="default_column_order"/>
+      </optional>
      <optional>
        <attribute name="dropdown_size">
          <data type="decimal"/>
@@ -286,6 +292,9 @@
          <ref name="bool"/>
        </attribute>
      </optional>
+      <optional>
+        <attribute name="sortable"/>
+      </optional>
      <optional>
        <attribute name="sound_closed"/>
      </optional>
@@ -346,6 +355,15 @@
      <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"/>
@@ -511,7 +529,12 @@
      <oneOrMore>
        <ref name="object"/>
      </oneOrMore>
-      <attribute name="count"/>
+      <attribute name="count">
+        <data type="nonNegativeInteger"/>
+      </attribute>
+      <optional>
+        <attribute name="var"/>
+      </optional>
    </element>
  </define>
  <define name="translate">
@@ -329,21 +329,20 @@ function closePage()
 	Engine.SwitchGuiPage("page_pregame.xml", {});
 }

-
 /**
 * Moves an item in the list @p objectName up or down depending on the value of @p up.
 */
 function moveCurrItem(objectName, up)
 {
-	// reuse the check for null and if something is selected.
-	if (getCurrItemValue(objectName) == "")
+	var obj = Engine.GetGUIObjectByName(objectName);
+	if (!obj)
 		return;

-	var idx = Engine.GetGUIObjectByName(objectName).selected;
+	var idx = obj.selected;
 	if (idx === -1)
 		return;

-	var num = getNumItems(objectName);
+	var num = obj.list.length;
 	var idx2 = idx + (up ? -1 : 1);
 	if (idx2 < 0 || idx2 >= num)
 		return;
@@ -353,8 +352,8 @@ function moveCurrItem(objectName, up)
 	g_modsEnabled[idx2] = tmp;

 	// Selected object reached the new position.
-	Engine.GetGUIObjectByName(objectName).list = g_modsEnabled;
-	Engine.GetGUIObjectByName(objectName).selected = idx2;
+	obj.list = g_modsEnabled;
+	obj.selected = idx2;
 	generateModsList('modsEnabledList', g_modsEnabled);
 }

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>

 <objects>
-	<script file="gui/common/functions_utility_list.js"/>
 	<script file="gui/modmod/modmod.js"/>

 	<object name="modmod" type="image" style="ModernWindow" size="0 0 100% 100%">
@@ -56,7 +55,7 @@
 		<!-- Sort by -->
 		<object name="sortingWrapper" size="100%-400 74 100% 98">
 			<object type="text" size="0 0 75 100%" text_align="left" textcolor="white">
-				Sorting:
+				<translatableAttribute id="caption">Sorting:</translatableAttribute>
 			</object>
 			<object name="sortBy"
 				type="dropdown"
@@ -68,7 +67,7 @@
 			</object>
 			<!-- Checkboxes -->
 			<object type="text" size="75% 100%-24 100% 100%" text_align="left" textcolor="white">
-				Descending.
+				<translatableAttribute id="caption">Descending.</translatableAttribute>
 			</object>
 			<object name="isOrderDescending"
 				type="checkbox"
@@ -93,10 +92,10 @@
 				<def id="name" color="100 100 200" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
 				</def>
-				<def id="modVersion" color="128 128 128" width="5%">
+				<def id="modVersion" color="128 128 128" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
 				</def>
-				<def id="modFolderName" color="100 100 200" width="15%">
+				<def id="modFolderName" color="100 100 200" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
 				</def>
 				<def id="modLabel" color="0 60 0" width="18%">
@@ -134,10 +133,10 @@
 				<def id="name" color="100 100 200" width="10%">
 					<translatableAttribute id="heading">Name</translatableAttribute>
 				</def>
-				<def id="modVersion" color="128 128 128" width="5%">
+				<def id="modVersion" color="128 128 128" width="7%">
 					<translatableAttribute id="heading">Version</translatableAttribute>
 				</def>
-				<def id="modFolderName" color="100 100 200" width="15%">
+				<def id="modFolderName" color="100 100 200" width="13%">
 					<translatableAttribute id="heading">(Folder)</translatableAttribute>
 				</def>
 				<def id="modLabel" color="0 60 0" width="18%">
@@ -175,7 +174,7 @@
 			<action on="Press">Engine.Exit();</action>
 		</object>

-		<object type="button" style="ModernButtonRed" size="100%-576 100%-44 100%-392 100%-16">
+		<object type="button" style="ModernButtonRed" size="100%-576 100%-44 100%-392 100%-16" hotkey="cancel">
 			<translatableAttribute id="caption">Cancel</translatableAttribute>
 			<action on="Press">closePage();</action>
 		</object>
@@ -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
@@ -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|Gallium \S* on (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);
 };
@@ -11,6 +11,7 @@
                    "gui/modmod/**.js"
                ],
                "options": {
+                   "format": "javascript-format",
                   "keywords": {
                        "translate": [1],
                        "translatePlural": [1, 2],
@@ -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>
@@ -29,7 +29,7 @@ element actor {
            element particles {
                attribute file { text }
            }? &
-            element colour { list {
+            element color { list {
                xsd:nonNegativeInteger, # R
                xsd:nonNegativeInteger, # G
                xsd:nonNegativeInteger # B
@@ -1,183 +1,183 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<element name="actor" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-  <a:documentation/>
-  <!--
-    NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
-      and use a converter tool like trang to generate the Relax NG XML (.rng) file
-  -->
-  <a:documentation/>
-  <attribute name="version">
-    <data type="positiveInteger"/>
-  </attribute>
-  <interleave>
-    <zeroOrMore>
-      <element name="group">
-        <zeroOrMore>
-          <element name="variant">
-            <interleave>
-              <optional>
-                <attribute name="name"/>
-              </optional>
-              <optional>
-                <attribute name="frequency">
-                  <data type="nonNegativeInteger"/>
-                </attribute>
-              </optional>
-              <optional>
-                <element name="mesh">
-                  <text/>
-                </element>
-              </optional>
-              <optional>
-                <element name="textures">
-                  <zeroOrMore>
-                    <element name="texture">
-                      <interleave>
-                        <optional>
-                          <attribute name="file"/>
-                        </optional>
-                        <attribute name="name"/>
-                      </interleave>
-                    </element>
-                  </zeroOrMore>
-                </element>
-              </optional>
-              <optional>
-                <element name="decal">
-                  <interleave>
-                    <attribute name="width">
-                      <data type="float"/>
-                    </attribute>
-                    <!-- X -->
-                    <attribute name="depth">
-                      <data type="float"/>
-                    </attribute>
-                    <!-- Z -->
-                    <attribute name="angle">
-                      <data type="float"/>
-                    </attribute>
-                    <attribute name="offsetx">
-                      <data type="float"/>
-                    </attribute>
-                    <attribute name="offsetz">
-                      <data type="float"/>
-                    </attribute>
-                  </interleave>
-                </element>
-              </optional>
-              <optional>
-                <element name="particles">
-                  <attribute name="file"/>
-                </element>
-              </optional>
-              <optional>
-                <element name="colour">
-                  <list>
-                    <group>
-                      <data type="nonNegativeInteger"/>
-                      <!-- R -->
-                      <data type="nonNegativeInteger"/>
-                      <!-- G -->
-                      <data type="nonNegativeInteger"/>
-                    </group>
-                    <!-- B -->
-                  </list>
-                </element>
-              </optional>
-              <optional>
-                <element name="animations">
-                  <zeroOrMore>
-                    <element name="animation">
-                      <interleave>
-                        <attribute name="name"/>
-                        <optional>
-                          <attribute name="file"/>
-                        </optional>
-                        <attribute name="speed">
-                          <data type="nonNegativeInteger"/>
-                        </attribute>
-                        <optional>
-                          <attribute name="event">
-                            <data type="decimal">
-                              <param name="minInclusive">0</param>
-                              <param name="maxInclusive">1</param>
-                            </data>
-                          </attribute>
-                        </optional>
-                        <optional>
-                          <attribute name="load">
-                            <data type="decimal">
-                              <param name="minInclusive">0</param>
-                              <param name="maxInclusive">1</param>
-                            </data>
-                          </attribute>
-                        </optional>
-                        <optional>
-                          <attribute name="sound">
-                            <data type="decimal">
-                              <param name="minInclusive">0</param>
-                              <param name="maxInclusive">1</param>
-                            </data>
-                          </attribute>
-                        </optional>
-                      </interleave>
-                    </element>
-                  </zeroOrMore>
-                </element>
-              </optional>
-              <optional>
-                <element name="props">
-                  <zeroOrMore>
-                    <element name="prop">
-                      <interleave>
-                        <optional>
-                          <attribute name="actor"/>
-                        </optional>
-                        <attribute name="attachpoint"/>
-                        <optional>
-                          <attribute name="minheight">
-                            <data type="float"/>
-                          </attribute>
-                        </optional>
-                        <optional>
-                          <attribute name="maxheight">
-                            <data type="float"/>
-                          </attribute>
-                        </optional>
-                        <optional>
-                          <attribute name="selectable">
-                            <choice>
-                              <value>true</value>
-                              <value>false</value>
-                            </choice>
-                          </attribute>
-                        </optional>
-                      </interleave>
-                    </element>
-                  </zeroOrMore>
-                </element>
-              </optional>
-            </interleave>
-          </element>
-        </zeroOrMore>
-      </element>
-    </zeroOrMore>
-    <optional>
-      <element name="castshadow">
-        <!-- flag; true if present -->
-        <empty/>
-      </element>
-    </optional>
-    <optional>
-      <element name="float">
-        <!-- flag; true if present -->
-        <empty/>
-      </element>
-    </optional>
-    <optional>
-      <element name="material">
-        <text/>
-      </element>
-    </optional>
-  </interleave>
-</element>
+<?xml version="1.0" encoding="UTF-8"?>
+<element name="actor" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <a:documentation/>
+  <!--
+    NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
+      and use a converter tool like trang to generate the Relax NG XML (.rng) file
+  -->
+  <a:documentation/>
+  <attribute name="version">
+    <data type="positiveInteger"/>
+  </attribute>
+  <interleave>
+    <zeroOrMore>
+      <element name="group">
+        <zeroOrMore>
+          <element name="variant">
+            <interleave>
+              <optional>
+                <attribute name="name"/>
+              </optional>
+              <optional>
+                <attribute name="frequency">
+                  <data type="nonNegativeInteger"/>
+                </attribute>
+              </optional>
+              <optional>
+                <element name="mesh">
+                  <text/>
+                </element>
+              </optional>
+              <optional>
+                <element name="textures">
+                  <zeroOrMore>
+                    <element name="texture">
+                      <interleave>
+                        <optional>
+                          <attribute name="file"/>
+                        </optional>
+                        <attribute name="name"/>
+                      </interleave>
+                    </element>
+                  </zeroOrMore>
+                </element>
+              </optional>
+              <optional>
+                <element name="decal">
+                  <interleave>
+                    <attribute name="width">
+                      <data type="float"/>
+                    </attribute>
+                    <!-- X -->
+                    <attribute name="depth">
+                      <data type="float"/>
+                    </attribute>
+                    <!-- Z -->
+                    <attribute name="angle">
+                      <data type="float"/>
+                    </attribute>
+                    <attribute name="offsetx">
+                      <data type="float"/>
+                    </attribute>
+                    <attribute name="offsetz">
+                      <data type="float"/>
+                    </attribute>
+                  </interleave>
+                </element>
+              </optional>
+              <optional>
+                <element name="particles">
+                  <attribute name="file"/>
+                </element>
+              </optional>
+              <optional>
+                <element name="color">
+                  <list>
+                    <group>
+                      <data type="nonNegativeInteger"/>
+                      <!-- R -->
+                      <data type="nonNegativeInteger"/>
+                      <!-- G -->
+                      <data type="nonNegativeInteger"/>
+                    </group>
+                    <!-- B -->
+                  </list>
+                </element>
+              </optional>
+              <optional>
+                <element name="animations">
+                  <zeroOrMore>
+                    <element name="animation">
+                      <interleave>
+                        <attribute name="name"/>
+                        <optional>
+                          <attribute name="file"/>
+                        </optional>
+                        <attribute name="speed">
+                          <data type="nonNegativeInteger"/>
+                        </attribute>
+                        <optional>
+                          <attribute name="event">
+                            <data type="decimal">
+                              <param name="minInclusive">0</param>
+                              <param name="maxInclusive">1</param>
+                            </data>
+                          </attribute>
+                        </optional>
+                        <optional>
+                          <attribute name="load">
+                            <data type="decimal">
+                              <param name="minInclusive">0</param>
+                              <param name="maxInclusive">1</param>
+                            </data>
+                          </attribute>
+                        </optional>
+                        <optional>
+                          <attribute name="sound">
+                            <data type="decimal">
+                              <param name="minInclusive">0</param>
+                              <param name="maxInclusive">1</param>
+                            </data>
+                          </attribute>
+                        </optional>
+                      </interleave>
+                    </element>
+                  </zeroOrMore>
+                </element>
+              </optional>
+              <optional>
+                <element name="props">
+                  <zeroOrMore>
+                    <element name="prop">
+                      <interleave>
+                        <optional>
+                          <attribute name="actor"/>
+                        </optional>
+                        <attribute name="attachpoint"/>
+                        <optional>
+                          <attribute name="minheight">
+                            <data type="float"/>
+                          </attribute>
+                        </optional>
+                        <optional>
+                          <attribute name="maxheight">
+                            <data type="float"/>
+                          </attribute>
+                        </optional>
+                        <optional>
+                          <attribute name="selectable">
+                            <choice>
+                              <value>true</value>
+                              <value>false</value>
+                            </choice>
+                          </attribute>
+                        </optional>
+                      </interleave>
+                    </element>
+                  </zeroOrMore>
+                </element>
+              </optional>
+            </interleave>
+          </element>
+        </zeroOrMore>
+      </element>
+    </zeroOrMore>
+    <optional>
+      <element name="castshadow">
+        <!-- flag; true if present -->
+        <empty/>
+      </element>
+    </optional>
+    <optional>
+      <element name="float">
+        <!-- flag; true if present -->
+        <empty/>
+      </element>
+    </optional>
+    <optional>
+      <element name="material">
+        <text/>
+      </element>
+    </optional>
+  </interleave>
+</element>
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="100" name="Mesh">
+        <animations>
+        <animation file="quadraped/rhino_idle.dae" name="Idle" speed="100"/>
+        <animation file="quadraped/rhino_idle2.dae" name="Idle" speed="100"/>
+                                               
+        <animation file="quadraped/rhino_walk.dae" name="Walk" speed="20"/>
+        <animation file="quadraped/rhino_run.dae" name="run" speed="10"/>
+        <animation file="quadraped/rhino_death.dae" name="death" speed="100"/>
+        <animation file="quadraped/rhino_attack.dae" name="attack_melee" speed="100"/>
+      </animations>
+      <mesh>skeletal/rhino.dae</mesh>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="standard">
+      <textures><texture file="skeletal/animal_rhino.png" name="baseTex"/></textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="100" name="Idle"/>
+    <variant name="death">
+      <props>
+        <prop actor="props/units/blood_01.xml" attachpoint="root"/>
+      </props>
+    </variant>
+  </group>
+</actor>
@@ -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>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="cypress branches large">
+      <mesh>gaia/tree_cypress_large_branches.dae</mesh>
+      <textures>
+      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="cypress branches med">
+      <mesh>gaia/tree_cypress_med_branches.dae</mesh>
+      <textures>
+      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="cypress skinny branches ">
+      <mesh>gaia/tree_cypress_skinny_branches.dae</mesh>
+      <textures>
+      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="cypress small branches ">
+      <mesh>gaia/tree_cypress_sm_branches.dae</mesh>
+      <textures>
+      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="cypress tall branches ">
+      <mesh>gaia/tree_cypress_tall_branches.dae</mesh>
+      <textures>
+      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_wind.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="cypress tall branches ">
+      <mesh>gaia/tree_cypress_xlarge_branches.dae</mesh>
+      <textures>
+      	<texture file="gaia/tree_cypress.png" name="baseTex"/>
+        <texture file="gaia/tree_cypress_norm.png" name="normTex"/>
+        <texture file="gaia/tree_cypress_spec.png" name="specTex"/>        
+      </textures>
+    </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>
@@ -4,27 +4,57 @@
  <group>
    <variant frequency="1" name="Cypress Tree (Small)">
      <mesh>gaia/tree_cypress_sm.dae</mesh>
-      <textures><texture file="gaia/prop_tree_cypess.dds" name="baseTex"/></textures>
+      <props>
+        <prop actor="flora/trees/cypress_sm_branches.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/prop_tree_cypess.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant frequency="2" name="Cypress Tree (Medium)">
      <mesh>gaia/tree_cypress_med.dae</mesh>
-      <textures><texture file="gaia/prop_tree_cypess_b.dds" name="baseTex"/></textures>
+            <props>
+        <prop actor="flora/trees/cypress_med_branches.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/prop_tree_cypess_b.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant frequency="2" name="Cypress Tree (Large)">
      <mesh>gaia/tree_cypress_large.dae</mesh>
-      <textures><texture file="gaia/prop_tree_cypess_c.dds" name="baseTex"/></textures>
+            <props>
+        <prop actor="flora/trees/cypress_large_branches.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/prop_tree_cypess_c.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant frequency="1" name="Cypress Tree (XLarge)">
      <mesh>gaia/tree_cypress_xlarge.dae</mesh>
-      <textures><texture file="gaia/prop_tree_cypess_b.dds" name="baseTex"/></textures>
+            <props>
+        <prop actor="flora/trees/cypress_xlarge_branches.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/prop_tree_cypess_b.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant frequency="2" name="Cypress Tree (Skinny)">
      <mesh>gaia/tree_cypress_skinny.dae</mesh>
-      <textures><texture file="gaia/tree_cypress_a.dds" name="baseTex"/></textures>
+            <props>
+        <prop actor="flora/trees/cypress_skinny_branches.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/tree_cypress_a.dds" name="baseTex"/>
+      </textures>
    </variant>
    <variant frequency="1" name="Cypress Tree (Tall)">
      <mesh>gaia/tree_cypress_tall.dae</mesh>
-      <textures><texture file="gaia/tree_cypress_a.dds" name="baseTex"/></textures>
+            <props>
+        <prop actor="flora/trees/cypress_tall_branches.xml" attachpoint="root"/>
+      </props>
+      <textures>
+        <texture file="gaia/tree_cypress_a.dds" name="baseTex"/>
+      </textures>
    </variant>
  </group>
  
@@ -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,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-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.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-b">
+      <mesh>gaia/tree_oak_new_top_b.dae</mesh>
+    </variant>
+  </group>
+
+  <group>
+    <variant frequency="1" name="oak-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.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-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.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-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.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-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.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-aut-top-texture-a">
+      <textures><texture file="gaia/tree_oak_a_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="2" name="oak-aut-top-texture-b">
+      <textures><texture file="gaia/tree_oak_b_aut.dds" name="baseTex"/></textures>
+    </variant>
+    <variant frequency="4" name="oak-aut-top-texture-c">
+      <textures><texture file="gaia/tree_oak_c_aut.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-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>
@@ -4,9 +4,15 @@
  <group>
    <variant frequency="1" name="Tree dead 1">
      <mesh>gaia/tree_dead_a_2.dae</mesh>
+            <props>
+        <prop actor="props/flora/tree_dead_a2_branches.xml" attachpoint="root"/>
+      </props>
    </variant>
    <variant frequency="1" name="Tree dead 2">
      <mesh>gaia/tree_dead_a_1.dae</mesh>
+      <props>
+        <prop actor="props/flora/tree_dead_a1_branches.xml" attachpoint="root"/>
+      </props>
    </variant>
  </group>
  <group>
@@ -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>
@@ -21,6 +21,6 @@
    </variant>
  </group>

-  <material>basic_trans.xml</material>
+  <material>basic_trans_wind.xml</material>

 </actor>
@@ -13,5 +13,5 @@
      </textures>
    </variant>
  </group>
-  <material>basic_trans.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,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="shrub spikes">
+      <mesh>gaia/shrub_fanpalm.dae</mesh>
+      <textures>
+      	<texture file="gaia/shrub_fanpalm.png" name="baseTex"/>
+        <texture file="gaia/shrub_fanpalm_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_fanpalm_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="shrub spikes">
+      <mesh>gaia/shrub_spikes.dae</mesh>
+      <textures>
+      	<texture file="gaia/shrub_spikes.png" name="baseTex"/>
+        <texture file="gaia/shrub_spikes_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_spikes_spec.png" name="specTex"/>        
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="shrub spikes">
+      <mesh>gaia/shrub_palm.dae</mesh>
+      <textures>
+        <texture file="gaia/shrub_tropic_palm.png" name="baseTex"/>
+        <texture file="gaia/shrub_tropic_palm_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_tropic_palm_spec.png" name="specTex"/>       
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="shrub spikes">
+      <mesh>gaia/shrub_tropic_plant_a.dae</mesh>
+      <textures>
+        <texture file="gaia/shrub_tropic_a.png" name="baseTex"/>
+        <texture file="gaia/shrub_tropic_a_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_tropic_a_spec.png" name="specTex"/>    
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="shrub spikes">
+      <mesh>gaia/shrub_tropic_plant_b.dae</mesh>
+      <textures>
+        <texture file="gaia/shrub_tropic_b.png" name="baseTex"/>
+        <texture file="gaia/shrub_tropic_b_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_tropic_b_spec.png" name="specTex"/>    
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="1" name="shrub spikes">
+      <mesh>gaia/shrub_tropic_plant_flower.dae</mesh>
+      <textures>
+        <texture file="gaia/shrub_tropic_a.png" name="baseTex"/>
+        <texture file="gaia/shrub_tropic_a_norm.png" name="normTex"/>
+        <texture file="gaia/shrub_tropic_a_spec.png" name="specTex"/>    
+      </textures>
+    </variant>
+  </group>
+  <material>basic_trans_parallax_spec.xml</material>
+</actor>
@@ -5,10 +5,10 @@

  <group>
    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>gaia/palm_d.dae</mesh>
-      <props/>
-      <textures><texture file="gaia/wrld_palm.dds" name="baseTex"/></textures>
+      <mesh>props/tree_dead_a1_branches.dae</mesh>
+       <textures>
+		<texture file="gaia/tree_dead_branches.png" name="baseTex"/>
+	  </textures>
    </variant>
  </group>

@@ -5,10 +5,10 @@

  <group>
    <variant frequency="100" name="Base">
-      <animations/>
-      <mesh>gaia/palm_e.dae</mesh>
-      <props/>
-      <textures><texture file="gaia/wrld_palm.dds" name="baseTex"/></textures>
+      <mesh>props/tree_dead_a2_branches.dae</mesh>
+       <textures>
+		<texture file="gaia/tree_dead_branches.png" name="baseTex"/>
+	  </textures>
    </variant>
  </group>

@@ -7,5 +7,5 @@
      <textures><texture file="gaia/prop_tree_cypess.dds" name="baseTex"/></textures>
    </variant>
  </group>
-  <material>basic_trans_ao.xml</material>
+  <material>basic_trans.xml</material>
 </actor>
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="broch top">
-      <mesh>structural/celt_crannog_rocks.dae</mesh>
-      <textures>
-        <texture file="props/palisade_main.png" name="baseTex"/>
-        <texture file="props/palisade_main_norm.png" name="normTex"/>
-      </textures>
-    </variant>
-  </group>
-  <material>basic_trans_parallax_spec.xml</material>
-</actor>
@@ -11,5 +11,5 @@
      </textures>
    </variant>
  </group>
-<material>player_trans_ao_parallax_spec.xml</material>
+<material>player_trans_ao_parallax.xml</material>
 </actor>
@@ -11,5 +11,5 @@
      </textures>
    </variant>
  </group>
-<material>player_trans_ao_parallax_spec.xml</material>
+<material>player_trans_ao_parallax.xml</material>
 </actor>
@@ -11,5 +11,5 @@
      </textures>
    </variant>
  </group>
-<material>player_trans_ao_parallax_spec.xml</material>
+<material>player_trans_ao_parallax.xml</material>
 </actor>
@@ -11,5 +11,5 @@
      </textures>
    </variant>
  </group>
-<material>player_trans_ao_parallax_spec.xml</material>
+<material>player_trans_ao_parallax.xml</material>
 </actor>
@@ -11,5 +11,5 @@
      </textures>
    </variant>
  </group>
-<material>player_trans_ao_parallax_spec.xml</material>
+<material>player_trans_ao_parallax.xml</material>
 </actor>
--- a/Show More
+++ b/Show More