Fixes water rendering on map borders.

Tested By:
Differential Revision: https://code.wildfiregames.com/D4716
This was SVN commit r27102.

.arcconfig

@@ -1,4 +1,5 @@
 {
   "phabricator.uri" : "https://code.wildfiregames.com/",
-  "repository.callsign" : "P"
+  "repository.callsign" : "P",
+  "load": ["build/arclint/pyrolint"]
 }

.arclint

@@ -3,6 +3,7 @@
     "(^binaries/system/)",
     "(^build/premake/premake5/)",
     "(^source/third_party/)",
+    "(test_[^.]+.cpp$)",
     "(^libraries/)"
   ],
   "linters": {
@@ -14,6 +15,25 @@
         "3": "disabled",
         "5": "disabled"
       }
+    },
+    "licence-year": {
+      "type": "licence-year"
+    },
+    "json": {
+      "type": "json",
+      "include": "/\\.json$/"
+    },
+    "eslint": {
+      "type": "eslint",
+      "bin": ["eslint", "build\\arclint\\dummies\\eslint.bat", "build/arclint/dummies/eslint.php"],
+      "include": "/\\.js$/",
+      "config": "build/arclint/configs/eslintrc.json"
+    },
+    "cppcheck": {
+      "type": "cppcheck",
+      "bin": ["cppcheck", "build\\arclint\\dummies\\cppcheck.bat", "build/arclint/dummies/cppcheck.php"],
+      "include": "/\\.(h|cpp)$/",
+      "flags": ["--max-configs=40", "--language=c++", "--std=c++17", "-Isource/", "--suppress=unknownMacro"]
     }
   }
 }

.coafile

@@ -1,11 +0,0 @@
-[Source]
-bears = CPPCheckBear, LicenseYearBear
-language = c++
-files = source/**.(cpp|h)
-ignore = source/third_party
-
-[JS]
-bears = ESLintBear, JSHintBear
-eslint_config = build/coala/lint-config/eslintrc.json
-jshint_config = build/coala/lint-config/jshintrc.json
-files = binaries/data/**.js

LICENSE.txt

@@ -42,6 +42,12 @@ in particular, let us know and we can try to clarify it.
   /build
     Various (unspecified)
 
+  /build/arclint
+    GPL version 2 (or later) - see license_gpl-2.0.txt
+
+  /build/arclint/pyrolint
+    Apache version 2 - see license_apache2.txt within that directory
+
   /build/premake/premake5
     BSD
 

binaries/data/config/default.cfg

@@ -26,6 +26,11 @@
 ; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
 windowed = false
 
+; Switches between real fullscreen and borderless window on a full display size.
+borderless.fullscreen = true
+; Hides a window border in the windowed mode.
+borderless.window = false
+
 ; Show detailed tooltips (Unit stats)
 showdetailedtooltips = false
 
@@ -53,6 +58,9 @@ bpp = 0
 ; Preferred display (for multidisplay setups, only works with SDL 2.0)
 display = 0
 
+; Enable Hi-DPI where supported, currently working only for testing.
+hidpi = false
+
 ; Allows to force GL version for SDL
 forceglversion = false
 forceglprofile = "compatibility" ; Possible values: compatibility, core, es
@@ -60,7 +68,7 @@ forceglmajorversion = 3
 forceglminorversion = 3
 
 ; Big screenshot tiles
-screenshot.tiles = 4
+screenshot.tiles = 8
 screenshot.tilewidth = 480
 screenshot.tileheight = 270
 
@@ -79,11 +87,17 @@ waterrefraction = true
 waterreflection = true
 
 shadows = true
-shadowquality = 0      ; Shadow map resolution. (-2 - Very Low, -1 - Low, 0 - Medium, 1 - High, 2 - Very High)
+shadowquality = 0      ; Shadow map resolution. (-1 - Low, 0 - Medium, 1 - High, 2 - Very High)
                        ; High values can crash the game when using a graphics card with low memory!
 shadowpcf = true
-shadowsfixed = false         ; When enabled shadows are rendered only on the
-shadowsfixeddistance = 300.0 ; fixed distance and without swimming effect.
+; Increases details closer to the camera but decreases performance
+; especially on low hardware.
+shadowscascadecount = 1
+shadowscascadedistanceratio = 1.7
+; Hides shadows after the distance.
+shadowscutoffdistance = 300.0
+; If true shadows cover the whole map instead of the camera frustum.
+shadowscovermap = false
 
 vsync = false
 particles = true
@@ -91,31 +105,44 @@ fog = true
 silhouettes = true
 showsky = true
 
-novbo = false
+; Uses a synchonized call to a GL driver to get an error state. Useful
+; for a debugging of a system without GL_KHR_debug.
+gl.checkerrorafterswap = false
 
-; Disable hardware cursors
-nohwcursor = false
+; Different ways to draw a cursor, possible values are "sdl" and "system".
+; The "system" one doesn't support a visual change of the cursor.
+cursorbackend = "sdl"
 
-; Specify the render path. This can be one of:
-;   default       Automatically select one of the below, depending on system capabilities
-;   fixed         Only use OpenGL fixed function pipeline
-;   shader        Use vertex/fragment shaders for transform and lighting where possible
-; Using 'fixed' instead of 'default' may work around some graphics-related problems,
-; but will reduce performance and features when a modern graphics card is available.
+; Backends for all graphics rendering:
+;   glarb - GL with legacy assembler-like shaders, might used only for buggy drivers.
+;   gl - GL with GLSL shaders, should be used by default.
+;   dummy - backend that does nothing, allows to check performance without backend drivers.
+rendererbackend = "gl"
+
+; Enables additional debug information in renderer backend.
+renderer.backend.debugcontext = "false"
+renderer.backend.debugmessages = "false"
+renderer.backend.debuglabels = "false"
+renderer.backend.debugscopedlabels = "false"
+
+; Should not be edited. It's used only for preventing of running fixed pipeline.
 renderpath = default
 
-;;;;; EXPERIMENTAL ;;;;;
-; Prefer GLSL shaders over ARB shaders. Allows fancier graphical effects.
-preferglsl = false
+; (0 - low, 1 - medium, 2 - high), higher quality means worse performance.
+textures.quality = 2
 
-; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
+; (1, 2, 4, 8 and 16)
+textures.maxanisotropy = 2
+
+;;;;; EXPERIMENTAL ;;;;;
+; Experimental probably-non-working GPU skinning support; requires GLSL; use at own risk
 gpuskinning = false
 
 ; Use smooth LOS interpolation
-smoothlos = false
+smoothlos = true
 
 ; Use screen-space postprocessing filters (HDR, bloom, DOF, etc). Incompatible with fixed renderpath.
-postproc = false
+postproc = true
 
 ; Use anti-aliasing techniques.
 antialiasing = "disabled"
@@ -124,20 +151,17 @@ antialiasing = "disabled"
 sharpening = "disabled"
 sharpness = 0.3
 
+; Quality used for actors.
+max_actor_quality=200
+
+; Whether or not actor variants are selected randomly, possible values are "full", "limited", "none".
+variant_diversity = "full"
+
 ; Quality level of shader effects (set to 10 to display all effects)
-materialmgr.quality = 2.0
+materialmgr.quality = 10.0
 
-; Maximum distance to display parallax effect. Set to 0 to disable parallax.
-materialmgr.PARALLAX_DIST.max = 150
-; Maximum distance to display high quality parallax effect.
-materialmgr.PARALLAX_HQ_DIST.max = 75
-; Maximum distance to display very high quality parallax effect. Set to 30 to enable.
-materialmgr.PARALLAX_VHQ_DIST.max = 0
 ;;;;;;;;;;;;;;;;;;;;;;;;
 
-; Replace alpha-blending with alpha-testing, for performance experiments
-forcealphatest = false
-
 ; Color of the sky (in "r g b" format)
 skycolor = "0 0 0"
 
@@ -156,7 +180,7 @@ server.threads = "6"                      ; Enough for the browser's parallel co
 ; See keys.txt for the list of key names.
 
 ; > SYSTEM SETTINGS
-exit = "Ctrl+Break", "Super+Q", "Alt+F4" ; Exit to desktop
+exit = ""                                ; 'Custom' exit to desktop, SDL handles the native command via SDL_Quit.
 cancel = Escape                          ; Close or cancel the current dialog box/popup
 confirm = Return                         ; Confirm the current command
 pause = Pause, "Shift+Space"             ; Pause/unpause game
@@ -200,6 +224,7 @@ quickload = "Shift+F8"
 reset = "R"                                   ; Reset camera rotation to default.
 follow = "F"                                  ; Follow the first unit in the selection
 rallypointfocus = ""                          ; Focus the camera on the rally point of the selected building
+lastattackfocus = "Space"                     ; Focus the camera on the last notified attack
 zoom.in = Plus, NumPlus                       ; Zoom camera in (continuous control)
 zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
 zoom.wheel.in = WheelUp                       ; Zoom camera in (stepped control)
@@ -259,12 +284,13 @@ nonmilitaryonly = "Alt+Y"               ; Add only non-military units to the sel
 idleonly = "I"                          ; Select only idle units
 woundedonly = "O"                       ; Select only wounded units
 remove = Ctrl                           ; Remove units from selection
+idlebuilder = Semicolon                 ; Select next idle builder
 idleworker = Period, NumDecimal         ; Select next idle worker
 idlewarrior = Slash, NumDivide          ; Select next idle warrior
 idleunit = BackSlash                    ; Select next idle unit
 offscreen = Alt                         ; Include offscreen units in selection
+singleselection = "" ; Modifier to select units individually, opposed to per formation.
 [hotkey.selection.group.add]
-0 = "Shift+0", "Shift+Num0"
 1 = "Shift+1", "Shift+Num1"
 2 = "Shift+2", "Shift+Num2"
 3 = "Shift+3", "Shift+Num3"
@@ -274,8 +300,8 @@ offscreen = Alt                         ; Include offscreen units in selection
 7 = "Shift+7", "Shift+Num7"
 8 = "Shift+8", "Shift+Num8"
 9 = "Shift+9", "Shift+Num9"
+10 = "Shift+0", "Shift+Num0"
 [hotkey.selection.group.save]
-0 = "Ctrl+0", "Ctrl+Num0"
 1 = "Ctrl+1", "Ctrl+Num1"
 2 = "Ctrl+2", "Ctrl+Num2"
 3 = "Ctrl+3", "Ctrl+Num3"
@@ -285,8 +311,8 @@ offscreen = Alt                         ; Include offscreen units in selection
 7 = "Ctrl+7", "Ctrl+Num7"
 8 = "Ctrl+8", "Ctrl+Num8"
 9 = "Ctrl+9", "Ctrl+Num9"
+10 = "Ctrl+0", "Ctrl+Num0"
 [hotkey.selection.group.select]
-0 = 0, Num0
 1 = 1, Num1
 2 = 2, Num2
 3 = 3, Num3
@@ -296,6 +322,7 @@ offscreen = Alt                         ; Include offscreen units in selection
 7 = 7, Num7
 8 = 8, Num8
 9 = 9, Num9
+10 = 0, Num0
 
 [hotkey.gamesetup]
 mapbrowser.open = "M"
@@ -305,16 +332,20 @@ kill = Delete, Backspace     ; Destroy selected units
 stop = "H"                   ; Stop the current action
 backtowork = "Y"             ; The unit will go back to work
 unload = "U"                 ; Unload garrisoned units when a building/mechanical unit is selected
+unloadturrets = "U" ; Unload turreted units.
+leaveturret = "U" ; Leave turret point.
 move = ""                    ; Modifier to move to a point instead of another action (e.g. gather)
 attack = Ctrl                ; Modifier to attack instead of another action (e.g. 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
 garrison = Ctrl              ; Modifier to garrison when clicking on building
+occupyturret = Ctrl ; Modifier to occupy a turret when clicking on a turret holder.
 autorallypoint = Ctrl        ; Modifier to set the rally point on the building itself
 guard = "G"                  ; Modifier to escort/guard when clicking on unit/building
 patrol = "P"                 ; Modifier to patrol a unit
 repair = "J"                 ; Modifier to repair when clicking on building/mechanical unit
 queue = Shift                ; Modifier to queue unit orders instead of replacing
+pushorderfront = ""          ; Modifier to push unit orders to the front instead of replacing.
 orderone = Alt               ; Modifier to order only one entity in selection.
 batchtrain = Shift           ; Modifier to train units in batches
 massbarter = Shift           ; Modifier to barter bunch of resources
@@ -327,6 +358,9 @@ rotate.cw = RightBracket     ; Rotate building placement preview clockwise
 rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise
 snaptoedges = Ctrl           ; Modifier to align new structures with nearby existing structure
 toggledefaultformation = ""  ; Switch between null default formation and the last default formation used (defaults to "box")
+flare = K                    ; Modifier to send a flare to your allies
+flareactivate = ""           ; Modifier to activate the mode to send a flare to your allies
+calltoarms = ""              ; Modifier to call the selected units to the arms.
 ; Overlays
 showstatusbars = Tab         ; Toggle display of status bars
 devcommands.toggle = "Alt+D" ; Toggle developer commands panel
@@ -360,7 +394,7 @@ noconfirmation = Shift        ; Do not ask confirmation when deleting a game
 8 = Comma          ; add eighth unit type to queue
 
 [hotkey.session.timewarp]
-fastforward = Space               ; If timewarp mode enabled, speed up the game
+fastforward = "Ctrl+Space"         ; If timewarp mode enabled, speed up the game
 rewind = "Shift+Backspace"        ; If timewarp mode enabled, go back to earlier point in the game
 
 [hotkey.tab]
@@ -388,11 +422,13 @@ settingsslide = true              ; Enable/Disable settings panel slide
 progressdescription = false       ; Whether to display the progress percent or a textual description
 
 [gui.session]
+dragdelta = 4                     ; Number of pixels the mouse can move before the action is considered a drag
 camerajump.threshold = 40         ; How close do we have to be to the actual location in order to jump back to the previous one?
 timeelapsedcounter = false        ; Show the game duration in the top right corner
 ceasefirecounter = false          ; Show the remaining ceasefire time in the top right corner
 batchtrainingsize = 5             ; Number of units to be trained per batch by default (when pressing the hotkey)
 scrollbatchratio = 1              ; Number of times you have to scroll to increase/decrease the batchsize by 1
+flarelifetime = 6                 ; How long the flare markers on the minimap are displayed in seconds
 woundedunithotkeythreshold = 33   ; The wounded unit hotkey considers the selected units as wounded if their health percentage falls below this number
 attackrange = true                ; Display attack range overlays of selected defensive structures
 aurasrange = true                 ; Display aura range overlays of selected units and structures
@@ -405,8 +441,14 @@ snaptoedgesdistancethreshold = 15 ; On which distance we don't snap to edges
 disjointcontrolgroups = "true"    ; Whether control groups are disjoint sets or entities can be in multiple control groups at the same time.
 defaultformation = "special/formations/box" ; For walking orders, automatically put units into this formation if they don't have one already.
 formationwalkonly = "true"                  ; Formations are disabled when giving gather/attack/... orders.
+howtoshownames = 0 ; Whether the specific names are show as default, as opposed to the generic names. And whether the secondary names are shown. (0 - show both; specific names primary, 1 - show both; generic names primary, 2 - show only specific names, 3 - show only generic names)
+selectformationasone = "true" ; Whether to select formations as a whole by default.
 
 [gui.session.minimap]
+; Icons that are displayed for some entities on a minimap.
+icons.enabled = "true"
+icons.opacity = 1.0
+icons.sizescale = 1.0
 blinkduration = 1.7               ; The blink duration while pinging
 pingduration = 50.0               ; The duration for which an entity will be pinged after an attack notification
 
@@ -429,13 +471,6 @@ enemy = "150 20 20"               ; Color of enemies when diplomacy colors are e
 [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
 
 [chat]
 timestamp = true                    ; Show at which time chat messages have been sent
@@ -445,7 +480,7 @@ extended = true                     ; Whether to display the chat history
 
 [lobby]
 history = 0                         ; Number of past messages to display on join
-room = "arena24"                    ; Default MUC room to join
+room = "arena26"                    ; Default MUC room to join
 server = "lobby.wildfiregames.com"  ; Address of lobby server
 tls = true                          ; Whether to use TLS encryption when connecting to the server.
 verify_certificate = false          ; Whether to reject connecting to the lobby if the TLS certificate is invalid (TODO: wait for Gloox GnuTLS trust implementation to be fixed)
@@ -453,8 +488,8 @@ terms_url = "https://trac.wildfiregames.com/browser/ps/trunk/binaries/data/mods/
 terms_of_service = "0"              ; Version (hash) of the Terms of Service that the user has accepted
 terms_of_use = "0"                  ; Version (hash) of the Terms of Use that the user has accepted
 privacy_policy = "0"                ; Version (hash) of the Privacy Policy that the user has accepted
-xpartamupp = "wfgbot24"             ; Name of the server-side XMPP-account that manage games
-echelon = "echelon24"               ; Name of the server-side XMPP-account that manages ratings
+xpartamupp = "wfgbot26"             ; Name of the server-side XMPP-account that manage games
+echelon = "echelon26"               ; Name of the server-side XMPP-account that manages ratings
 buddies = ","                       ; Comma separated list of playernames that the current user has marked as buddies
 rememberpassword = true             ; Whether to store the encrypted password in the user config
 
@@ -473,7 +508,8 @@ delay = 200                          ; Duration in milliseconds that is waited b
 enabledmods = "mod public"
 
 [modio]
-public_key = "RWRcbM/EwV7bucTiQVCcRBhCkYkXmJEO7s4ktyufkB+gW/NxHhOZ38xh" ; Public key corresponding to the private key valid mods are signed with
+
+public_key = "RWQa4XiSn+BLxIYXNrXyz68wwTGWyZ7+kxDtZuLHBXkCtt+lLB8VnpdM" ; Public key corresponding to the private key valid mods are signed with
 disclaimer = "0"                     ; Version (hash) of the Disclaimer that the user has accepted
 
 [modio.v1]
@@ -485,6 +521,8 @@ name_id = "0ad"
 duplicateplayernames = false      ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
 lateobservers = everyone          ; Allow observers to join the game after it started. Possible values: everyone, buddies, disabled.
 observerlimit = 8                 ; Prevent further observer joins in running games if this limit is reached
+observermaxlag = -1               ; Make clients wait for observers if they lag more than X turns behind. -1 means "never wait for observers".
+autocatchup = true        ; Auto-accelerate the sim rate if lagging behind (as an observer).
 
 [overlay]
 fps = "false"                     ; Show frames per second in top right corner
@@ -493,9 +531,7 @@ netwarnings = "true"              ; Show warnings if the network connection is b
 
 [profiler2]
 autoenable = false                ; Enable HTTP server output at startup (default off for security/performance)
-gpu.arb.enable = true             ; Allow GL_ARB_timer_query timing mode when available
-gpu.ext.enable = true             ; Allow GL_EXT_timer_query timing mode when available
-gpu.intel.enable = true           ; Allow GL_INTEL_performance_queries timing mode when available
+gpu.arb.enable = true             ; Allow GL_ARB_timer_query timing mode when available.
 
 [rlinterface]
 address = "127.0.0.1:6000"
@@ -506,6 +542,9 @@ musicgain = 0.2
 ambientgain = 0.6
 actiongain = 0.7
 uigain = 0.7
+mindistance = 1
+maxdistance = 350
+maxstereoangle = 0.62 ; About PI/5 radians
 
 [sound.notify]
 nick = true                       ; Play a sound when someone mentions your name in the lobby or game
@@ -523,6 +562,7 @@ terms = "0"                       ; Version (hash) of the UserReporter Terms tha
 [view] ; Camera control settings
 scroll.speed = 120.0
 scroll.speed.modifier = 1.05      ; Multiplier for changing scroll speed
+scroll.mouse.detectdistance = 3
 rotate.x.speed = 1.2
 rotate.x.min = 28.0
 rotate.x.max = 60.0

binaries/data/mods/_test.gui/gui/regainFocus/page_emptyPage.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page>
+	<include>common/styles.xml</include>
+</page>

binaries/data/mods/_test.gui/gui/regainFocus/page_pushWithPopOnInit.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page>
+	<include>common/styles.xml</include>
+	<include>regainFocus/pushWithPopOnInit.xml</include>
+</page>

binaries/data/mods/_test.gui/gui/regainFocus/pushWithPopOnInit.js

@@ -0,0 +1 @@
+Engine.PushGuiPage("regainFocus/page_emptyPage.xml", {}, () => Engine.PopGuiPage());

binaries/data/mods/_test.gui/gui/regainFocus/pushWithPopOnInit.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objects>
+	<script file="gui/regainFocus/pushWithPopOnInit.js"/>
+</objects>

binaries/data/mods/_test.minimal/fonts/console.fnt

@@ -1,7 +1,9 @@
-100
+101
 256 256
+a
 606
-20
+15
+12
 32 0 256 0 0 0 0 5
 33 250 154 3 11 1 11 4
 34 121 18 5 4 0 11 5

binaries/data/mods/mod/art/textures/texture.rnc

@@ -1,19 +0,0 @@
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-##
-# 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
-##
-
-element Textures {
-    element File {
-        attribute pattern { text }? &
-        attribute format { "dxt1" | "dxt3" | "dxt5" | "rgba" | "alpha" }? &
-        attribute mipmap { "true" | "false" }? &
-        attribute normal { "true" | "false" }? &
-        attribute alpha { "none" | "player" | "transparency" }? &
-        attribute filter { "box" | "triangle" | "kaiser" }? &
-        attribute kaiserwidth { xsd:float }? &
-        attribute kaiseralpha { xsd:float }? &
-        attribute kaiserstretch { xsd:float }?
-    }*
-}

binaries/data/mods/mod/art/textures/texture.rng

@@ -1,11 +1,5 @@
 <?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>

binaries/data/mods/mod/audio/sound_group.rnc

@@ -1,36 +0,0 @@
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-##
-# 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
-##
-
-##
-# Types #
-##
-flag = "0" | "1"
-
-start = SoundGroup
-
-SoundGroup = element SoundGroup {
-    element Gain { xsd:float }? &
-    element Looping { flag }? &
-    element Omnipresent { flag }? &
-    element HeardBy { "owner" }? &
-    element Distanceless { flag }? &
-    element Pitch { xsd:float }? &
-    element Priority { xsd:float }? &
-    element RandOrder { flag }? &
-    element RandGain { flag }? &
-    element GainUpper { xsd:float }? &
-    element GainLower { xsd:float }? &
-    element RandPitch { flag }? &
-    element PitchUpper { xsd:float }? &
-    element PitchLower { xsd:float }? &
-    element ConeGain { xsd:float }? &
-    element ConeInner { xsd:float }? &
-    element ConeOuter { xsd:float }? &
-    element Threshold { xsd:float }? &
-    element Decay { xsd:float }? &
-    element Sound { text }+ &
-    element Path { text }
-}

binaries/data/mods/mod/audio/sound_group.rng

@@ -1,15 +1,6 @@
 <?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>

binaries/data/mods/mod/autostart/entrypoint.js

@@ -0,0 +1,23 @@
+/**
+ * This file is called from the visual & non-visual paths when autostarting.
+ * To avoid relying on the GUI, this script has access to a special 'LoadScript' function.
+ * See implementation in the public mod for more details.
+ */
+
+function autostartClient(initData)
+{
+	throw new Error("Autostart is not implemented in the 'mod' mod");
+}
+
+function autostartHost(initData, networked = false)
+{
+	throw new Error("Autostart is not implemented in the 'mod' mod");
+}
+
+/**
+ * @returns false if the loop should carry on.
+ */
+function onTick()
+{
+	return true;
+}

binaries/data/mods/mod/gui/common/functions_msgbox.js

@@ -15,6 +15,25 @@ function messageBox(mbWidth, mbHeight, mbMessage, mbTitle, mbButtonCaptions, mbB
 		});
 }
 
+function timedConfirmation(width, height, message, timeParameter, timeout, title, buttonCaptions, btnCode, callbackArgs)
+{
+	Engine.PushGuiPage(
+		"page_timedconfirmation.xml",
+		{
+			"width": width,
+			"height": height,
+			"message": message,
+			"timeParameter": timeParameter,
+			"timeout": timeout,
+			"title": title,
+			"buttonCaptions": buttonCaptions
+		},
+		button => {
+			if (btnCode !== undefined && btnCode[button])
+				btnCode[button](callbackArgs ? callbackArgs[button] : undefined);
+		});
+}
+
 function openURL(url)
 {
 	Engine.OpenURL(url);

binaries/data/mods/mod/gui/common/guitags.js

@@ -21,3 +21,12 @@ function setStringTags(text, tags)
 
 	return result;
 }
+
+
+/**
+ * Adds grey font if is not compatible.
+ */
+function compatibilityColor(text, isCompatible)
+{
+	return isCompatible ? text : coloredText(text, "96 96 96");
+}

binaries/data/mods/mod/gui/common/l10n.js

@@ -122,7 +122,7 @@ function translatePluralWithContext(context, singularMessage, pluralMessage, num
 /**
  * The input object should contain either of the following properties:
  *
- *     • A ‘message’ property that contains a message to translate.
+ *     • A ‘_string’ property that contains a message to translate.
  *
  *     • A ‘list’ property that contains a list of messages to translate as a
  *     comma-separated list of translated.
@@ -137,8 +137,8 @@ function translateMessageObject(object)
 	if (object.context)
 		trans = msg => translateWithContext(object.context, msg);
 
-	if (object.message)
-		object = trans(object.message);
+	if (object._string)
+		object = trans(object._string);
 	else if (object.list)
 		object = object.list.map(trans).join(translateWithContext("enumeration", ", "));
 
@@ -152,19 +152,19 @@ function translateMessageObject(object)
  * it accepts an object in the form of
  *
  * {
- *   translatedString1: "my first message",
- *   unTranslatedString1: "some English string",
- *   ignoredObject: {
- *     translatedString2: "my second message",
- *     unTranslatedString2: "some English string"
+ *   "translatedString1": "my first message",
+ *   "unTranslatedString1": "some English string",
+ *   "ignoredObject": {
+ *     "translatedString2": "my second message",
+ *     "unTranslatedString2": "some English string"
  *   },
- *   translatedObject1: {
- *     message: "my third singular message",
- *     context: "message context",
+ *   "translatedObject1": {
+ *     "_string": "my third singular message",
+ *     "context": "message context",
  *   },
  *   translatedObject2: {
- *     list: ["list", "of", "strings"],
- *     context: "message context",
+ *     "list": ["list", "of", "strings"],
+ *     "context": "message context",
  *   },
  * }
  *
@@ -174,14 +174,14 @@ function translateMessageObject(object)
  *
  * The result will be (f.e. in Dutch)
  * {
- *  translatedString1: "mijn eerste bericht",
- *   unTranslatedString1: "some English string",
- *   ignoredObject: {
- *     translatedString2: "mijn tweede bericht",
- *     unTranslatedString2: "some English string"
+ *  "translatedString1": "mijn eerste bericht",
+ *   "unTranslatedString1": "some English string",
+ *   "ignoredObject": {
+ *     "translatedString2": "mijn tweede bericht",
+ *     "unTranslatedString2": "some English string"
  *   },
- *   translatedObject1: "mijn derde bericht",
- *   translatedObject2: "lijst, van, teksten",
+ *   "translatedObject1": "mijn derde bericht",
+ *   "translatedObject2": "lijst, van, teksten",
  * }
  *
  * So you see that the keys array can also contain lower-level keys,

binaries/data/mods/mod/gui/common/mod.js

@@ -1,12 +1,26 @@
 /**
- * Check the mod compatibility between the saved game to be loaded and the engine
+ * Check the mod compatibility between the saved game to be loaded and the engine.
+ * This is a wrapper around an engine function to allow mods to to fancier or specific things.
  */
 function hasSameMods(modsA, modsB)
 {
-	if (!modsA || !modsB || modsA.length != modsB.length)
+	if (!modsA || !modsB)
 		return false;
-	// Mods must be loaded in the same order. 0: modname, 1: modversion
-	return modsA.every((mod, index) => [0, 1].every(i => mod[i] == modsB[index][i]));
+	return Engine.AreModsPlayCompatible(modsA, modsB);
+}
+
+/**
+ * Print the shorthand identifier of a mod.
+ */
+function modToString(mod)
+{
+	// Skip version for play-compatible mods.
+	if (mod.ignoreInCompatibilityChecks)
+		return mod.name;
+	return sprintf(translateWithContext("Mod comparison", "%(mod)s (%(version)s)"), {
+		"mod": mod.name,
+		"version": mod.version
+	});
 }
 
 /**
@@ -14,10 +28,7 @@ function hasSameMods(modsA, modsB)
  */
 function modsToString(mods)
 {
-	return mods.map(mod => sprintf(translateWithContext("Mod comparison", "%(mod)s (%(version)s)"), {
-			"mod": mod[0],
-			"version": mod[1]
-		})).join(translate(", "));
+	return mods.map(mod => modToString(mod)).join(translate(", "));
 }
 
 /**
@@ -26,7 +37,7 @@ function modsToString(mods)
 function comparedModsString(required, active)
 {
 	return sprintf(translateWithContext("Mod comparison", "Required: %(mods)s"),
-			{ "mods": modsToString(required) }) + "\n" +
-		sprintf(translateWithContext("Mod comparison", "Active: %(mods)s"),
-			{ "mods": modsToString(active) });
+		{ "mods": modsToString(required) }
+	) + "\n" + sprintf(translateWithContext("Mod comparison", "Active: %(mods)s"),
+		{ "mods": modsToString(active) });
 }

binaries/data/mods/mod/gui/common/modern/sprites.xml

@@ -9,9 +9,11 @@
 	<sprite name = "ModernScrollBack">
 		<image backcolor="43 42 40"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="0 0 0"
 		/>
+		<image backcolor="0 0 0" size="0 0 100% 1"/>
+		<image backcolor="0 0 0" size="0 100%-1 100% 100%"/>
+		<image backcolor="0 0 0" size="0 0 1 100%"/>
+		<image backcolor="0 0 0" size="100%-1 0 100% 100%"/>
 		<image texture = "global/modern/scrollback.png"
 			real_texture_placement = "0 0 15 128"
 			size = "0 0 100% 100%"
@@ -125,7 +127,7 @@
 		<image texture = "global/modern/dialog-deco-bottom.png"
 			real_texture_placement = "0 0 64 32"
 			texture_size = "0 0 64 32"
-			size = "100%-31 100%-22 100%+33 100%+10"
+			size = "100%-33 100%-22 100%+31 100%+10"
 		/>
 
 		<!-- title frame -->
@@ -147,6 +149,18 @@
 	- Box -
 	==========================================
 	-->
+	<sprite name = "ModernDarkBox">
+		<image backcolor = "12 12 12 100"
+			size = "0 0 100% 100%-1"
+		/>
+	</sprite>
+	<sprite name="ModernDarkBoxDisabled">
+		<effect grayscale=""/>
+		<!-- background -->
+		<image backcolor = "12 12 12 100"
+			size = "0 1 100% 100%-1"
+		/>
+	</sprite>
 	<sprite name="ModernDarkBoxGold">
 		<!-- borders -->
 		<image texture = "global/modern/gold-separator.png"
@@ -162,6 +176,17 @@
 			size = "0 1 100% 100%-1"
 		/>
 	</sprite>
+	<sprite name="ModernDarkBoxGoldBorder">
+		<!-- borders -->
+		<image texture = "global/modern/gold-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 0 100% 1"
+		/>
+		<image texture = "global/modern/gold-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 100%-1 100% 100%"
+		/>
+	</sprite>
 	<sprite name="ModernDarkBoxGoldDisabled">
 		<effect grayscale=""/>
 		<!-- borders -->
@@ -178,6 +203,18 @@
 			size = "0 1 100% 100%-1"
 		/>
 	</sprite>
+	<sprite name="ModernDarkBoxGoldBorderDisabled">
+		<effect grayscale=""/>
+		<!-- borders -->
+		<image texture = "global/modern/gold-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 0 100% 1"
+		/>
+		<image texture = "global/modern/gold-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 100%-1 100% 100%"
+		/>
+	</sprite>
 	<sprite name="ModernDarkBoxWhite">
 		<!-- borders -->
 		<image texture = "global/modern/white-separator.png"
@@ -193,6 +230,17 @@
 			size = "0 1 100% 100%-1"
 		/>
 	</sprite>
+	<sprite name="ModernDarkBoxWhiteBorder">
+		<!-- borders -->
+		<image texture = "global/modern/white-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 0 100% 1"
+		/>
+		<image texture = "global/modern/white-separator.png"
+			real_texture_placement = "0 0 806 1"
+			size = "0 100%-1 100% 100%"
+		/>
+	</sprite>
 	<sprite name="ModernDarkBoxWhiteInvalid">
 		<!-- borders -->
 		<image texture = "global/modern/white-separator.png"
@@ -217,14 +265,11 @@
 			size = "0 1 100% 100%"
 		/>
 	</sprite>
-	<sprite name = "ModernDarkBoxGoldNoTop">
+	<sprite name="ModernDarkBoxBottomGold">
 		<image texture = "global/modern/gold-separator.png"
 			real_texture_placement = "0 0 806 1"
 			size = "0 100%-1 100% 100%"
 		/>
-		<image backcolor = "12 12 12 100"
-			size = "0 0 100% 100%-1"
-		/>
 	</sprite>
 	<!--
 	==========================================
@@ -513,9 +558,22 @@
 	<sprite name="BlackBorderOnGray">
 		<image backcolor="darkgray"
 			size="0 0 100% 100%"
-			border="true"
-			bordercolor="black"
 		/>
+		<image backcolor="0 0 0" size="0 0 100% 1"/>
+		<image backcolor="0 0 0" size="0 100%-1 100% 100%"/>
+		<image backcolor="0 0 0" size="0 0 1 100%"/>
+		<image backcolor="0 0 0" size="100%-1 0 100% 100%"/>
+	</sprite>
+	<sprite name="GrayBackground">
+		<image backcolor="darkgray"
+			size="0 0 100% 100%"
+		/>
+	</sprite>
+	<sprite name="BlackBorder">
+		<image backcolor="0 0 0" size="0 0 100% 1"/>
+		<image backcolor="0 0 0" size="0 100%-1 100% 100%"/>
+		<image backcolor="0 0 0" size="0 0 1 100%"/>
+		<image backcolor="0 0 0" size="100%-1 0 100% 100%"/>
 	</sprite>
 	<!--
 	==========================================
@@ -626,12 +684,26 @@
 			size="50%-10 50%-10 50%+11 50%+11"
 		/>
 	</sprite>
+	<sprite name="ModernSliderButtonDisabled">
+		<effect grayscale=""/>
+		<image texture="global/modern/tick-on.png"
+			real_texture_placement="0 0 27 27"
+			size="50%-10 50%-10 50%+11 50%+11"
+		/>
+	</sprite>
 	<sprite name="ModernSliderLine">
 		<image texture="global/modern/gold-separator.png"
 			real_texture_placement="0 0 806 1"
 			size="0 50%-1 100% 50%+1"
 		/>
 	</sprite>
+	<sprite name="ModernSliderLineDisabled">
+		<effect grayscale=""/>
+		<image texture="global/modern/gold-separator.png"
+			real_texture_placement="0 0 806 1"
+			size="0 50%-1 100% 50%+1"
+		/>
+	</sprite>
 
 	<sprite name="ModernArrowDownRed">
 		<effect add_color="123 53 53"/>

binaries/data/mods/mod/gui/common/modern/styles.xml

@@ -28,9 +28,10 @@
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
-		sprite="ModernDarkBoxGoldNoTop"
-		sprite_selectarea="ModernDarkBoxWhite"
-		sprite_heading="ModernDarkBoxGoldNoBottom"
+		sprite="ModernDarkBox"
+		sprite_overlay="ModernDarkBoxBottomGold"
+		sprite_selectarea="ModernDarkBox"
+		sprite_selectarea_overlay="ModernDarkBoxWhiteBorder"
 		textcolor="white"
 		textcolor_selected="white"
 		text_align="left"
@@ -41,8 +42,10 @@
 		font="sans-bold-stroke-14"
 		scrollbar="true"
 		scrollbar_style="ModernScrollBar"
-		sprite="ModernDarkBoxGoldNoTop"
-		sprite_selectarea="ModernDarkBoxWhite"
+		sprite="ModernDarkBox"
+		sprite_overlay="ModernDarkBoxBottomGold"
+		sprite_selectarea="ModernDarkBox"
+		sprite_selectarea_overlay="ModernDarkBoxWhiteBorder"
 		sprite_heading="ModernDarkBoxGoldNoBottom"
 		sprite_asc="ModernArrowUp"
 		sprite_desc="ModernArrowDown"
@@ -59,16 +62,20 @@
 		text_align="left"
 		text_valign="center"
 		button_width="16"
-		sprite="ModernDarkBoxGold"
-		sprite_disabled="ModernDarkBoxGoldDisabled"
+		sprite="ModernDarkBox"
+		sprite_disabled="ModernDarkBoxDisabled"
+		sprite_overlay="ModernDarkBoxGoldBorder"
+		sprite_overlay_disabled="ModernDarkBoxGoldBorderDisabled"
 		sprite2="ModernDropDownArrow"
 		sprite2_disabled="ModernDropDownArrowDisabled"
 		sprite2_pressed="ModernDropDownArrowHighlight"
 		buffer_zone="8"
 		dropdown_size="225"
 		minimum_visible_items="3"
-		sprite_list="BlackBorderOnGray"
-		sprite_selectarea="ModernDarkBoxWhite"
+		sprite_list="GrayBackground"
+		sprite_list_overlay="BlackBorder"
+		sprite_selectarea="ModernDarkBox"
+		sprite_selectarea_overlay="ModernDarkBoxWhiteBorder"
 		textcolor_selected="white"
 		textcolor_disabled="140 140 140 255"
 		scrollbar="true"
@@ -125,10 +132,12 @@
 		textcolor="white"
 		text_align="left"
 		text_valign="center"
-		sprite="ModernDarkBoxGold"
+		sprite="ModernDarkBox"
+		sprite_overlay="ModernDarkBoxGoldBorder"
 	/>
 	<style name="ModernInput"
-		sprite="ModernDarkBoxWhite"
+		sprite="ModernDarkBox"
+		sprite_overlay="ModernDarkBoxGoldBorder"
 		sprite_selectarea="color:150 0 0"
 		textcolor="white"
 		textcolor_selected="white"
@@ -143,7 +152,9 @@
 	/>
 	<style name="ModernSlider"
 		sprite="ModernSliderButton"
+		sprite_disabled="ModernSliderButtonDisabled"
 		sprite_bar="ModernSliderLine"
+		sprite_bar_disabled="ModernSliderLineDisabled"
 		button_width="20"
 		tooltip_style="tooltipInstant"
 		sound_pressed="audio/interface/ui/ui_button_click.ogg"

binaries/data/mods/mod/gui/common/utilities.js

@@ -0,0 +1,35 @@
+function distributeButtonsHorizontally(button, captions)
+{
+	const y1 = "100%-46";
+	const y2 = "100%-18";
+	switch (captions.length)
+	{
+	case 1:
+		button[0].size = "18 " + y1 + " 100%-18 " + y2;
+		break;
+	case 2:
+		button[0].size = "18 " + y1 + " 50%-5 " + y2;
+		button[1].size = "50%+5 " + y1 + " 100%-18 " + y2;
+		break;
+	case 3:
+		button[0].size = "18 " + y1 + " 33%-5 " + y2;
+		button[1].size = "33%+5 " + y1 + " 66%-5 " + y2;
+		button[2].size = "66%+5 " + y1 + " 100%-18 " + y2;
+		break;
+	}
+}
+
+function setButtonCaptionsAndVisibitily(button, captions, cancelHotkey, name)
+{
+	captions.forEach((caption, i) => {
+		button[i] = Engine.GetGUIObjectByName(name + (i + 1));
+		button[i].caption = caption;
+		button[i].hidden = false;
+		button[i].onPress = () => {
+			Engine.PopGuiPage(i);
+		};
+
+		if (i == 0)
+			cancelHotkey.onPress = button[i].onPress;
+	});
+}

binaries/data/mods/mod/gui/gui.rnc

@@ -1,291 +0,0 @@
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-##
-# 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
-##
-
-start = object | objects | setup | sprites | styles
-
-##
-# Types #
-##
-# xsd:boolean could be used instead of this definition,
-# though it considers "1" & "0" as valid values.
-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+%?)*" }
-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" },
-              xsd:integer { minInclusive = "0" maxInclusive = "255" },
-              xsd:integer { minInclusive = "0" maxInclusive = "255" },
-              xsd:integer { minInclusive = "0" maxInclusive = "255" }?}
-ccolor = rgba | xsd:string { pattern = "[A-Za-z]+" }
-size = list { xsd:decimal, xsd:decimal }
-pos = list { xsd:decimal, xsd:decimal }
-rect = list { xsd:decimal, xsd:decimal, xsd:decimal, xsd:decimal }
-
-##
-# Defines #
-##
-unique_settings =
-  attribute name { text }?,
-  [ a:defaultValue = "empty" ] attribute type { text }?,
-  attribute style { text }?
-# This could probably be made more specific/strict
-# with more information regarding the use/meaning
-# of these attributes.
-base_settings =
-  attribute absolute { bool }?&
-  attribute enable { bool }?&
-  attribute ghost { bool }?&
-  attribute hidden { bool }?&
-  attribute size { clientarea }?&
-  attribute z { xsd:decimal }?
-# Defaults are not put in here, because it ruins the concept of styles.
-ex_settings =
-  attribute anchor { valign }?&
-  attribute auto_scroll { bool }?&
-  attribute buffer_zone { xsd:decimal }?&
-  attribute buffer_width { xsd:decimal }?&
-  attribute button_width { xsd:decimal }?&
-  attribute checked { bool }?&
-  attribute clip { bool }?&
-  attribute dropdown_size { xsd:decimal }?&
-  attribute dropdown_buffer { xsd:decimal }?&
-  attribute minimum_visible_items { xsd:nonNegativeInteger }?&
-  attribute enabled { bool }?&
-  attribute font { text }?&
-  attribute format_x { text }?&
-  attribute format_y { text }?&
-  attribute fov_wedge_color { ccolor }?&
-  attribute hotkey { text }?&
-  attribute cell_id { xsd:integer }?&
-  attribute independent { bool }?&
-  attribute input_initvalue_destroyed_at_focus { bool }?&
-  attribute mask { bool }?&
-  attribute mask_char { xsd:string { minLength = "1" maxLength = "1" } }?&
-  attribute max_length { xsd:nonNegativeInteger }?&
-  attribute maxwidth { xsd:decimal }? &
-  attribute multiline { bool }?&
-  attribute offset { pos }?&
-  attribute placeholder_text { text }?&
-  attribute placeholder_color { ccolor }?&
-  attribute readonly { bool }?&
-  attribute scrollbar { bool }?&
-  attribute scrollbar_style { text }?&
-  attribute scroll_bottom { bool }?&
-  attribute scroll_top { bool }?&
-  attribute selected_column { text }?&
-  attribute selected_column_order { text }?&
-  attribute sortable { bool }?&
-  attribute sound_closed { text }?&
-  attribute sound_disabled { text }?&
-  attribute sound_enter { text }?&
-  attribute sound_leave { text }?&
-  attribute sound_opened { text }?&
-  attribute sound_pressed { text }?&
-  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 }?&
-  attribute sprite2_pressed { text }?&
-  attribute sprite_selectarea { text }?&
-  attribute square_side { xsd:decimal }?&
-  attribute textcolor { ccolor }?&
-  attribute textcolor_disabled { ccolor }?&
-  attribute textcolor_over { ccolor }?&
-  attribute textcolor_pressed { ccolor }?&
-  attribute textcolor_selected { ccolor }?&
-  attribute text_align { align }?&
-  attribute text_valign { valign }?&
-  attribute tooltip { text }?&
-  attribute tooltip_style { text }?
-
-##
-# Objects #
-##
-objects = element objects { (script | object)* }
-script =
-  element script {
-    text &
-    attribute file { text }? &
-    attribute directory { text }?
-  }
-object =
-  element object {
-    ((object
-      | action
-      | \attribute
-      | column
-      | \include
-      | item
-      | repeat
-      | script
-      | translatableAttribute)*
-      | text),
-    unique_settings,
-    base_settings,
-    ex_settings
-  }
-action =
-  element action {
-    text,
-    attribute on { text },
-    attribute file { text }?
-  }
-\attribute =
-  element attribute {
-    (keep | translate)*,
-    attribute id { text }
-  }
-column =
-  element column {
-    translatableAttribute?,
-    (
-    attribute id { text }&
-    attribute color { ccolor }?&
-    attribute heading { text }?&
-    attribute width { text }?&
-    attribute hidden { bool }?
-    )
-  }
-\include =
-  element include {
-    attribute file { text }|
-    attribute directory { text }
-}
-item =
-  element item {
-    text,
-    attribute enabled { bool }?
-  }
-keep = element keep { text }
-repeat =
-  element repeat {
-    object+,
-    attribute count { xsd:nonNegativeInteger },
-    attribute var { text }?
-  }
-translate = element translate { text }
-translatableAttribute =
-  element translatableAttribute {
-    text,
-    (
-    attribute id { text }&
-    attribute comment { text }?&
-    attribute context { text }?
-    )
-  }
-
-##
-# Styles #
-##
-styles = element styles { style* }
-style =
-  element style {
-    attribute name { text },
-    base_settings,
-    ex_settings
-  }
-
-##
-# Setup #
-##
-setup = element setup { (icon | scrollbar | tooltip | color)* }
-scrollbar =
-  element scrollbar {
-    attribute name { text }&
-    attribute width { xsd:decimal }&
-    attribute alwaysshown { bool }?&
-    attribute maximum_bar_size { xsd:decimal }?&
-    attribute minimum_bar_size { xsd:decimal }?&
-    attribute scroll_wheel { bool }?&
-    attribute show_edge_buttons { bool }?&
-    attribute sprite_button_top { text }?&
-    attribute sprite_button_top_pressed { text }?&
-    attribute sprite_button_top_disabled { text }?&
-    attribute sprite_button_top_over { text }?&
-    attribute sprite_button_bottom { text }?&
-    attribute sprite_button_bottom_pressed { text }?&
-    attribute sprite_button_bottom_disabled { text }?&
-    attribute sprite_button_bottom_over { text }?&
-    attribute sprite_bar_vertical { text }?&
-    attribute sprite_bar_vertical_over { text }?&
-    attribute sprite_bar_vertical_pressed { text }?&
-    attribute sprite_back_vertical { text }?
-  }
-icon =
-  element icon {
-    attribute name { text }&
-    attribute size { size }&
-    attribute sprite { text }&
-    attribute cell_id { text }?
-  }
-tooltip =
-  element tooltip {
-    attribute name { text }&
-    attribute sprite { text }?&
-    attribute anchor { valign }?&
-    attribute axis_color { ccolor }?&
-    attribute axis_width { xsd:decimal { minInclusive = "0" } }?&
-    attribute buffer_zone { xsd:decimal }?&
-    attribute font { text }?&
-    attribute maxwidth { xsd:decimal }?&
-    attribute offset { pos }?&
-    attribute textcolor { ccolor }?&
-    attribute delay { xsd:integer }?&
-    attribute use_object { text }?&
-    attribute hide_object { bool }?
-  }
-color =
-  element color {
-    rgba,
-    attribute name { text }
-  }
-
-##
-# Sprites #
-##
-sprites = element sprites { sprite* }
-sprite =
-  element sprite {
-    (effect?, image+),
-    attribute name { text }
-  }
-image =
-  element image {
-    effect?,
-    (
-    attribute texture { text }?&
-    attribute size { clientarea }?&
-    attribute texture_size { clientarea }?&
-    attribute real_texture_placement { rect }?&
-    attribute cell_size { size }?&
-    attribute backcolor { ccolor }?&
-    attribute bordercolor { ccolor }?&
-    attribute border { bool }?&
-    attribute z_level { xsd:float }?&
-    attribute fixed_h_aspect_ratio { xsd:decimal }?&
-    attribute round_coordinates { bool }?&
-    attribute wrap_mode { wrapmode }?
-    )
-  }
-effect =
-  element effect {
-    attribute add_color { ccolor }?,
-    attribute grayscale { empty }?
-  }

binaries/data/mods/mod/gui/gui.rng

@@ -1,12 +1,6 @@
 <?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">
   <start>
-    <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/>
     <choice>
       <ref name="object"/>
       <ref name="objects"/>
@@ -236,6 +230,41 @@
           <ref name="bool"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="flare_texture_count">
+          <data type="nonNegativeInteger"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="flare_render_size">
+          <data type="nonNegativeInteger"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="flare_animation_speed">
+          <data type="decimal"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="flare_interleave">
+          <ref name="bool"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="flare_lifetime_seconds">
+          <data type="decimal"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="flare_start_fade_seconds">
+          <data type="decimal"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="flare_stop_fade_seconds">
+          <data type="decimal"/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="font"/>
       </optional>
@@ -253,11 +282,6 @@
       <optional>
         <attribute name="hotkey"/>
       </optional>
-      <optional>
-        <attribute name="cell_id">
-          <data type="integer"/>
-        </attribute>
-      </optional>
       <optional>
         <attribute name="independent">
           <ref name="bool"/>
@@ -273,6 +297,11 @@
           <ref name="bool"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="mouse_event_mask">
+          <text/>
+        </attribute>
+      </optional>
       <optional>
         <attribute name="mask_char">
           <data type="string">
@@ -366,13 +395,13 @@
         <attribute name="sprite_asc"/>
       </optional>
       <optional>
-        <attribute name="sprite_heading"/>
+        <attribute name="sprite_background"/>
       </optional>
       <optional>
         <attribute name="sprite_bar"/>
       </optional>
       <optional>
-        <attribute name="sprite_background"/>
+        <attribute name="sprite_bar_disabled"/>
       </optional>
       <optional>
         <attribute name="sprite_desc"/>
@@ -380,9 +409,15 @@
       <optional>
         <attribute name="sprite_disabled"/>
       </optional>
+      <optional>
+        <attribute name="sprite_heading"/>
+      </optional>
       <optional>
         <attribute name="sprite_list"/>
       </optional>
+      <optional>
+        <attribute name="sprite_list_overlay"/>
+      </optional>
       <optional>
         <attribute name="sprite2_disabled"/>
       </optional>
@@ -392,6 +427,12 @@
       <optional>
         <attribute name="sprite_over"/>
       </optional>
+      <optional>
+        <attribute name="sprite_overlay"/>
+      </optional>
+      <optional>
+        <attribute name="sprite_overlay_disabled"/>
+      </optional>
       <optional>
         <attribute name="sprite2_over"/>
       </optional>
@@ -404,6 +445,9 @@
       <optional>
         <attribute name="sprite_selectarea"/>
       </optional>
+      <optional>
+        <attribute name="sprite_selectarea_overlay"/>
+      </optional>
       <optional>
         <attribute name="square_side">
           <data type="decimal"/>
@@ -721,9 +765,6 @@
           <ref name="size"/>
         </attribute>
         <attribute name="sprite"/>
-        <optional>
-          <attribute name="cell_id"/>
-        </optional>
       </interleave>
     </element>
   </define>
@@ -831,31 +872,11 @@
             <ref name="rect"/>
           </attribute>
         </optional>
-        <optional>
-          <attribute name="cell_size">
-            <ref name="size"/>
-          </attribute>
-        </optional>
         <optional>
           <attribute name="backcolor">
             <ref name="ccolor"/>
           </attribute>
         </optional>
-        <optional>
-          <attribute name="bordercolor">
-            <ref name="ccolor"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="border">
-            <ref name="bool"/>
-          </attribute>
-        </optional>
-        <optional>
-          <attribute name="z_level">
-            <data type="float"/>
-          </attribute>
-        </optional>
         <optional>
           <attribute name="fixed_h_aspect_ratio">
             <data type="decimal"/>

binaries/data/mods/mod/gui/gui_page.rnc

@@ -1,11 +0,0 @@
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-##
-# 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
-##
-
-element page {
-  element include {
-    text
-  }*
-}

binaries/data/mods/mod/gui/gui_page.rng

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <element name="page" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0">
-  <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="include">
       <text/>

binaries/data/mods/mod/gui/incompatible_mods/incompatible_mods.js

@@ -0,0 +1,11 @@
+var g_IncompatibleModsFile = "gui/incompatible_mods/incompatible_mods.txt";
+
+function init(data)
+{
+	Engine.GetGUIObjectByName("mainText").caption = Engine.TranslateLines(Engine.ReadFile(g_IncompatibleModsFile));
+}
+
+function closePage()
+{
+	Engine.PopGuiPage();
+}

binaries/data/mods/mod/gui/incompatible_mods/incompatible_mods.txt

@@ -0,0 +1,6 @@
+[font="sans-bold-20"]You tried to start the game with incompatible or missing mods![/font]
+[font="sans-16"]
+Solve the compatibility issue by disabling invalid mods or enabling required dependencies. You can then save & start the game.
+
+Incompatible mods will appear in red in the list of enabled mods (bottom panel). Dependencies can be added by enabling them in the upper panel.
+[/font]

binaries/data/mods/mod/gui/incompatible_mods/incompatible_mods.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<objects>
+	<script directory="gui/common/"/>
+	<script directory="gui/incompatible_mods/"/>
+
+	<!-- Add a translucent black background to fade out the menu page -->
+	<object type="image" sprite="ModernFade"/>
+
+	<object type="image" style="ModernDialog" size="50%-350 50%-200 50%+350 50%+200">
+
+		<object type="text" style="ModernLabelText" size="50%-128 -18 50%+128 14">
+			<translatableAttribute id="caption">Incompatible mods</translatableAttribute>
+		</object>
+
+		<object name="mainText" type="text" style="ModernTextPanel" size="20 20 100%-20 100%-52">
+		</object>
+
+		<object name="btnClose" type="button" style="ModernButtonRed" size="18 100%-45 100%-18 100%-17" hotkey="cancel">
+			<translatableAttribute id="caption">Ok</translatableAttribute>
+			<action on="Press">closePage();</action>
+		</object>
+
+	</object>
+</objects>

binaries/data/mods/mod/gui/modio/modio.xml

@@ -32,6 +32,7 @@
 			>
 				<action on="Press">displayMods();</action>
 				<action on="TextEdit">displayMods();</action>
+				<translatableAttribute id="placeholder_text" context="placeholder text for input field to filter mods">Filter</translatableAttribute>
 			</object>
 
 			<object name="modsAvailableList"

binaries/data/mods/mod/gui/modmod/modmod.js

@@ -6,7 +6,7 @@
  * A mod is defined by a mod.json file, for example
  *	{
  *		"name": "0ad",
- *		"version": "0.0.24",
+ *		"version": "0.0.26",
  *		"label": "0 A.D. - Empires Ascendant",
  *		"url": "https://wildfiregames.com/",
  *		"description": "A free, open-source, historical RTS game.",
@@ -19,7 +19,7 @@
  *		"label": "Mod 2",
  *		"version": "1.1",
  *		"description": "",
- *		"dependencies": ["0ad<=0.0.24", "rote"]
+ *		"dependencies": ["0ad<=0.0.26", "rote"]
  *	}
  *
  * A mod is identified by the directory name.
@@ -51,11 +51,27 @@ var g_ModsDisabled = [];
 var g_ModsEnabledFiltered = [];
 var g_ModsDisabledFiltered = [];
 
+/**
+ * Cache mod compatibility recomputed when some mod is enbaled/disabled.
+ */
+var g_ModsCompatibility = [];
+
 /**
  * Name of the mods installed by the ModInstaller.
  */
 var g_InstalledMods;
 
+var g_HasIncompatibleMods;
+
+var g_FakeMod = {
+	"name": translate("This mod does not exist"),
+	"version": "",
+	"label": "",
+	"url": "",
+	"description": "",
+	"dependencies": []
+};
+
 var g_ColorNoModSelected = "255 255 100";
 var g_ColorDependenciesMet = "100 255 100";
 var g_ColorDependenciesNotMet = "255 100 100";
@@ -63,15 +79,19 @@ var g_ColorDependenciesNotMet = "255 100 100";
 function init(data, hotloadData)
 {
 	g_InstalledMods = data && data.installedMods || hotloadData && hotloadData.installedMods || [];
+	g_HasIncompatibleMods = Engine.HasIncompatibleMods();
 
 	initMods();
 	initGUIButtons(data);
+	if (g_HasIncompatibleMods)
+		Engine.PushGuiPage("page_incompatible_mods.xml", {});
 }
 
 function initMods()
 {
 	loadMods();
 	loadEnabledMods();
+	recomputeCompatibility();
 	validateMods();
 	initGUIFilters();
 }
@@ -87,9 +107,21 @@ function loadMods()
 	deepfreeze(g_Mods);
 }
 
+/**
+ * Return fake mod for mods which do not exist
+*/
+function getMod(folder)
+{
+	return !!g_Mods[folder] ? g_Mods[folder] : g_FakeMod;
+}
+
 function loadEnabledMods()
 {
-	g_ModsEnabled = Engine.ConfigDB_GetValue("user", "mod.enabledmods").split(/\s+/).filter(folder => !!g_Mods[folder]);
+	if (g_HasIncompatibleMods)
+		g_ModsEnabled = Engine.GetEnabledMods().concat(Engine.GetIncompatibleMods())
+			.filter(folder => folder != "mod");
+	else
+		g_ModsEnabled = Engine.GetEnabledMods().filter(folder => !!g_Mods[folder]);
 	g_ModsDisabled = Object.keys(g_Mods).filter(folder => g_ModsEnabled.indexOf(folder) == -1);
 	g_ModsEnabledFiltered = g_ModsEnabled;
 	g_ModsDisabledFiltered = g_ModsDisabled;
@@ -104,6 +136,7 @@ function validateMods()
 function initGUIFilters()
 {
 	Engine.GetGUIObjectByName("negateFilter").checked = false;
+	Engine.GetGUIObjectByName("modCompatibleFilter").checked = true;
 
 	displayModLists();
 }
@@ -111,9 +144,11 @@ function initGUIFilters()
 function initGUIButtons(data)
 {
 	// Either get back to the previous page or quit if there is no previous page
-	let cancelButton = !data || data.cancelbutton;
-	Engine.GetGUIObjectByName("cancelButton").hidden = !cancelButton;
-	Engine.GetGUIObjectByName("quitButton").hidden = cancelButton;
+	let hasPreviousPage = !data || data.cancelbutton || false;
+	Engine.GetGUIObjectByName("cancelButton").hidden = !hasPreviousPage;
+	Engine.GetGUIObjectByName("quitButton").hidden = hasPreviousPage;
+	// Turn 'save' off, it will be enabled on any change.
+	Engine.GetGUIObjectByName("saveConfigurationButton").enabled = false;
 	Engine.GetGUIObjectByName("toggleModButton").caption = translateWithContext("mod activation", "Enable");
 }
 
@@ -122,43 +157,47 @@ function saveMods()
 	sortEnabledMods();
 	Engine.ConfigDB_CreateValue("user", "mod.enabledmods", ["mod"].concat(g_ModsEnabled).join(" "));
 	Engine.ConfigDB_WriteFile("user", "config/user.cfg");
+
+	Engine.GetGUIObjectByName("saveConfigurationButton").enabled = false;
 }
 
 function startMods()
 {
-	sortEnabledMods();
-	Engine.SetMods(["mod"].concat(g_ModsEnabled));
-	Engine.RestartEngine();
+	saveMods();
+	if (!Engine.SetModsAndRestartEngine(["mod"].concat(g_ModsEnabled)))
+		Engine.GetGUIObjectByName("message").caption = coloredText(translate('Dependencies not met'), g_ColorDependenciesNotMet);
 }
 
 function displayModLists()
 {
-	g_ModsEnabledFiltered = displayModList("modsEnabledList", g_ModsEnabled);
-	g_ModsDisabledFiltered = displayModList("modsDisabledList", g_ModsDisabled);
+	g_ModsEnabledFiltered = displayModList("modsEnabledList", g_ModsEnabled, true);
+	g_ModsDisabledFiltered = displayModList("modsDisabledList", g_ModsDisabled, false);
 }
 
-function displayModList(listObjectName, folders)
+function displayModList(listObjectName, folders, enabled)
 {
 	let listObject = Engine.GetGUIObjectByName(listObjectName);
 
 	if (listObjectName == "modsDisabledList")
 	{
-		let sortFolder = folder => String(g_Mods[folder][listObject.selected_column] || folder);
+		let sortFolder = folder => String(getMod(folder)[listObject.selected_column] || folder);
 		folders.sort((folder1, folder2) =>
 			listObject.selected_column_order *
 			sortFolder(folder1).localeCompare(sortFolder(folder2)));
 	}
 
 	folders = folders.filter(filterMod);
+	if (!enabled && Engine.GetGUIObjectByName("modCompatibleFilter").checked)
+		folders = folders.filter(folder => g_ModsCompatibility[folder]);
 
 	let selected = listObject.selected !== -1 ? listObject.list_name[listObject.selected] : null;
 
-	listObject.list_name = folders.map(folder => g_Mods[folder].name).map(name => g_InstalledMods.indexOf(name) == -1 ? name : coloredText(name, "green"));
-	listObject.list_folder = folders;
-	listObject.list_label = folders.map(folder => g_Mods[folder].label);
-	listObject.list_url = folders.map(folder => g_Mods[folder].url || "");
-	listObject.list_version = folders.map(folder => g_Mods[folder].version);
-	listObject.list_dependencies = folders.map(folder => g_Mods[folder].dependencies.join(" "));
+	listObject.list_name = folders.map(folder => colorMod(folder, getMod(folder).name || "", enabled));
+	listObject.list_folder = folders.map(folder => colorMod(folder, folder, enabled));
+	listObject.list_label = folders.map(folder => colorMod(folder, getMod(folder).label || "", enabled));
+	listObject.list_url = folders.map(folder => colorMod(folder, getMod(folder).url || "", enabled));
+	listObject.list_version = folders.map(folder => colorMod(folder, getMod(folder).version || "", enabled));
+	listObject.list_dependencies = folders.map(folder => colorMod(folder, getMod(folder)?.dependencies.join(" ") || "", enabled));
 	listObject.list = folders;
 
 	listObject.selected = selected ? listObject.list_name.indexOf(selected) : -1;
@@ -166,6 +205,21 @@ function displayModList(listObjectName, folders)
 	return folders;
 }
 
+function getModColor(folder, enabled)
+{
+	if (!g_ModsCompatibility[folder])
+		return enabled ? g_ColorDependenciesNotMet : "gray";
+	if (g_InstalledMods.indexOf(getMod(folder).name) != -1)
+		return "green";
+	return false;
+}
+
+function colorMod(folder, text, enabled)
+{
+	let color = getModColor(folder, enabled);
+	return color ? coloredText(text, color) : text;
+}
+
 function reloadDisabledMods()
 {
 	g_ModsDisabled = Object.keys(g_Mods).filter(folder => g_ModsEnabled.indexOf(folder) == -1);
@@ -176,16 +230,20 @@ function enableMod()
 	let modsDisabledList = Engine.GetGUIObjectByName("modsDisabledList");
 	let pos = modsDisabledList.selected;
 
-	if (pos == -1 || !areDependenciesMet(g_ModsDisabledFiltered[pos]))
+	if (pos == -1 || !g_ModsCompatibility[g_ModsDisabledFiltered[pos]])
 		return;
 
 	g_ModsEnabled.push(g_ModsDisabledFiltered.splice(pos, 1)[0]);
 	reloadDisabledMods();
+	recomputeCompatibility();
+
+	Engine.GetGUIObjectByName("saveConfigurationButton").enabled = true;
 
 	if (pos >= g_ModsDisabledFiltered.length)
 		--pos;
 
 	displayModLists();
+	Engine.GetGUIObjectByName("message").caption = "";
 	modsDisabledList.selected = pos;
 }
 
@@ -205,7 +263,8 @@ function disableMod()
 			break;
 		}
 
-	g_ModsDisabled.push(disabledMod);
+	if (!!g_Mods[disabledMod])
+		g_ModsDisabled.push(disabledMod);
 
 	// Remove mods that required the removed mod and cascade
 	// Sort them, so we know which ones can depend on the removed mod
@@ -214,53 +273,35 @@ function disableMod()
 	sortEnabledMods();
 
 	for (let i = 0; i < g_ModsEnabled.length; ++i)
-		if (!areDependenciesMet(g_ModsEnabled[i]))
+		if (!areDependenciesMet(g_ModsEnabled[i], true))
 		{
 			g_ModsDisabled.push(g_ModsEnabled.splice(i, 1)[0]);
 			--i;
 		}
 
+	Engine.GetGUIObjectByName("saveConfigurationButton").enabled = true;
+
+	recomputeCompatibility(true);
 	displayModLists();
+	Engine.GetGUIObjectByName("message").caption = "";
 	modsEnabledList.selected = Math.min(pos, g_ModsEnabledFiltered.length - 1);
 }
 
-function applyFilters()
-{
-	// Save selected rows
-	let modsDisabledList = Engine.GetGUIObjectByName("modsDisabledList");
-	let modsEnabledList = Engine.GetGUIObjectByName("modsEnabledList");
-
-	let selectedDisabledFolder = modsDisabledList.list_folder[modsDisabledList.selected];
-	let selectedEnabledFolder = modsEnabledList.list_folder[modsEnabledList.selected];
-
-	// Remove selected rows to prevent a link to a non existing item
-	modsDisabledList.selected = -1;
-	modsEnabledList.selected = -1;
-
-	displayModLists();
-
-	// Restore previously selected rows
-	modsDisabledList.selected = modsDisabledList.list_folder.indexOf(selectedDisabledFolder);
-	modsEnabledList.selected = modsEnabledList.list_folder.indexOf(selectedEnabledFolder);
-
-	Engine.GetGUIObjectByName("globalModDescription").caption = "";
-}
-
 function filterMod(folder)
 {
-	let mod = g_Mods[folder];
+	let mod = getMod(folder);
 
 	let negateFilter = Engine.GetGUIObjectByName("negateFilter").checked;
 	let searchText = Engine.GetGUIObjectByName("modGenericFilter").caption;
 
 	if (searchText &&
 	    folder.indexOf(searchText) == -1 &&
-	    mod.name.indexOf(searchText) == -1 &&
-	    mod.label.indexOf(searchText) == -1 &&
+	    (mod.name || "").indexOf(searchText) == -1 &&
+	    (mod.label || "").indexOf(searchText) == -1 &&
 	    (mod.url || "").indexOf(searchText) == -1 &&
-	    mod.version.indexOf(searchText) == -1 &&
-	    mod.description.indexOf(searchText) == -1 &&
-	    mod.dependencies.indexOf(searchText) == -1)
+	    (mod.version || "").indexOf(searchText) == -1 &&
+	    (mod.description || "").indexOf(searchText) == -1 &&
+	    (mod.dependencies || "").indexOf(searchText) == -1)
 		return negateFilter;
 
 	return !negateFilter;
@@ -271,12 +312,6 @@ function closePage()
 	Engine.SwitchGuiPage("page_pregame.xml", {});
 }
 
-function areFilters()
-{
-	let searchText = Engine.GetGUIObjectByName("modGenericFilter").caption;
-	return searchText && searchText != translate("Filter");
-}
-
 /**
  * Moves an item in the list up or down.
  */
@@ -285,7 +320,7 @@ function moveCurrItem(objectName, up)
 	// Prevent moving while filters are applied
 	// because we would need to map filtered positions
 	// to not filtered positions so changes will persist.
-	if (areFilters())
+	if (Engine.GetGUIObjectByName("modGenericFilter").caption)
 		return;
 
 	let obj = Engine.GetGUIObjectByName(objectName);
@@ -302,30 +337,34 @@ function moveCurrItem(objectName, up)
 	g_ModsEnabled[idx] = g_ModsEnabled[idx2];
 	g_ModsEnabled[idx2] = tmp;
 
-	g_ModsEnabledFiltered = displayModList("modsEnabledList", g_ModsEnabled);
+	g_ModsEnabledFiltered = displayModList("modsEnabledList", g_ModsEnabled, true);
 	obj.selected = idx2;
 }
 
-function areDependenciesMet(folder)
+function areDependenciesMet(folder, disabledAction = false)
 {
-	let guiObject = Engine.GetGUIObjectByName("message");
-
-	for (let dependency of g_Mods[folder].dependencies)
-	{
-		if (isDependencyMet(dependency))
-			continue;
-
-		guiObject.caption = coloredText(
-			sprintf(translate('Dependency not met: %(dep)s'), { "dep": dependency }),
-			g_ColorDependenciesNotMet);
+	// If we disabled mod it will not change satus of incompatible mods
+	if (disabledAction && !g_ModsCompatibility[folder])
+		return g_ModsCompatibility[folder];
 
+	if (!g_Mods[folder])
 		return false;
+
+	for (let dependency of getMod(folder).dependencies)
+	{
+		if (!isDependencyMet(dependency))
+			return false;
 	}
 
-	guiObject.caption = coloredText(translate('All dependencies met'), g_ColorDependenciesMet);
 	return true;
 }
 
+function recomputeCompatibility(disabledAction = false)
+{
+	for (let mod in g_Mods)
+		g_ModsCompatibility[mod] = areDependenciesMet(mod, disabledAction);
+}
+
 /**
  * @param dependency is a mod name or a mod version comparison.
  */
@@ -335,8 +374,8 @@ function isDependencyMet(dependency)
 	let [name, version] = operator ? dependency.split(operator[0]) : [dependency, undefined];
 
 	return g_ModsEnabled.some(folder =>
-		g_Mods[folder].name == name &&
-		(!operator || versionSatisfied(g_Mods[folder].version, operator[0], version)));
+		getMod(folder).name == name &&
+		(!operator || versionSatisfied(getMod(folder).version, operator[0], version)));
 }
 
 /**
@@ -380,42 +419,49 @@ function sortEnabledMods()
 {
 	let dependencies = {};
 	for (let folder of g_ModsEnabled)
-		dependencies[folder] = g_Mods[folder].dependencies.map(d => d.split(g_RegExpComparisonOperator)[0]);
+		dependencies[folder] = getMod(folder).dependencies.map(d => d.split(g_RegExpComparisonOperator)[0]);
 
 	g_ModsEnabled.sort((folder1, folder2) =>
-		dependencies[folder1].indexOf(g_Mods[folder2].name) != -1 ? 1 :
-			dependencies[folder2].indexOf(g_Mods[folder1].name) != -1 ? -1 : 0);
+		dependencies[folder1].indexOf(getMod(folder2).name) != -1 ? 1 :
+			dependencies[folder2].indexOf(getMod(folder1).name) != -1 ? -1 : 0);
 
-	g_ModsEnabledFiltered = displayModList("modsEnabledList", g_ModsEnabled);
+	g_ModsEnabledFiltered = displayModList("modsEnabledList", g_ModsEnabled, true);
 }
 
 function selectedMod(listObjectName)
 {
 	let listObject = Engine.GetGUIObjectByName(listObjectName);
-	let otherListObject = Engine.GetGUIObjectByName(listObjectName == "modsDisabledList" ?
+	let isPickedDisabledList = listObjectName == "modsDisabledList";
+	let otherListObject = Engine.GetGUIObjectByName(isPickedDisabledList ?
 		"modsEnabledList" : "modsDisabledList");
 
 	let toggleModButton = Engine.GetGUIObjectByName("toggleModButton");
-	let modSelected = listObject.selected != -1;
-
-	if (modSelected)
+	let isModSelected = listObject.selected != -1;
+	if (isModSelected)
 	{
 		otherListObject.selected = -1;
-		toggleModButton.onPress = listObjectName == "modsDisabledList" ? enableMod : disableMod;
+		toggleModButton.onPress = isPickedDisabledList ? enableMod : disableMod;
 	}
 
-	Engine.GetGUIObjectByName("visitWebButton").enabled = modSelected && !!getSelectedModUrl();
-	toggleModButton.caption = listObjectName == "modsDisabledList" ?
+	const isFiltering = Engine.GetGUIObjectByName("modGenericFilter").caption;
+	Engine.GetGUIObjectByName("visitWebButton").enabled = isModSelected && !!getSelectedModUrl();
+	toggleModButton.caption = isPickedDisabledList ?
 		translateWithContext("mod activation", "Enable") :
 		translateWithContext("mod activation", "Disable");
-	toggleModButton.enabled = modSelected;
-	Engine.GetGUIObjectByName("enabledModUp").enabled = modSelected && listObjectName == "modsEnabledList" && !areFilters();
-	Engine.GetGUIObjectByName("enabledModDown").enabled = modSelected && listObjectName == "modsEnabledList" && !areFilters();
+	toggleModButton.enabled = isPickedDisabledList ? isModSelected && g_ModsCompatibility[listObject.list[listObject.selected]] || false : isModSelected;
+	Engine.GetGUIObjectByName("enabledModUp").enabled = isModSelected && listObjectName == "modsEnabledList" && !isFiltering;
+	Engine.GetGUIObjectByName("enabledModDown").enabled = isModSelected && listObjectName == "modsEnabledList" && !isFiltering;
 
 	Engine.GetGUIObjectByName("globalModDescription").caption =
 		listObject.list[listObject.selected] ?
-			g_Mods[listObject.list[listObject.selected]].description :
+			getMod(listObject.list[listObject.selected]).description :
 			'[color="' + g_ColorNoModSelected + '"]' + translate("No mod has been selected.") + '[/color]';
+
+	if (!g_ModsEnabled.length)
+		Engine.GetGUIObjectByName("message").caption = coloredText(translate('Enable at least 0ad mod'), g_ColorDependenciesNotMet);
+	if (!Engine.GetGUIObjectByName("startButton").hidden)
+		Engine.GetGUIObjectByName("startButton").enabled = g_ModsEnabled.length > 0;
+
 }
 
 /**
@@ -427,8 +473,8 @@ function getSelectedModUrl()
 	let modsDisabledList = Engine.GetGUIObjectByName("modsDisabledList");
 
 	let list = modsEnabledList.selected == -1 ? modsDisabledList : modsEnabledList;
-	let folder = list.list_folder[list.selected];
-	return folder && g_Mods[folder] && g_Mods[folder].url || undefined;
+	let folder = list.list[list.selected];
+	return folder && getMod(folder) && getMod(folder).url || undefined;
 }
 
 function visitModWebsite()

binaries/data/mods/mod/gui/modmod/modmod.xml

@@ -19,8 +19,8 @@
 				style="ModernInput"
 				size="16 0 176 100%"
 			>
-				<action on="Press">applyFilters();</action>
-				<action on="TextEdit">applyFilters();</action>
+				<action on="Press">displayModLists();</action>
+				<action on="TextEdit">displayModLists();</action>
 				<translatableAttribute id="placeholder_text">Filter</translatableAttribute>
 			</object>
 
@@ -31,13 +31,27 @@
 				style="ModernTickBox"
 				size="186 0 206 100%"
 			>
-				<action on="Press">applyFilters();</action>
+				<action on="Press">displayModLists();</action>
 			</object>
 			<object type="text" size="208 0 100% 100%" text_align="left" textcolor="white">
 				<translatableAttribute id="caption">Negate</translatableAttribute>
 			</object>
 		</object>
 
+		<object size = "100%-200 40 100%-20 64">
+			<object name="modCompatibleFilter"
+						type="checkbox"
+						checked="false"
+						style="ModernTickBox"
+						size="16 0 36 100%"
+					>
+					<action on="Press">displayModLists();</action>
+				</object>
+				<object type="text" size="40 0 100% 100%" text_align="left" textcolor="white">
+					<translatableAttribute id="caption">Filter compatible</translatableAttribute>
+				</object>
+		</object>
+
 		<object
 			name="globalModDescription"
 			type="text"
@@ -67,7 +81,7 @@
 				auto_scroll="true"
 			>
 				<action on="SelectionChange">selectedMod(this.name);</action>
-				<action on="SelectionColumnChange">applyFilters();</action>
+				<action on="SelectionColumnChange">displayModLists();</action>
 				<action on="MouseLeftDoubleClickItem">enableMod();</action>
 
 				<!-- List headers -->
@@ -98,10 +112,11 @@
 
 			<object style="ModernLabelText" type="text" size="0 5 100% 25">
 				<translatableAttribute id="caption">Enabled Mods</translatableAttribute>
+				<translatableAttribute id="tooltip">Enabled mods are loaded from top to bottom. Mods loaded later might overwrite settings of mods loaded earlier. It is advisable to have more complex mods loaded last. Use the arrows on the right to change the loading order.</translatableAttribute>
 			</object>
 
 			<object name="modsEnabledList"
-				style="ModernList"
+				style="ModernSortedList"
 				type="olist"
 				size="0 25 100%-32-2-2 100%"
 				font="sans-stroke-13"
@@ -198,8 +213,8 @@
 			<action on="Press">saveMods();</action>
 		</object>
 
-		<object name="startModsButton" type="button" style="ModernButtonRed" size="100%-196 100%-44 100%-16 100%-16">
-			<translatableAttribute id="caption">Start Mods</translatableAttribute>
+		<object name="startButton" type="button" style="ModernButtonRed" size="100%-196 100%-44 100%-16 100%-16">
+			<translatableAttribute id="caption">Save and Restart</translatableAttribute>
 			<action on="Press">startMods();</action>
 		</object>
 	</object>

binaries/data/mods/mod/gui/modmod/validatemod.js

@@ -5,7 +5,7 @@ const g_ModProperties = {
 		"type": "string",
 		"validate": validateName
 	},
-	// example: "0.0.24"
+	// example: "0.0.26"
 	"version": {
 		"required": true,
 		"type": "string",
@@ -19,7 +19,7 @@ const g_ModProperties = {
 	},
 	// example: "0 A.D. - Empires Ascendant"
 	"label": {
-		"require": true,
+		"required": true,
 		"type": "string",
 		"validate": validateLabel
 	},

binaries/data/mods/mod/gui/msgbox/msgbox.js

@@ -24,37 +24,7 @@ function init(data)
 
 	let captions = data.buttonCaptions || [translate("OK")];
 
-	// Set button captions and visibility
 	let mbButton = [];
-	captions.forEach((caption, i) => {
-		mbButton[i] = Engine.GetGUIObjectByName("mbButton" + (i + 1));
-		mbButton[i].caption = caption;
-		mbButton[i].hidden = false;
-		mbButton[i].onPress = () => {
-			Engine.PopGuiPage(i);
-		};
-
-		// Convention: Cancel is the first button
-		if (i == 0)
-			mbCancelHotkey.onPress = mbButton[i].onPress;
-	});
-
-	// Distribute buttons horizontally
-	let y1 = "100%-46";
-	let y2 = "100%-18";
-	switch (captions.length)
-	{
-	case 1:
-		mbButton[0].size = "18 " + y1 + " 100%-18 " + y2;
-		break;
-	case 2:
-		mbButton[0].size = "18 " + y1 + " 50%-5 " + y2;
-		mbButton[1].size = "50%+5 " + y1 + " 100%-18 " + y2;
-		break;
-	case 3:
-		mbButton[0].size = "18 " + y1 + " 33%-5 " + y2;
-		mbButton[1].size = "33%+5 " + y1 + " 66%-5 " + y2;
-		mbButton[2].size = "66%+5 " + y1 + " 100%-18 " + y2;
-		break;
-	}
+	setButtonCaptionsAndVisibitily(mbButton, captions, mbCancelHotkey, "mbButton");
+	distributeButtonsHorizontally(mbButton, captions);
 }

binaries/data/mods/mod/gui/page_incompatible_mods.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
+
+	<include>modmod/styles.xml</include>
+	<include>incompatible_mods/incompatible_mods.xml</include>
+</page>

binaries/data/mods/mod/gui/page_timedconfirmation.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<page>
+	<include>common/modern/setup.xml</include>
+	<include>common/modern/styles.xml</include>
+	<include>common/modern/sprites.xml</include>
+
+	<include>timedconfirmation/timedconfirmation.xml</include>
+</page>

binaries/data/mods/mod/gui/timedconfirmation/timedconfirmation.js

@@ -0,0 +1,74 @@
+/**
+ * @class TimedConfirmation
+ * This class displays confirmation box, which will be closed after defined time in miliseconds.
+ */
+class TimedConfirmation
+{
+	/**
+	 * @param {Object} data
+	 * @param {Number} data.width - The width of the confirmation box
+	 * @param {Number} data.height - The height of the confirmation box
+	 * @param {String} data.message - The message to be displayed with parameter for time which will be displayed in seconds
+	 * @param {String} data.timeParameter - The string used in 'message' for time, e.g 'time' with %(time)s in message
+	 * @param {Number} data.timeout - The time in miliseconds after which confirmation box closes itself
+	 * @param {String} data.title - The string displayed in header
+	 * @param {String|undefined} data.buttonCaptions - The captions used for buttons (if not defined, defaults to 'OK')
+	 * @param {String|undefined} data.font - The used font
+	 */
+	constructor(data)
+	{
+		this.messageObject = Engine.GetGUIObjectByName("tmcText");
+		this.panel = Engine.GetGUIObjectByName("tmcMain");
+		this.panel.onTick = this.onTick.bind(this);
+		this.setup(data);
+	}
+
+	setup(data)
+	{
+		Engine.GetGUIObjectByName("tmcTitleBar").caption = data.title;
+
+		this.timeout = +data.timeout + Date.now();
+		this.message = data.message;
+		this.timeParameter = data.timeParameter;
+
+		if (data.font)
+			this.messageObject.font = data.font;
+
+		this.updateDisplayedTimer(data.timeout);
+
+		const cancelHotkey = Engine.GetGUIObjectByName("tmcCancelHotkey");
+		cancelHotkey.onPress = Engine.PopGuiPage;
+
+		const lRDiff = data.width / 2;
+		const uDDiff = data.height / 2;
+		this.panel.size = "50%-" + lRDiff + " 50%-" + uDDiff + " 50%+" + lRDiff + " 50%+" + uDDiff;
+
+		const captions = data.buttonCaptions || [translate("OK")];
+
+		const button = [];
+		setButtonCaptionsAndVisibitily(button, captions, cancelHotkey, "tmcButton");
+		distributeButtonsHorizontally(button, captions);
+	}
+
+	onTick()
+	{
+		const remaining = this.timeout - Date.now();
+		if (remaining < 1)
+			Engine.GetGUIObjectByName("tmcButton1").onPress();
+
+		this.updateDisplayedTimer(remaining);
+	}
+
+	updateDisplayedTimer(time)
+	{
+		this.messageObject.caption = sprintf(
+			this.message,
+			{ [this.timeParameter]: Math.ceil(time / 1000) }
+		);
+	}
+}
+
+function init(data)
+{
+	new TimedConfirmation(data);
+}

binaries/data/mods/mod/gui/timedconfirmation/timedconfirmation.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<objects>
+
+	<script directory="gui/common/"/>
+	<script directory="gui/timedconfirmation/"/>
+
+	<!-- Fade out the background because it's non-interactable -->
+	<object sprite="ModernFade" type="image"/>
+	<object name="tmcCancelHotkey" hotkey="cancel" />
+	<object name="tmcMain"
+			style="ModernDialog"
+			type="image"
+	>
+		<object name="tmcTitleBar"
+				style="ModernLabelText"
+				type="text"
+				size="50%-128 -18 50%+128 14"
+		/>
+		<object name="tmcTimerDisplay"
+				type="text"
+				style="ModernLabelText"
+				size="18 28 100%-18 38"
+		/>
+		<object name="tmcText"
+				type="text"
+				style="ModernLabelText"
+				size="18 40 100%-18 100%-64"
+		/>
+		<!-- The size of the following buttons is set dynamically in timedconfirmation.js -->
+		<object name="tmcButton1"
+				style="ModernButtonRed"
+				type="button"
+				hidden="true"
+		/>
+		<object name="tmcButton2"
+				style="ModernButtonRed"
+				type="button"
+				hidden="true"
+		/>
+		<object name="tmcButton3"
+				style="ModernButtonRed"
+				type="button"
+				hidden="true"
+		/>
+	</object>
+</objects>

binaries/data/mods/mod/hwdetect/hwdetect.js

@@ -1,4 +1,4 @@
-/* Copyright (C) 2020 Wildfire Games.
+/* Copyright (C) 2022 Wildfire Games.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -209,10 +209,10 @@ function RunDetection(settings)
 	var gfx_mem = settings.gfx_mem;
 
 	// Values from glGetString
-	var GL_VENDOR = settings.GL_VENDOR;
-	var GL_RENDERER = settings.GL_RENDERER;
-	var GL_VERSION = settings.GL_VERSION;
-	var GL_EXTENSIONS = settings.GL_EXTENSIONS.split(" ");
+	var GL_VENDOR = settings.renderer_backend.GL_VENDOR;
+	var GL_RENDERER = settings.renderer_backend.GL_RENDERER;
+	var GL_VERSION = settings.renderer_backend.GL_VERSION;
+	var GL_EXTENSIONS = settings.renderer_backend.GL_EXTENSIONS.split(" ");
 
 	// Enable GLSL on OpenGL 3+, which should be able to properly
 	// manage GLSL shaders, needed for effects like windy trees
@@ -340,6 +340,10 @@ function RunDetection(settings)
 
 global.RunHardwareDetection = function(settings)
 {
+	// Currently we don't have limitations for other backends than GL and GL ARB.
+	if (settings.renderer_backend.name != 'gl' && settings.renderer_backend.name != 'glarb')
+		return;
+
 	//print(JSON.stringify(settings, null, 1)+"\n");
 
 	var output = RunDetection(settings);

binaries/data/mods/mod/hwdetect/test.js

@@ -15,9 +15,9 @@ print("<th>Output");
 print("<th>Warnings");
 
 hwdetectTestData.sort(function(a, b) {
-	if (a.GL_RENDERER < b.GL_RENDERER)
+	if (a.renderer_backend.GL_RENDERER < b.renderer_backend.GL_RENDERER)
 		return -1;
-	if (b.GL_RENDERER < a.GL_RENDERER)
+	if (b.renderer_backend.GL_RENDERER < a.renderer_backend.GL_RENDERER)
 		return +1;
 	return 0;
 });
@@ -35,7 +35,7 @@ for (var settings of hwdetectTestData)
 
 	print("<tr>");
 	print("<td>" + os);
-	print("<td>" + settings.GL_RENDERER);
+	print("<td>" + settings.renderer_backend.GL_RENDERER);
 	print("<td>" + disabled.join(" "));
 	print("<td>" + output.warnings.concat(output.dialog_warnings).join("\n"));
 }

binaries/data/mods/mod/shaders/arb/canvas2d.fp

@@ -0,0 +1,27 @@
+!!ARBfp1.0
+
+TEMP colorTex;
+TEX colorTex, fragment.texcoord[0], texture[0], 2D;
+
+TEMP grayscale;
+MOV grayscale.r, 0.3;
+MOV grayscale.g, 0.59;
+MOV grayscale.b, 0.11;
+MOV grayscale.a, 0.0;
+
+PARAM colorAdd = program.local[1];
+PARAM colorMul = program.local[2];
+PARAM grayscaleFactor = program.local[3];
+
+TEMP colorGray;
+DP3 colorGray.rgb, colorTex, grayscale;
+MOV colorGray.a, colorTex.a;
+
+TEMP color;
+LRP color, grayscaleFactor.r, colorGray, colorTex;
+MUL color, color, colorMul;
+ADD color, color, colorAdd;
+
+MOV result.color, color;
+
+END

binaries/data/mods/mod/shaders/arb/canvas2d.vp

@@ -0,0 +1,16 @@
+!!ARBvp1.0
+
+PARAM transform[4] = { program.local[0..3] };
+
+TEMP position;
+
+DP4 position.x, transform[0], vertex.position;
+DP4 position.y, transform[1], vertex.position;
+MOV position.z, 0.0;
+MOV position.w, 1.0;
+
+MOV result.position, position;
+
+MOV result.texcoord[0], vertex.texcoord[0];
+
+END

binaries/data/mods/mod/shaders/arb/canvas2d.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="arb">
+
+    <vertex file="arb/canvas2d.vp">
+        <stream name="pos"/>
+        <stream name="uv0"/>
+        <uniform name="transform" loc="0" type="mat4"/>
+    </vertex>
+
+    <fragment file="arb/canvas2d.fp">
+        <uniform name="tex" loc="0" type="sampler2D"/>
+        <uniform name="colorAdd" loc="1" type="vec4"/>
+        <uniform name="colorMul" loc="2" type="vec4"/>
+        <uniform name="grayscaleFactor" loc="3" type="float"/>
+    </fragment>
+
+</program>

binaries/data/mods/mod/shaders/arb/gui_add.fp

@@ -1,15 +0,0 @@
-!!ARBfp1.0
-
-TEMP tex_color;
-TEX tex_color, fragment.texcoord[0], texture[0], 2D;
-
-PARAM add_color = program.local[1];
-
-TEMP color;
-MOV color, add_color;
-MAD color.rgb, color, tex_color.a, tex_color;
-MOV color.a, tex_color.a;
-
-MOV result.color, color;
-
-END

binaries/data/mods/mod/shaders/arb/gui_add.vp

@@ -1,16 +0,0 @@
-!!ARBvp1.0
-
-PARAM transform[4] = { program.local[0..3] };
-
-TEMP position;
-
-DP4 position.x, transform[0], vertex.position;
-DP4 position.y, transform[1], vertex.position;
-DP4 position.z, transform[2], vertex.position;
-MOV position.w, 1.0;
-
-MOV result.position, position;
-
-MOV result.texcoord[0], vertex.texcoord[0];
-
-END

binaries/data/mods/mod/shaders/arb/gui_add.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="arb">
-
-    <vertex file="arb/gui_add.vp">
-        <stream name="pos"/>
-        <stream name="uv0"/>
-        <uniform name="transform" loc="0" type="mat4"/>
-    </vertex>
-
-    <fragment file="arb/gui_add.fp">
-        <uniform name="tex" loc="0" type="sampler2D"/>
-        <uniform name="color" loc="1" type="vec4"/>
-    </fragment>
-
-</program>

binaries/data/mods/mod/shaders/arb/gui_basic.fp

@@ -1,5 +0,0 @@
-!!ARBfp1.0
-
-TEX result.color, fragment.texcoord[0], texture[0], 2D;
-
-END

binaries/data/mods/mod/shaders/arb/gui_basic.vp

@@ -1,16 +0,0 @@
-!!ARBvp1.0
-
-PARAM transform[4] = { program.local[0..3] };
-
-TEMP position;
-
-DP4 position.x, transform[0], vertex.position;
-DP4 position.y, transform[1], vertex.position;
-DP4 position.z, transform[2], vertex.position;
-MOV position.w, 1.0;
-
-MOV result.position, position;
-
-MOV result.texcoord[0], vertex.texcoord[0];
-
-END

binaries/data/mods/mod/shaders/arb/gui_basic.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="arb">
-
-    <vertex file="arb/gui_basic.vp">
-        <stream name="pos"/>
-        <stream name="uv0"/>
-        <uniform name="transform" loc="0" type="mat4"/>
-    </vertex>
-
-    <fragment file="arb/gui_basic.fp">
-        <uniform name="tex" loc="0" type="sampler2D"/>
-    </fragment>
-
-</program>

binaries/data/mods/mod/shaders/arb/gui_grayscale.fp

@@ -1,18 +0,0 @@
-!!ARBfp1.0
-
-TEMP tex_color;
-TEX tex_color, fragment.texcoord[0], texture[0], 2D;
-
-TEMP grayscale;
-MOV grayscale.r, 0.3;
-MOV grayscale.g, 0.59;
-MOV grayscale.b, 0.11;
-MOV grayscale.a, 0.0;
-
-TEMP color;
-DP3 color.rgb, tex_color, grayscale;
-MOV color.a, tex_color.a;
-
-MOV result.color, color;
-
-END

binaries/data/mods/mod/shaders/arb/gui_grayscale.vp

@@ -1,16 +0,0 @@
-!!ARBvp1.0
-
-PARAM transform[4] = { program.local[0..3] };
-
-TEMP position;
-
-DP4 position.x, transform[0], vertex.position;
-DP4 position.y, transform[1], vertex.position;
-DP4 position.z, transform[2], vertex.position;
-MOV position.w, 1.0;
-
-MOV result.position, position;
-
-MOV result.texcoord[0], vertex.texcoord[0];
-
-END

binaries/data/mods/mod/shaders/arb/gui_grayscale.xml

@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="arb">
-
-    <vertex file="arb/gui_grayscale.vp">
-        <stream name="pos"/>
-        <stream name="uv0"/>
-        <uniform name="transform" loc="0" type="mat4"/>
-    </vertex>
-
-    <fragment file="arb/gui_grayscale.fp">
-        <uniform name="tex" loc="0" type="sampler2D"/>
-    </fragment>
-
-</program>

binaries/data/mods/mod/shaders/arb/gui_solid.fp

@@ -1,7 +0,0 @@
-!!ARBfp1.0
-
-PARAM color = program.local[0];
-
-MOV result.color, color;
-
-END

binaries/data/mods/mod/shaders/arb/gui_solid.vp

@@ -1,14 +0,0 @@
-!!ARBvp1.0
-
-PARAM transform[4] = { program.local[0..3] };
-
-TEMP position;
-
-DP4 position.x, transform[0], vertex.position;
-DP4 position.y, transform[1], vertex.position;
-DP4 position.z, transform[2], vertex.position;
-MOV position.w, 1.0;
-
-MOV result.position, position;
-
-END

binaries/data/mods/mod/shaders/arb/gui_solid.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="arb">
-
-    <vertex file="arb/gui_solid.vp">
-        <uniform name="transform" loc="0" type="mat4"/>
-        <stream name="pos"/>
-    </vertex>
-
-    <fragment file="arb/gui_solid.fp">
-        <uniform name="color" loc="0" type="vec4"/>
-    </fragment>
-
-</program>

binaries/data/mods/mod/shaders/arb/gui_solid_mask.fp

@@ -1,14 +0,0 @@
-!!ARBfp1.0
-
-TEMP tex_color;
-TEX tex_color, fragment.texcoord[0], texture[0], 2D;
-
-PARAM add_color = program.local[1];
-
-TEMP color;
-MOV color, add_color;
-MUL color.a, color.a, tex_color.a;
-
-MOV result.color, color;
-
-END

binaries/data/mods/mod/shaders/arb/gui_solid_mask.vp

@@ -1,16 +0,0 @@
-!!ARBvp1.0
-
-PARAM transform[4] = { program.local[0..3] };
-
-TEMP position;
-
-DP4 position.x, transform[0], vertex.position;
-DP4 position.y, transform[1], vertex.position;
-DP4 position.z, transform[2], vertex.position;
-MOV position.w, 1.0;
-
-MOV result.position, position;
-
-MOV result.texcoord[0], vertex.texcoord[0];
-
-END

binaries/data/mods/mod/shaders/arb/gui_solid_mask.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="arb">
-
-    <vertex file="arb/gui_solid_mask.vp">
-        <stream name="pos"/>
-        <stream name="uv0"/>
-        <uniform name="transform" loc="0" type="mat4"/>
-    </vertex>
-
-    <fragment file="arb/gui_solid_mask.fp">
-        <uniform name="tex" loc="0" type="sampler2D"/>
-        <uniform name="color" loc="1" type="vec4"/>
-    </fragment>
-
-</program>

binaries/data/mods/mod/shaders/arb/gui_text.fp

@@ -1,15 +0,0 @@
-!!ARBfp1.0
-
-TEMP tex_color;
-TEX tex_color, fragment.texcoord[0], texture[0], 2D;
-
-PARAM add_color = program.local[1];
-PARAM mul_color = program.local[2];
-
-TEMP color;
-ADD color, tex_color, add_color;
-MUL color, color, mul_color;
-
-MOV result.color, color;
-
-END

binaries/data/mods/mod/shaders/arb/gui_text.vp

@@ -1,16 +0,0 @@
-!!ARBvp1.0
-
-PARAM transform[4] = { program.local[0..3] };
-
-TEMP position;
-
-DP4 position.x, transform[0], vertex.position;
-DP4 position.y, transform[1], vertex.position;
-DP4 position.z, transform[2], vertex.position;
-MOV position.w, 1.0;
-
-MOV result.position, position;
-
-MOV result.texcoord[0], vertex.texcoord[0];
-
-END

binaries/data/mods/mod/shaders/arb/gui_text.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="arb">
-
-    <vertex file="arb/gui_text.vp">
-        <stream name="pos"/>
-        <stream name="uv0"/>
-        <uniform name="transform" loc="0" type="mat4"/>
-    </vertex>
-
-    <fragment file="arb/gui_text.fp">
-        <uniform name="tex" loc="0" type="sampler2D"/>
-        <uniform name="colorAdd" loc="1" type="vec4"/>
-        <uniform name="colorMul" loc="2" type="vec4"/>
-    </fragment>
-
-</program>

binaries/data/mods/mod/shaders/effects/canvas2d.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<effect>
+
+	<technique>
+		<require shaders="arb"/>
+		<pass shader="arb/canvas2d">
+			<depth test="FALSE" mask="false"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
+	<technique>
+		<require shaders="glsl"/>
+		<pass shader="glsl/canvas2d">
+			<depth test="FALSE" mask="false"/>
+			<blend src="src_alpha" dst="one_minus_src_alpha"/>
+		</pass>
+	</technique>
+
+</effect>

binaries/data/mods/mod/shaders/effects/cas.xml

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

binaries/data/mods/mod/shaders/effects/fxaa.xml

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

binaries/data/mods/mod/shaders/effects/gui_add.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<effect>
-
-    <technique>
-        <require shaders="arb"/>
-        <pass shader="arb/gui_add"/>
-    </technique>
-
-    <technique>
-        <require shaders="fixed"/>
-        <pass shader="fixed:gui_add"/>
-    </technique>
-
-    <technique>
-        <require shaders="glsl"/>
-        <pass shader="glsl/gui_add"/>
-    </technique>
-
-</effect>

binaries/data/mods/mod/shaders/effects/gui_basic.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<effect>
-
-    <technique>
-        <require shaders="arb"/>
-        <pass shader="arb/gui_basic"/>
-    </technique>
-
-    <technique>
-        <require shaders="fixed"/>
-        <pass shader="fixed:gui_basic"/>
-    </technique>
-
-    <technique>
-        <require shaders="glsl"/>
-        <pass shader="glsl/gui_basic"/>
-    </technique>
-
-</effect>

binaries/data/mods/mod/shaders/effects/gui_grayscale.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<effect>
-
-    <technique>
-        <require shaders="arb"/>
-        <pass shader="arb/gui_grayscale"/>
-    </technique>
-
-    <technique>
-        <require shaders="fixed"/>
-        <pass shader="fixed:gui_grayscale"/>
-    </technique>
-
-    <technique>
-        <require shaders="glsl"/>
-        <pass shader="glsl/gui_grayscale"/>
-    </technique>
-
-</effect>

binaries/data/mods/mod/shaders/effects/gui_solid.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<effect>
-
-    <technique>
-        <require shaders="arb"/>
-        <pass shader="arb/gui_solid"/>
-    </technique>
-
-    <technique>
-        <require shaders="fixed"/>
-        <pass shader="fixed:gui_solid"/>
-    </technique>
-
-    <technique>
-        <require shaders="glsl"/>
-        <pass shader="glsl/gui_solid"/>
-    </technique>
-
-</effect>

binaries/data/mods/mod/shaders/effects/gui_solid_mask.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<effect>
-
-    <technique>
-        <require shaders="arb"/>
-        <pass shader="arb/gui_solid_mask"/>
-    </technique>
-
-    <technique>
-        <require shaders="fixed"/>
-        <pass shader="fixed:gui_solid"/>
-    </technique>
-
-    <technique>
-        <require shaders="glsl"/>
-        <pass shader="glsl/gui_solid_mask"/>
-    </technique>
-
-</effect>

binaries/data/mods/mod/shaders/effects/gui_text.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<effect>
-
-    <technique>
-        <require shaders="arb"/>
-        <pass shader="arb/gui_text">
-            <blend src="src_alpha" dst="one_minus_src_alpha"/>
-        </pass>
-    </technique>
-
-    <technique>
-        <require shaders="fixed"/>
-        <pass shader="fixed:gui_text">
-            <blend src="src_alpha" dst="one_minus_src_alpha"/>
-        </pass>
-    </technique>
-
-    <technique>
-        <require shaders="glsl"/>
-        <pass shader="glsl/gui_text">
-            <blend src="src_alpha" dst="one_minus_src_alpha"/>
-        </pass>
-    </technique>
-
-</effect>

binaries/data/mods/mod/shaders/glsl/canvas2d.fs

@@ -0,0 +1,15 @@
+#version 110
+
+uniform sampler2D tex;
+uniform vec4 colorAdd;
+uniform vec4 colorMul;
+uniform float grayscaleFactor;
+
+varying vec2 v_uv;
+
+void main()
+{
+	vec4 colorTex = texture2D(tex, v_uv);
+	vec3 grayColor = vec3(dot(vec3(0.3, 0.59, 0.11), colorTex.rgb));
+	gl_FragColor = clamp(mix(colorTex, vec4(grayColor, colorTex.a), grayscaleFactor) * colorMul + colorAdd, 0.0, 1.0);
+}

binaries/data/mods/mod/shaders/glsl/canvas2d.vs

@@ -0,0 +1,14 @@
+#version 110
+
+uniform mat4 transform;
+
+attribute vec2 a_vertex;
+attribute vec2 a_uv0;
+
+varying vec2 v_uv;
+
+void main()
+{
+	v_uv = a_uv0;
+	gl_Position = transform * vec4(a_vertex, 0.0, 1.0);
+}

binaries/data/mods/mod/shaders/glsl/canvas2d.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="glsl">
+
+    <vertex file="glsl/canvas2d.vs">
+        <stream name="pos" attribute="a_vertex"/>
+        <stream name="uv0" attribute="a_uv0"/>
+    </vertex>
+
+    <fragment file="glsl/canvas2d.fs"/>
+
+</program>

binaries/data/mods/mod/shaders/glsl/cas.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="glsl">
+
+	<vertex file="glsl/simple.vs">
+		<stream name="pos" attribute="a_vertex"/>
+		<stream name="uv0" attribute="a_uv0"/>
+	</vertex>
+
+	<fragment file="glsl/cas.fs"/>
+
+</program>

binaries/data/mods/mod/shaders/glsl/fxaa.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<program type="glsl">
+
+	<vertex file="glsl/simple.vs">
+		<stream name="pos" attribute="a_vertex"/>
+		<stream name="uv0" attribute="a_uv0"/>
+	</vertex>
+
+	<fragment file="glsl/fxaa.fs"/>
+
+</program>

binaries/data/mods/mod/shaders/glsl/gui_add.fs

@@ -1,13 +0,0 @@
-#version 110
-
-uniform sampler2D tex;
-uniform vec4 color;
-
-varying vec2 v_tex;
-
-void main()
-{
-	vec4 t = texture2D(tex, v_tex);
-	gl_FragColor.rgb = t.rgb + color.rgb * t.a;
-	gl_FragColor.a = t.a;
-}

binaries/data/mods/mod/shaders/glsl/gui_add.vs

@@ -1,15 +0,0 @@
-#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;
-}

binaries/data/mods/mod/shaders/glsl/gui_add.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="glsl">
-
-    <vertex file="glsl/gui_add.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_add.fs"/>
-
-</program>

binaries/data/mods/mod/shaders/glsl/gui_basic.fs

@@ -1,10 +0,0 @@
-#version 110
-
-uniform sampler2D tex;
-
-varying vec2 v_tex;
-
-void main()
-{
-  gl_FragColor = texture2D(tex, v_tex);
-}

binaries/data/mods/mod/shaders/glsl/gui_basic.vs

@@ -1,15 +0,0 @@
-#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;
-}

binaries/data/mods/mod/shaders/glsl/gui_basic.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="glsl">
-
-    <vertex file="glsl/gui_basic.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_basic.fs"/>
-
-</program>

binaries/data/mods/mod/shaders/glsl/gui_grayscale.fs

@@ -1,12 +0,0 @@
-#version 110
-
-uniform sampler2D tex;
-
-varying vec2 v_tex;
-
-void main()
-{
-  vec4 t = texture2D(tex, v_tex);
-  gl_FragColor.rgb = vec3(dot(t.rgb, vec3(0.3, 0.59, 0.11)));
-  gl_FragColor.a = t.a;
-}

binaries/data/mods/mod/shaders/glsl/gui_grayscale.vs

@@ -1,15 +0,0 @@
-#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;
-}

binaries/data/mods/mod/shaders/glsl/gui_grayscale.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="glsl">
-
-    <vertex file="glsl/gui_grayscale.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_grayscale.fs"/>
-
-</program>

binaries/data/mods/mod/shaders/glsl/gui_solid.fs

@@ -1,8 +0,0 @@
-#version 110
-
-uniform vec4 color;
-
-void main()
-{
-  gl_FragColor = color;
-}

binaries/data/mods/mod/shaders/glsl/gui_solid.vs

@@ -1,10 +0,0 @@
-#version 110
-
-uniform mat4 transform;
-
-attribute vec3 a_vertex;
-
-void main()
-{
-  gl_Position = transform * vec4(a_vertex, 1.0);
-}

binaries/data/mods/mod/shaders/glsl/gui_solid.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="glsl">
-
-    <vertex file="glsl/gui_solid.vs">
-        <stream name="pos"/>
-        <attrib name="a_vertex" semantics="gl_Vertex"/>
-    </vertex>
-
-    <fragment file="glsl/gui_solid.fs"/>
-
-</program>

binaries/data/mods/mod/shaders/glsl/gui_solid_mask.fs

@@ -1,13 +0,0 @@
-#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;
-}

binaries/data/mods/mod/shaders/glsl/gui_solid_mask.vs

@@ -1,15 +0,0 @@
-#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;
-}

binaries/data/mods/mod/shaders/glsl/gui_solid_mask.xml

@@ -1,13 +0,0 @@
-<?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>

binaries/data/mods/mod/shaders/glsl/gui_text.fs

@@ -1,12 +0,0 @@
-#version 110
-
-uniform vec4 colorAdd;
-uniform vec4 colorMul;
-uniform sampler2D tex;
-
-varying vec2 v_texcoord;
-
-void main()
-{
-  gl_FragColor = (texture2D(tex, v_texcoord) + colorAdd) * colorMul;
-}

binaries/data/mods/mod/shaders/glsl/gui_text.vs

@@ -1,14 +0,0 @@
-#version 110
-
-uniform mat4 transform;
-
-varying vec2 v_texcoord;
-
-attribute vec3 a_vertex;
-attribute vec2 a_uv0;
-
-void main()
-{
-  gl_Position = transform * vec4(a_vertex, 1.0);
-  v_texcoord = a_uv0;
-}

binaries/data/mods/mod/shaders/glsl/gui_text.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<program type="glsl">
-
-    <vertex file="glsl/gui_text.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_text.fs"/>
-
-</program>

binaries/data/mods/mod/shaders/program.rng

@@ -37,7 +37,7 @@
                         </zeroOrMore>
                     </element>
                 </group>
-                
+
                 <group>
                     <attribute name="type">
                         <value>glsl</value>
@@ -46,33 +46,7 @@
                     <element name="vertex">
                         <attribute name="file"><text/></attribute>
                         <zeroOrMore>
-                            <choice>
-                                <element name="attrib">
-                                    <ref name="conditional"/>
-                                    <attribute name="name"><text/></attribute>
-                                    <attribute name="semantics">
-                                        <choice>
-                                            <value>gl_Vertex</value>
-                                            <value>gl_Normal</value>
-                                            <value>gl_Color</value>
-                                            <value>gl_SecondaryColor</value>
-                                            <value>gl_FogCoord</value>
-                                            <value>gl_MultiTexCoord0</value>
-                                            <value>gl_MultiTexCoord1</value>
-                                            <value>gl_MultiTexCoord2</value>
-                                            <value>gl_MultiTexCoord3</value>
-                                            <value>gl_MultiTexCoord4</value>
-                                            <value>gl_MultiTexCoord5</value>
-                                            <value>gl_MultiTexCoord6</value>
-                                            <value>gl_MultiTexCoord7</value>
-                                            <value>CustomAttribute0</value>
-                                            <value>CustomAttribute1</value>
-                                            <value>CustomAttribute2</value>
-                                        </choice>
-                                    </attribute>
-                                </element>
-                                <ref name="streamContent"/>
-                            </choice>
+                            <ref name="streamContent"/>
                         </zeroOrMore>
                     </element>
 
@@ -120,8 +94,15 @@
                     <value>uv1</value>
                     <value>uv2</value>
                     <value>uv3</value>
+                    <value>uv4</value>
+                    <value>uv5</value>
+                    <value>uv6</value>
+                    <value>uv7</value>
                 </choice>
             </attribute>
+            <optional>
+                <attribute name="attribute"><text/></attribute>
+            </optional>
         </element>
     </define>
 

binaries/data/mods/public/art/actors/actor.rnc

@@ -1,71 +0,0 @@
-namespace a = "http://relaxng.org/ns/compatibility/annotations/1.0"
-##
-# 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
-##
-
-element actor {
-    attribute version { xsd:positiveInteger }, (
-    element group {
-        element variant {
-            attribute name { text }? &
-            attribute file { text }? &
-            attribute frequency { xsd:nonNegativeInteger }? &
-            element mesh {
-                text
-            }? &
-            element textures {
-                element texture {
-                    attribute file { text }? &
-                    attribute name { text }
-                }*
-            }? &
-            element decal {
-                attribute width { xsd:float } &  # X
-                attribute depth { xsd:float } &  # Z
-                attribute angle { xsd:float } &
-                attribute offsetx { xsd:float } &
-                attribute offsetz { xsd:float }
-            }? &
-            element particles {
-                attribute file { text }
-            }? &
-            element color { list {
-                xsd:nonNegativeInteger, # R
-                xsd:nonNegativeInteger, # G
-                xsd:nonNegativeInteger # B
-            } }? &
-            element animations {
-                element animation {
-                    attribute name { text } &
-                    attribute id { text }? &
-                    attribute frequency { xsd:nonNegativeInteger }? &
-                    attribute file { text }? &
-                    attribute speed { xsd:nonNegativeInteger } &
-                    attribute event { xsd:decimal { minInclusive = "0" maxInclusive = "1" } }? &
-                    attribute load { xsd:decimal { minInclusive = "0" maxInclusive = "1" } }? &
-                    attribute sound { xsd:decimal { minInclusive = "0" maxInclusive = "1" } }?
-                }*
-            }? &
-            element props {
-                element prop {
-                    (attribute actor { text }? &
-                    attribute attachpoint { text } &
-                    attribute minheight { xsd:float }? &
-                    attribute maxheight { xsd:float }? &
-                    attribute selectable { "true" | "false" }?)
-                }*
-            }?
-        }*
-    }* &
-    element castshadow {    # flag; true if present
-        empty
-    }? &
-    element float {         # flag; true if present
-        empty
-    }? &
-    element material {
-        text
-    }?
-    )
-}