Correctly choose DarwinSSL TLS backend on macOS for libcurl.

According to https://curl.haxx.se/docs/install.html, explicitly
disabling OpenSSL/BoringSSL/libressl with the confusing `--without-ssl`
flag is necessary.

Also disable a few more unneeded dependencies explicitly.

Patch By: Stan
Accepted By: trompetin17
Differential Revision: https://code.wildfiregames.com/D1687
This was SVN commit r21945.

.arcconfig

@@ -0,0 +1,4 @@
+{
+  "phabricator.uri" : "https://code.wildfiregames.com/",
+  "repository.callsign" : "P"
+}

.arclint

@@ -0,0 +1,18 @@
+{
+  "exclude": [
+    "(^binaries/system/)",
+    "(^source/third_party/)",
+    "(^libraries/)"
+  ],
+  "linters": {
+    "text": {
+      "type": "text",
+      "severity": {
+        "1": "disabled",
+        "2": "disabled",
+        "3": "disabled",
+        "5": "disabled"
+      }
+    }
+  }
+}

.coafile

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

LICENSE.txt

@@ -17,12 +17,15 @@ in particular, let us know and we can try to clarify it.
   /binaries/data
     GPL version 2 (or later) - see license_gpl-2.0.txt
 
-  /binaries/data/mods/art
-  /binaries/data/mods/audio
+  /binaries/data/mods/*/art
+  /binaries/data/mods/*/audio
     Creative Commons Attribution-Share Alike 3.0 - see
     http://creativecommons.org/licenses/by-sa/3.0/
     and also see LICENSE.txt within those directories
 
+  /binaries/data/mods/*/maps/
+  see LICENSE.txt within those directories
+
   /binaries/system
     Various (unspecified)
 
@@ -34,10 +37,11 @@ in particular, let us know and we can try to clarify it.
     Various (unspecified)
 
   /build/premake/premake4
+  /build/premake/premake5
     BSD
 
   /build/premake/*.lua
-    MIT
+    MIT - see license_mit.txt
 
   /docs
     Various (unspecified)
@@ -49,24 +53,40 @@ in particular, let us know and we can try to clarify it.
     GPL version 2 (or later) - see license_gpl-2.0.txt
 
   /source/lib
-    MIT
+    MIT - see license_mit.txt
+
+  /source/scriptinterface/third_party
+    MPL 2.0
+
+  /source/third_party/cppformat
+    BSD
 
   /source/third_party/encryption
     GPL version 2 (or later)
     ISC (pkcs5_pbkdf2.cpp)
-    MIT (pkcs5_pbkdf2.h)
+    MIT (pkcs5_pbkdf2.h) - see license_mit.txt
+
+  /source/third-party/jsonspirit
+    MIT - see license_mit.txt
 
   /source/third_party/mikktspace
     zlib
 
   /source/third_party/mongoose
-    MIT
+    MIT - see license_mit.txt
 
   /source/third_party/tinygettext
-    GPL version 2 (or later) - see license_gpl-2.0.txt
+    zlib
 
   /source/tools
     Various - see LICENSE.txt within that directory
 
   /source/tools/atlas
     GPL version 2 (or later) - see license_gpl-2.0.txt
+
+  /binaries/data/mods/public/gui/prelobby/common/terms
+  /binaries/data/mods/public/gui/userreport/Terms_and_Conditions.txt
+  /binaries/data/mods/mod/gui/modio/Disclaimer.txt
+    Redistributing modified Terms and Conditions of online services may be within the licensing,
+    but may not change the legality or enforceability of the terms of the service provider.
+    It may be against the terms of the service provider to use online services with modified terms.

binaries/data/config/default.cfg

@@ -5,6 +5,12 @@
 ; * create a text file called "local.cfg" instead, and copy    *
 ; * the lines from this file that you want to change.          *
 ; *                                                            *
+; * If a setting is part of a section (for instance [hotkey])  *
+; * you need to append the section name at the beginning of    *
+; * your custom line (for instance you need to write           *
+; * "hotkey.pause = Space" if you want to change the pausing   *
+; * hotkey to the spacebar).                                   *
+; *                                                            *
 ; * On Linux, create:                                          *
 ; *   $XDG_CONFIG_HOME/0ad/config/local.cfg                    *
 ; *   (Note: $XDG_CONFIG_HOME defaults to ~/.config)           *
@@ -20,14 +26,15 @@
 ; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
 windowed = false
 
-; Enable/disable the splashscreen
-splashscreendisable = false
-; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch.
-splashscreenversion = 0
+; Show detailed tooltips (Unit stats)
+showdetailedtooltips = false
 
 ; Pause the game on window focus loss (Only applicable to single player mode)
 pauseonfocusloss = true
 
+; Persist settings after leaving the game setup screen
+persistmatchsettings = true
+
 ; Default player name to use in multiplayer
 ; playername = "anonymous"
 
@@ -43,25 +50,33 @@ yres = 0
 ; Force a non-standard bit depth (if 0 then use the current desktop bit depth)
 bpp = 0
 
+; Preferred display (for multidisplay setups, only works with SDL 2.0)
+display = 0
+
+; Emulate right-click with Ctrl+Click on Mac mice
+macmouse = false
+
 ; System settings:
 
 ; if false, actors won't be rendered but anything entity will be.
 renderactors = true
 
-waternormals = true
+watereffects=true ; When disabled, force usage of the fixed pipeline water. This is faster, but really, really ugly.
+waterfancyeffects = false
 waterrealdepth = true
-waterfoam = false
-watercoastalwaves = false
 waterrefraction = true
 waterreflection = true
-watershadows = false
+shadowsonwater = false
 
 shadows = true
+shadowquality = 0      ; Shadow map resolution. (-2 - Very Low, -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
 vsync = false
 particles = true
+fog = true
 silhouettes = true
-showsky = false
+showsky = true
 
 nos3tc = false
 noautomipmap = true
@@ -84,23 +99,20 @@ force_s3tc_enable = true
 renderpath = default
 
 ;;;;; EXPERIMENTAL ;;;;;
-; Prefer GLSL shaders over ARB shaders (not recommended). REQUIRES gentangents=true.
+; Prefer GLSL shaders over ARB shaders. Allows fancier graphical effects.
 preferglsl = false
 
-; Generate tangents for normal and parallax mapping. REQUIRES preferglsl=true.
-gentangents = false
-
 ; Experimental probably-non-working GPU skinning support; requires preferglsl; use at own risk
 gpuskinning = false
 
-; Use smooth LOS interpolation; REQUIRES preferglsl=true.
+; Use smooth LOS interpolation
 smoothlos = false
 
 ; Use screen-space postprocessing filters (HDR, bloom, DOF, etc). Incompatible with fixed renderpath.
 postproc = false
 
-; Quality level of shader effects (set to 10 to display effects)
-materialmgr.quality = 0.0
+; Quality level of shader effects (set to 10 to display all effects)
+materialmgr.quality = 2.0
 
 ; Maximum distance to display parallax effect. Set to 0 to disable parallax.
 materialmgr.PARALLAX_DIST.max = 150
@@ -113,255 +125,388 @@ materialmgr.PARALLAX_VHQ_DIST.max = 0
 ; Replace alpha-blending with alpha-testing, for performance experiments
 forcealphatest = false
 
-; Opt-in online user reporting system
-userreport.url = "http://feedback.wildfiregames.com/report/upload/v1/"
-
-; Colour of the sky (in "r g b" format)
+; Color of the sky (in "r g b" format)
 skycolor = "0 0 0"
 
-; GENERAL PREFERENCES:
-
-sound.mastergain = 0.9
-sound.musicgain = 0.2
-sound.ambientgain = 0.6
-sound.actiongain = 0.7
-sound.uigain = 0.7
-
-; Camera control settings
-view.scroll.speed = 120.0
-view.scroll.speed.modifier = 1.05           ; Multiplier for changing scroll speed
-view.rotate.x.speed = 1.2
-view.rotate.x.min = 28.0
-view.rotate.x.max = 60.0
-view.rotate.x.default = 35.0
-view.rotate.y.speed = 2.0
-view.rotate.y.speed.wheel = 0.45
-view.rotate.y.default = 0.0
-view.rotate.speed.modifier = 1.05           ; Multiplier for changing rotation speed
-view.drag.speed = 0.5
-view.zoom.speed = 256.0
-view.zoom.speed.wheel = 32.0
-view.zoom.min = 50.0
-view.zoom.max = 200.0
-view.zoom.default = 120.0
-view.zoom.speed.modifier = 1.05             ; Multiplier for changing zoom speed
-view.pos.smoothness = 0.1
-view.zoom.smoothness = 0.4
-view.rotate.x.smoothness = 0.5
-view.rotate.y.smoothness = 0.3
-view.near = 2.0                             ; Near plane distance
-view.far = 4096.0                           ; Far plane distance
-view.fov = 45.0                             ; Field of view (degrees), lower is narrow, higher is wide
-view.height.smoothness = 0.5
-view.height.min = 16
-
-; How close do we have to be to the actual location in order to jump back to the previous one?
-camerajump.threshold = 40
-
-; HOTKEY MAPPINGS:
+[adaptivefps]
+session = 60         ; Throttle FPS in running games (prevents 100% CPU workload).
+menu = 30            ; Throttle FPS in menus only.
 
+[hotkey]
 ; Each one of the specified keys will trigger the action on the left
-; for multiple-key combinations, separate keys with '+' and enclose the entire thing
-;   in doublequotes.
+; for multiple-key combinations, separate keys with '+'.
 ; See keys.txt for the list of key names.
 
 ; > SYSTEM SETTINGS
-hotkey.exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop
-hotkey.leave = Escape                       ; End current game or Exit
-hotkey.confirm = Return                     ; Confirm the current command.
-hotkey.pause = Pause                        ; Pause/unpause game
-hotkey.screenshot = F2                      ; Take PNG screenshot
-hotkey.bigscreenshot = "Shift+F2"           ; Take large BMP screenshot
-hotkey.togglefullscreen = "Alt+Return"      ; Toggle fullscreen/windowed mode
-hotkey.screenshot.watermark = "Alt+K"       ; Toggle product/company watermark for official screenshots
-hotkey.wireframe = "Alt+W"                  ; Toggle wireframe mode
-hotkey.silhouettes = "Alt+S"                ; Toggle unit silhouettes
-hotkey.showsky = "Alt+Z"                    ; Toggle sky
+exit = "Ctrl+Break", "Super+Q"           ; Exit to desktop
+cancel = Escape                          ; Close or cancel the current dialog box/popup
+leave = Escape                           ; End current game or Exit
+confirm = Return                         ; Confirm the current command
+pause = Pause                            ; Pause/unpause game
+screenshot = F2                          ; Take PNG screenshot
+bigscreenshot = "Shift+F2"               ; Take large BMP screenshot
+togglefullscreen = "Alt+Return"          ; Toggle fullscreen/windowed mode
+screenshot.watermark = "Alt+K"           ; Toggle product/company watermark for official screenshots
+wireframe = "Alt+Shift+W"                ; Toggle wireframe mode
+silhouettes = "Alt+Shift+S"              ; Toggle unit silhouettes
+showsky = "Alt+Z"                        ; Toggle sky
 
-; > CAMERA SETTINGS
-hotkey.camera.reset = "R"                                   ; Reset camera rotation to default.
-hotkey.camera.follow = "F"                                  ; Follow the first unit in the selection
-hotkey.camera.zoom.in = Plus, Equals, NumPlus               ; Zoom camera in (continuous control)
-hotkey.camera.zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
-hotkey.camera.zoom.wheel.in = WheelUp                       ; Zoom camera in (stepped control)
-hotkey.camera.zoom.wheel.out = WheelDown                    ; Zoom camera out (stepped control)
-hotkey.camera.rotate.up = "Ctrl+UpArrow", "Ctrl+W"          ; Rotate camera to look upwards
-hotkey.camera.rotate.down = "Ctrl+DownArrow", "Ctrl+S"      ; Rotate camera to look downwards
-hotkey.camera.rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q     ; Rotate camera clockwise around terrain
-hotkey.camera.rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E   ; Rotate camera anticlockwise around terrain
-hotkey.camera.rotate.wheel.cw = "Shift+WheelUp", MouseX1    ; Rotate camera clockwise around terrain (stepped control)
-hotkey.camera.rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
-hotkey.camera.pan = MouseMiddle                             ; Enable scrolling by moving mouse
-hotkey.camera.left = A, LeftArrow                           ; Scroll or rotate left
-hotkey.camera.right = D, RightArrow                         ; Scroll or rotate right
-hotkey.camera.up = W, UpArrow                               ; Scroll or rotate up/forwards
-hotkey.camera.down = S, DownArrow                           ; Scroll or rotate down/backwards
-hotkey.camera.scroll.speed.increase = "Ctrl+Shift+S"        ; Increase scroll speed
-hotkey.camera.scroll.speed.decrease = "Ctrl+Alt+S"          ; Decrease scroll speed
-hotkey.camera.rotate.speed.increase = "Ctrl+Shift+R"        ; Increase rotation speed
-hotkey.camera.rotate.speed.decrease = "Ctrl+Alt+R"          ; Decrease rotation speed
-hotkey.camera.zoom.speed.increase = "Ctrl+Shift+Z"          ; Increase zoom speed
-hotkey.camera.zoom.speed.decrease = "Ctrl+Alt+Z"            ; Decrease zoom speed
-hotkey.camera.jump.1 = F5                                   ; Jump to position N
-hotkey.camera.jump.2 = F6
-hotkey.camera.jump.3 = F7
-hotkey.camera.jump.4 = F8
-;hotkey.camera.jump.5 =
-;hotkey.camera.jump.6 =
-;hotkey.camera.jump.7 =
-;hotkey.camera.jump.8 =
-;hotkey.camera.jump.9 =
-;hotkey.camera.jump.10 =
-hotkey.camera.jump.set.1 = "Ctrl+F5"                        ; Set jump position N
-hotkey.camera.jump.set.2 = "Ctrl+F6"
-hotkey.camera.jump.set.3 = "Ctrl+F7"
-hotkey.camera.jump.set.4 = "Ctrl+F8"
-;hotkey.camera.jump.set.5 =
-;hotkey.camera.jump.set.6 =
-;hotkey.camera.jump.set.7 =
-;hotkey.camera.jump.set.8 =
-;hotkey.camera.jump.set.9 =
-;hotkey.camera.jump.set.10 =
-
-; > CONSOLE SETTINGS
-hotkey.console.toggle = BackQuote, F9       ; Open/close console
+; > DIALOG HOTKEYS
+summary = "Ctrl+Tab"                     ; Toggle in-game summary
+lobby = "Alt+L"                          ; Show the multiplayer lobby in a dialog window.
+structree = "Alt+Shift+T"                ; Show structure tree
+civinfo = "Alt+Shift+H"                  ; Show civilization info
 
 ; > CLIPBOARD CONTROLS
-hotkey.copy = "Ctrl+C"              ; Copy to clipboard
-hotkey.paste = "Ctrl+V"             ; Paste from clipboard
-hotkey.cut = "Ctrl+X"               ; Cut selected text and copy to the clipboard
+copy = "Ctrl+C"                       ; Copy to clipboard
+paste = "Ctrl+V"                      ; Paste from clipboard
+cut = "Ctrl+X"                        ; Cut selected text and copy to the clipboard
 
-; > ENTITY SELECTION
-hotkey.selection.add = Shift                ; Add units to selection
-hotkey.selection.milonly = Alt              ; Add only military units to selection
-hotkey.selection.remove = Ctrl              ; Remove units from selection
-hotkey.selection.cancel = Esc               ; Un-select all units and cancel building placement 
-hotkey.selection.idleworker = Period        ; Select next idle worker
-hotkey.selection.idlewarrior = ForwardSlash ; Select next idle warrior
-hotkey.selection.offscreen = Alt            ; Include offscreen units in selection
-hotkey.selection.group.select.0 = 0
-hotkey.selection.group.save.0 = "Ctrl+0"
-hotkey.selection.group.add.0 = "Shift+0"
-hotkey.selection.group.select.1 = 1
-hotkey.selection.group.save.1 = "Ctrl+1"
-hotkey.selection.group.add.1 = "Shift+1"
-hotkey.selection.group.select.2 = 2
-hotkey.selection.group.save.2 = "Ctrl+2"
-hotkey.selection.group.add.2 = "Shift+2"
-hotkey.selection.group.select.3 = 3
-hotkey.selection.group.save.3 = "Ctrl+3"
-hotkey.selection.group.add.3 = "Shift+3"
-hotkey.selection.group.select.4 = 4
-hotkey.selection.group.save.4 = "Ctrl+4"
-hotkey.selection.group.add.4 = "Shift+4"
-hotkey.selection.group.select.5 = 5
-hotkey.selection.group.save.5 = "Ctrl+5"
-hotkey.selection.group.add.5 = "Shift+5"
-hotkey.selection.group.select.6 = 6
-hotkey.selection.group.save.6 = "Ctrl+6"
-hotkey.selection.group.add.6 = "Shift+6"
-hotkey.selection.group.select.7 = 7
-hotkey.selection.group.save.7 = "Ctrl+7"
-hotkey.selection.group.add.7 = "Shift+7"
-hotkey.selection.group.select.8 = 8
-hotkey.selection.group.save.8 = "Ctrl+8"
-hotkey.selection.group.add.8 = "Shift+8"
-hotkey.selection.group.select.9 = 9
-hotkey.selection.group.save.9 = "Ctrl+9"
-hotkey.selection.group.add.9 = "Shift+9"
-
-; > SESSION CONTROLS
-hotkey.session.kill = Delete                ; Destroy selected units
-hotkey.session.stop = "H"                   ; Stop the current action
-hotkey.session.attack = "Ctrl+Alt"          ; Modifier to force attack instead of another action
-hotkey.session.attackmove = Ctrl            ; Modifier to attackmove when clicking on a point
-hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building
-hotkey.session.autorallypoint = Ctrl        ; Modifier to set the rally point on the building itself
-hotkey.session.guard = "G"                  ; Modifier to escort/guard when clicking on unit/building
-hotkey.session.queue = Shift                ; Modifier to queue unit orders instead of replacing
-hotkey.session.batchtrain = Shift           ; Modifier to train units in batches
-hotkey.session.massbarter = Shift           ; Modifier to barter bunch of resources
-hotkey.session.masstribute = Shift          ; Modifier to tribute bunch of resources
-hotkey.session.unloadtype = Shift           ; Modifier to unload all units of type
-hotkey.session.deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
-hotkey.session.rotate.cw = RightBracket     ; Rotate building placement preview clockwise
-hotkey.session.rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise
-hotkey.timewarp.fastforward = Space         ; If timewarp mode enabled, speed up the game
-hotkey.timewarp.rewind = Backspace          ; If timewarp mode enabled, go back to earlier point in the game
-
-; > UNIT TRAINING
-hotkey.session.queueunit.1 = "Z"            ; add first unit type to queue
-hotkey.session.queueunit.2 = "X"            ; add second unit type to queue
-hotkey.session.queueunit.3 = "C"            ; add third unit type to queue
-hotkey.session.queueunit.4 = "V"            ; add fourth unit type to queue
-hotkey.session.queueunit.5 = "B"            ; add fivth unit type to queue
-hotkey.session.queueunit.6 = "N"            ; add sixth unit type to queue
-hotkey.session.queueunit.7 = "M"            ; add seventh unit type to queue
-hotkey.session.queueunit.8 = Comma          ; add eighth unit type to queue
+; > CONSOLE SETTINGS
+console.toggle = BackQuote, F9        ; Open/close console
 
 ; > OVERLAY KEYS
-hotkey.fps.toggle = "Alt+F"                  ; Toggle frame counter
-hotkey.session.devcommands.toggle = "Alt+D"  ; Toggle developer commands panel
-hotkey.session.gui.toggle = "Alt+G"          ; Toggle visibility of session GUI
-hotkey.menu.toggle = "F10"                   ; Toggle in-game menu
-hotkey.timeelapsedcounter.toggle = "F12"     ; Toggle time elapsed counter
-hotkey.session.showstatusbars = Tab          ; Toggle display of status bars
-hotkey.session.highlightguarding = PgDn      ; Toggle highlight of guarding units
-hotkey.session.highlightguarded = PgUp       ; Toggle highlight of guarded units
+fps.toggle = "Alt+F"                  ; Toggle frame counter
+realtime.toggle = "Alt+T"             ; Toggle current display of computer time
+session.devcommands.toggle = "Alt+D"  ; Toggle developer commands panel
+timeelapsedcounter.toggle = "F12"     ; Toggle time elapsed counter
+session.showstatusbars = Tab          ; Toggle display of status bars
+session.highlightguarding = PgDn      ; Toggle highlight of guarding units
+session.highlightguarded = PgUp       ; Toggle highlight of guarded units
+session.toggleattackrange = "Alt+C"   ; Toggle display of attack range overlays of selected defensive structures
+session.toggleaurasrange = "Alt+V"    ; Toggle display of aura range overlays of selected units and structures
+session.togglehealrange = "Alt+B"     ; Toggle display of heal range overlays of selected units
+session.diplomacycolors = "Alt+X"     ; Toggle diplomacy colors
 
 ; > HOTKEYS ONLY
-hotkey.chat = Return                        ; Toggle chat window
-hotkey.teamchat = "T"                       ; Toggle chat window in team chat mode
-
-; > GUI TEXTBOX HOTKEYS
-hotkey.text.delete.left = "Ctrl+Backspace"    ; Delete word to the left of cursor
-hotkey.text.delete.right = "Ctrl+Del"         ; Delete word to the right of cursor
-hotkey.text.move.left = "Ctrl+LeftArrow"      ; Move cursor to start of word to the left of cursor
-hotkey.text.move.right = "Ctrl+RightArrow"    ; Move cursor to start of word to the right of cursor
-
-; > PROFILER
-hotkey.profile.toggle = "F11"               ; Enable/disable real-time profiler
-hotkey.profile.save = "Shift+F11"           ; Save current profiler data to logs/profile.txt
-hotkey.profile2.enable = "F11"              ; Enable HTTP/GPU modes for new profiler
-
-profiler2.http.autoenable = false           ; Enable HTTP server output at startup (default off for security/performance)
-profiler2.script.enable = false             ; Enable Javascript profiling. Needs to be set before startup and can't be changed later. (default off for performance)
-profiler2.gpu.autoenable = false            ; Enable GPU timing at startup (default off for performance/compatibility)
-profiler2.gpu.arb.enable = true             ; Allow GL_ARB_timer_query timing mode when available
-profiler2.gpu.ext.enable = true             ; Allow GL_EXT_timer_query timing mode when available
-profiler2.gpu.intel.enable = true           ; Allow GL_INTEL_performance_queries timing mode when available
-
-; Developer options
-jsdebugger.enable = false                   ; Enable Javascript debugging. The Debugger is currently broken and can't be enabled until the SpiderMonkey upgrade is done and the debugger is updated for the new API.
-tinygettext.debug = false                   ; Enable Tinygettext debugging information. If true, Tinygettext prints error messages each time that a translation for an English string is not found.
-developeroverlay.enable = false             ; Enable in-game Developer Overlay.
+chat = Return                         ; Toggle chat window
+teamchat = "T"                        ; Toggle chat window in team chat mode
+privatechat = "L"                     ; Toggle chat window and select the previous private chat partner
 
 ; > QUICKSAVE
-hotkey.quicksave = "Shift+F5"
-hotkey.quickload = "Shift+F8"
+quicksave = "Shift+F5"
+quickload = "Shift+F8"
 
-; EXPERIMENTAL: joystick/gamepad settings
-joystick.enable = false
-joystick.deadzone = 8192
-joystick.camera.pan.x = 0
-joystick.camera.pan.y = 1
-joystick.camera.rotate.x = 3
-joystick.camera.rotate.y = 2
-joystick.camera.zoom.in = 5
-joystick.camera.zoom.out = 4
+[hotkey.camera]
+reset = "R"                                   ; Reset camera rotation to default.
+follow = "F"                                  ; Follow the first unit in the selection
+rallypointfocus = unused                      ; Focus the camera on the rally point of the selected building
+zoom.in = Plus, Equals, NumPlus               ; Zoom camera in (continuous control)
+zoom.out = Minus, NumMinus                    ; Zoom camera out (continuous control)
+zoom.wheel.in = WheelUp                       ; Zoom camera in (stepped control)
+zoom.wheel.out = WheelDown                    ; Zoom camera out (stepped control)
+rotate.up = "Ctrl+UpArrow", "Ctrl+W"          ; Rotate camera to look upwards
+rotate.down = "Ctrl+DownArrow", "Ctrl+S"      ; Rotate camera to look downwards
+rotate.cw = "Ctrl+LeftArrow", "Ctrl+A", Q     ; Rotate camera clockwise around terrain
+rotate.ccw = "Ctrl+RightArrow", "Ctrl+D", E   ; Rotate camera anticlockwise around terrain
+rotate.wheel.cw = "Shift+WheelUp", MouseX1    ; Rotate camera clockwise around terrain (stepped control)
+rotate.wheel.ccw = "Shift+WheelDown", MouseX2 ; Rotate camera anticlockwise around terrain (stepped control)
+pan = MouseMiddle                             ; Enable scrolling by moving mouse
+left = A, LeftArrow                           ; Scroll or rotate left
+right = D, RightArrow                         ; Scroll or rotate right
+up = W, UpArrow                               ; Scroll or rotate up/forwards
+down = S, DownArrow                           ; Scroll or rotate down/backwards
+scroll.speed.increase = "Ctrl+Shift+S"        ; Increase scroll speed
+scroll.speed.decrease = "Ctrl+Alt+S"          ; Decrease scroll speed
+rotate.speed.increase = "Ctrl+Shift+R"        ; Increase rotation speed
+rotate.speed.decrease = "Ctrl+Alt+R"          ; Decrease rotation speed
+zoom.speed.increase = "Ctrl+Shift+Z"          ; Increase zoom speed
+zoom.speed.decrease = "Ctrl+Alt+Z"            ; Decrease zoom speed
 
-; SESSION GUI SETTINGS
-gui.session.timeelapsedcounter = false          ; Show the game duration in the top right corner
-gui.session.attacknotificationmessage = true    ; Show attack notification messages
-gui.session.minimap.pingduration = 50.0         ; The duration for which an entity will be pinged after an attack notification
-gui.session.minimap.blinkduration = 1.7         ; The blink duration while pinging
+[hotkey.camera.jump]
+1 = F5                       ; Jump to position N
+2 = F6
+3 = F7
+4 = F8
+;5 =
+;6 =
+;7 =
+;8 =
+;9 =
+;10 =
+[hotkey.camera.jump.set]
+1 = "Ctrl+F5"                ; Set jump position N
+2 = "Ctrl+F6"
+3 = "Ctrl+F7"
+4 = "Ctrl+F8"
+;5 =
+;6 =
+;7 =
+;8 =
+;9 =
+;10 =
 
-; GENERAL GUI SETTINGS
-gui.cursorblinkrate = 0.5          ; Cursor blink rate in seconds (0.0 to disable blinking)
+[hotkey.profile]
+toggle = "F11"               ; Enable/disable real-time profiler
+save = "Shift+F11"           ; Save current profiler data to logs/profile.txt
+[hotkey.profile2]
+toggle = "Ctrl+F11"          ; Enable/disable HTTP/GPU modes for new profiler
 
-; Multiplayer lobby preferences
-lobby.server = "lobby.wildfiregames.com"  ; Address of lobby server
-lobby.xpartamupp = "wfgbot16"             ; Name of the server-side xmpp client that manage games
-lobby.chattimestamp = false               ; Show time chat message was posted
-lobby.room = "arena16"                    ; Default MUC room to join
-lobby.history = 0                         ; Number of past messages to display on join
+[hotkey.selection]
+add = Shift                  ; Add units to selection
+militaryonly = Alt           ; Add only military units to the selection
+nonmilitaryonly = "Alt+Y"    ; Add only non-military units to the selection
+idleonly = "I"               ; Select only idle units
+woundedonly = "O"            ; Select only wounded units
+remove = Ctrl                ; Remove units from selection
+cancel = Esc                 ; Un-select all units and cancel building placement
+idleworker = Period          ; Select next idle worker
+idlewarrior = ForwardSlash   ; Select next idle warrior
+idleunit = BackSlash         ; Select next idle unit
+offscreen = Alt              ; Include offscreen units in selection
+[hotkey.selection.group.add]
+0 = "Shift+0"
+1 = "Shift+1"
+2 = "Shift+2"
+3 = "Shift+3"
+4 = "Shift+4"
+5 = "Shift+5"
+6 = "Shift+6"
+7 = "Shift+7"
+8 = "Shift+8"
+9 = "Shift+9"
+[hotkey.selection.group.save]
+0 = "Ctrl+0"
+1 = "Ctrl+1"
+2 = "Ctrl+2"
+3 = "Ctrl+3"
+4 = "Ctrl+4"
+5 = "Ctrl+5"
+6 = "Ctrl+6"
+7 = "Ctrl+7"
+8 = "Ctrl+8"
+9 = "Ctrl+9"
+[hotkey.selection.group.select]
+0 = 0
+1 = 1
+2 = 2
+3 = 3
+4 = 4
+5 = 5
+6 = 6
+7 = 7
+8 = 8
+9 = 9
+
+[hotkey.session]
+kill = Delete                ; Destroy selected units
+stop = "H"                   ; Stop the current action
+backtowork = "Y"             ; The unit will go back to work
+unload = "U"                 ; Unload garrisoned units when a building/mechanical unit is selected
+move = unused                ; 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 (should contain the attackmove keys)
+garrison = Ctrl              ; Modifier to garrison when clicking on building
+autorallypoint = Ctrl        ; Modifier to set the rally point on the building itself
+guard = "G"                  ; Modifier to escort/guard when clicking on unit/building
+patrol = "P"                 ; Modifier to patrol a unit
+repair = "J"                 ; Modifier to repair when clicking on building/mechanical unit
+queue = Shift                ; Modifier to queue unit orders instead of replacing
+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
+masstribute = Shift          ; Modifier to tribute bunch of resources
+noconfirmation = Shift       ; Do not ask confirmation when deleting a building/unit
+fulltradeswap = Shift        ; Modifier to put the desired trade resource to 100%
+unloadtype = Shift           ; Modifier to unload all units of type
+deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
+rotate.cw = RightBracket     ; Rotate building placement preview clockwise
+rotate.ccw = LeftBracket     ; Rotate building placement preview anticlockwise
+
+[hotkey.session.gui]
+toggle = "Alt+G"             ; Toggle visibility of session GUI
+menu.toggle = "F10"          ; Toggle in-game menu
+barter.toggle = "Ctrl+B"     ; Toggle in-game barter/trade page
+tutorial.toggle = "Ctrl+P"   ; Toggle in-game tutorial panel
+
+[hotkey.session.savedgames]
+delete = Delete               ; Delete the selected saved game asking confirmation
+noconfirmation = Shift        ; Do not ask confirmation when deleting a game
+
+[hotkey.session.queueunit]   ; > UNIT TRAINING
+1 = "Z"            ; add first unit type to queue
+2 = "X"            ; add second unit type to queue
+3 = "C"            ; add third unit type to queue
+4 = "V"            ; add fourth unit type to queue
+5 = "B"            ; add fivth unit type to queue
+6 = "N"            ; add sixth unit type to queue
+7 = "M"            ; add seventh unit type to queue
+8 = Comma          ; add eighth unit type to queue
+
+[hotkey.session.timewarp]
+fastforward = Space               ; If timewarp mode enabled, speed up the game
+rewind = Backspace                ; If timewarp mode enabled, go back to earlier point in the game
+
+[hotkey.tab]
+next = "Tab", "Alt+S"             ; Show the next tab
+prev = "Shift+Tab", "Alt+W"       ; Show the previous tab
+
+[hotkey.text]    ; > GUI TEXTBOX HOTKEYS
+delete.left = "Ctrl+Backspace"    ; Delete word to the left of cursor
+delete.right = "Ctrl+Del"         ; Delete word to the right of cursor
+move.left = "Ctrl+LeftArrow"      ; Move cursor to start of word to the left of cursor
+move.right = "Ctrl+RightArrow"    ; Move cursor to start of word to the right of cursor
+
+[gui]
+cursorblinkrate = 0.5             ; Cursor blink rate in seconds (0.0 to disable blinking)
+scale = 1.0                       ; GUI scaling factor, for improved compatibility with 4K displays
+
+[gui.gamesetup]
+enabletips = true                 ; Enable/Disable tips during gamesetup (for newcomers)
+assignplayers = everyone          ; Whether to assign joining clients to free playerslots. Possible values: everyone, buddies, disabled.
+aidifficulty = 3                  ; Difficulty level, from 0 (easiest) to 5 (hardest)
+aibehavior = "random"             ; Default behavior of the AI (random, balanced, aggressive or defensive)
+settingsslide = true              ; Enable/Disable settings panel slide
+
+[gui.session]
+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
+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
+healrange = true                  ; Display heal range overlays of selected units
+rankabovestatusbar = true         ; Show rank icons above status bars
+respoptooltipsort = 0             ; Sorting players in the resources and population tooltip by value (0 - no sort, -1 - ascending, 1 - descending)
+
+[gui.session.minimap]
+blinkduration = 1.7               ; The blink duration while pinging
+pingduration = 50.0               ; The duration for which an entity will be pinged after an attack notification
+
+[gui.session.notifications]
+attack = true                     ; Show a chat notification if you are attacked by another player
+tribute = true                    ; Show a chat notification if an ally tributes resources to another team member if teams are locked, and all tributes in observer mode
+barter = true                     ; Show a chat notification to observers when a player bartered resources
+phase = completed                 ; Show a chat notification if you or an ally have started, aborted or completed a new phase, and phases of all players in observer mode. Possible values: none, completed, all.
+
+[gui.splashscreen]
+enable = true                     ; Enable/disable the splashscreen
+version = 0                       ; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch
+
+[gui.session.diplomacycolors]
+self = "21 55 149"                ; Color of your units when diplomacy colors are enabled
+ally = "86 180 31"                ; Color of allies when diplomacy colors are enabled
+neutral = "231 200 5"             ; Color of neutral players when diplomacy colors are enabled
+enemy = "150 20 20"               ; Color of enemies when diplomacy colors are enabled
+
+[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
+
+[chat.session]
+extended = true                     ; Whether to display the chat history
+
+[lobby]
+history = 0                         ; Number of past messages to display on join
+room = "arena23b"                   ; 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)
+terms_url = "https://trac.wildfiregames.com/browser/ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/"; Allows the user to save the text and print the terms
+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 = "wfgbot23b"            ; Name of the server-side XMPP-account that manage games
+echelon = "echelon23b"              ; 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
+
+[lobby.columns]
+gamerating = false                  ; Show the average rating of the participating players in a column of the gamelist
+
+[lobby.stun]
+enabled = true                       ; The STUN protocol allows hosting games without configuring the firewall and router.
+                                     ; If STUN is disabled, the game relies on direct connection, UPnP and port forwarding.
+server = "lobby.wildfiregames.com"   ; Address of the STUN server.
+port = 3478                          ; Port of the STUN server.
+delay = 200                          ; Duration in milliseconds that is waited between STUN messages.
+                                     ; Smaller numbers speed up joins but also become less stable.
+
+[mod]
+enabledmods = "mod public"
+
+[modio]
+public_key = "RWTsHxQMrRq4xwHisyBa2rNQfAedcINzbTT83jeX4/ZcfVxqLfWB4y8w" ; 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]
+baseurl = "https://api.mod.io/v1"
+api_key = "23df258a71711ea6e4b50893acc1ba55"
+name_id = "0ad"
+
+[network]
+duplicateplayernames = false      ; Rename joining player to "User (2)" if "User" is already connected, otherwise prohibit join.
+lateobservers = everyone          ; Allow observers to join the game after it started. Possible values: everyone, buddies, disabled.
+observerlimit = 8                 ; Prevent further observer joins in running games if this limit is reached
+gamestarttimeout = 60000          ; Don't disconnect clients timing out in the loading screen and rejoin process before exceeding this timeout.
+
+[overlay]
+fps = "false"                     ; Show frames per second in top right corner
+realtime = "false"                ; Show current system time in top right corner
+netwarnings = "true"              ; Show warnings if the network connection is bad
+
+[profiler2]
+autoenable = false                ; Enable HTTP server output at startup (default off for security/performance)
+gpu.arb.enable = true             ; Allow GL_ARB_timer_query timing mode when available
+gpu.ext.enable = true             ; Allow GL_EXT_timer_query timing mode when available
+gpu.intel.enable = true           ; Allow GL_INTEL_performance_queries timing mode when available
+
+[sound]
+mastergain = 0.9
+musicgain = 0.2
+ambientgain = 0.6
+actiongain = 0.7
+uigain = 0.7
+
+[sound.notify]
+nick = true                       ; Play a sound when someone mentions your name in the lobby or game
+
+[tinygettext]
+debug = false                     ; Print error messages each time a translation for an English string is not found.
+
+[userreport] ; Opt-in online user reporting system
+url_upload = "https://feedback.wildfiregames.com/report/upload/v1/" ; URL where UserReports are uploaded to
+url_publication = "https://feedback.wildfiregames.com/"             ; URL where UserReports were analyzed and published
+url_terms = "https://trac.wildfiregames.com/browser/ps/trunk/binaries/data/mods/public/gui/userreport/Terms_and_Conditions.txt"; Allows the user to save the text and print the terms
+terms = "0"                       ; Version (hash) of the UserReporter Terms that the user has accepted
+
+[view] ; Camera control settings
+scroll.speed = 120.0
+scroll.speed.modifier = 1.05      ; Multiplier for changing scroll speed
+rotate.x.speed = 1.2
+rotate.x.min = 28.0
+rotate.x.max = 60.0
+rotate.x.default = 35.0
+rotate.y.speed = 2.0
+rotate.y.speed.wheel = 0.45
+rotate.y.default = 0.0
+rotate.speed.modifier = 1.05      ; Multiplier for changing rotation speed
+drag.speed = 0.5
+zoom.speed = 256.0
+zoom.speed.wheel = 32.0
+zoom.min = 50.0
+zoom.max = 200.0
+zoom.default = 120.0
+zoom.speed.modifier = 1.05        ; Multiplier for changing zoom speed
+pos.smoothness = 0.1
+zoom.smoothness = 0.4
+rotate.x.smoothness = 0.5
+rotate.y.smoothness = 0.3
+near = 2.0                        ; Near plane distance
+far = 4096.0                      ; Far plane distance
+fov = 45.0                        ; Field of view (degrees), lower is narrow, higher is wide
+height.smoothness = 0.5
+height.min = 16

binaries/data/config/keys.txt

@@ -1,5 +1,7 @@
 ## This file documents keynames that can be used in .cfg files for specifying hotkeys
 ## Note: the keynames are not actually configured or implemented here
+## Also note: if your keyboard supports keys that do not appear here (such as the French é letter),
+## you should be able to use it directly.
 
 Backspace, BkSp
 Tab
@@ -147,101 +149,6 @@ Right Mouse Button, MouseRight
 Middle Mouse Button, MouseMiddle
 Mouse Wheel Up, WheelUp
 Mouse Wheel Down, WheelDown
-
-## Special keys for international and non-QWERTY keyboards:
-World0, W0
-World1, W1
-World2, W2
-World3, W3
-World4, W4
-World5, W5
-World6, W6
-World7, W7
-World8, W8
-World9, W9
-World10, W10
-World11, W11
-World12, W12
-World13, W13
-World14, W14
-World15, W15
-World16, W16
-World17, W17
-World18, W18
-World19, W19
-World20, W20
-World21, W21
-World22, W22
-World23, W23
-World24, W24
-World25, W25
-World26, W26
-World27, W27
-World28, W28
-World29, W29
-World30, W30
-World31, W31
-World32, W32
-World33, W33
-World34, W34
-World35, W35
-World36, W36
-World37, W37
-World38, W38
-World39, W39
-World40, W40
-World41, W41
-World42, W42
-World43, W43
-World44, W44
-World45, W45
-World46, W46
-World47, W47
-World48, W48
-World49, W49
-World50, W50
-World51, W51
-World52, W52
-World53, W53
-World54, W54
-World55, W55
-World56, W56
-World57, W57
-World58, W58
-World59, W59
-World60, W60
-World61, W61
-World62, W62
-World63, W63
-World64, W64
-World65, W65
-World66, W66
-World67, W67
-World68, W68
-World69, W69
-World70, W70
-World71, W71
-World72, W72
-World73, W73
-World74, W74
-World75, W75
-World76, W76
-World77, W77
-World78, W78
-World79, W79
-World80, W80
-World81, W81
-World82, W82
-World83, W83
-World84, W84
-World85, W85
-World86, W86
-World87, W87
-World88, W88
-World89, W89
-World90, W90
-World91, W91
-World92, W92
-World93, W93
-World94, W94
-World95, W95
+MouseButtonX, MouseNX # where X is a number 1-255, for extra mouse buttons
+## (note that some mice start numbering their buttons at higher numbers
+##  so the first extra button on your mouse might be #8 here)

binaries/data/l10n/messages.json

@@ -12,6 +12,7 @@
 					"excludeMasks": ["third_party/**", "tools/**"]
 				},
 				"options": {
+					"format": "c-format",
 					"keywords": {
 						"Translate": [1],
 						"TranslatePlural": [1, 2],
@@ -21,6 +22,7 @@
 						"MarkForTranslationWithContext": [[1], 2]
 					},
 					"commentTags": [
+						"dennis-ignore:",
 						"Translation:"
 					]
 				}

binaries/data/mods/_test.minimal/shaders/instancing.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 
 <Program>
 	<Shaders>

binaries/data/mods/_test.minimal/shaders/instancing_light.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 
 <Program>
 	<Shaders>

binaries/data/mods/_test.minimal/shaders/instancing_lightp.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 
 <Program>
 	<Shaders>

binaries/data/mods/_test.minimal/shaders/instancingp.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 
 <Program>
 	<Shaders>

binaries/data/mods/_test.minimal/shaders/model_light.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 
 <Program>
 	<Shaders>

binaries/data/mods/_test.minimal/shaders/model_lightp.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 
 <Program>
 	<Shaders>

binaries/data/mods/_test.minimal/shaders/water_high.fs

@@ -9,7 +9,7 @@ uniform float shininess;		// Blinn-Phong specular strength
 uniform float specularStrength;	// Scaling for specular reflection (specular color is (this,this,this))
 uniform float waviness;			// "Wildness" of the reflections and refractions; choose based on texture
 uniform vec3 tint;				// Tint for refraction (used to simulate particles in water)
-uniform float murkiness;		// Amount of tint to blend in with the refracted colour
+uniform float murkiness;		// Amount of tint to blend in with the refracted color
 uniform float fullDepth;		// Depth at which to use full murkiness (shallower water will be clearer)
 uniform vec3 reflectionTint;	// Tint for reflection (used for really muddy water)
 uniform float reflectionTintStrength;	// Strength of reflection tint (how much of it to mix in)

binaries/data/mods/_test.minimal/shaders/water_high.xml

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="iso-8859-1" standalone="no"?>
+<?xml version="1.0" encoding="utf-8" standalone="no"?>
 
 <Program>
 	<Shaders>

binaries/data/mods/_test.sim/globalscripts/test-global-helper.js

@@ -2,3 +2,44 @@ function GlobalSubtractionHelper(a, b)
 {
 	return a-b;
 }
+
+function Vector2D(x, y)
+{
+	if (arguments.length == 2)
+	{
+		this.x = x;
+		this.y = y;
+	}
+	else
+		this.x = this.y = 0;
+}
+
+Vector2D.prototype.add = function(v)
+{
+	this.x += v.x;
+	this.y += v.y;
+	return this;
+};
+
+function Vector3D(x, y, z)
+{
+	if (arguments.length == 3)
+	{
+		this.x = x;
+		this.y = y;
+		this.z = z;
+	}
+	else
+		this.x = this.y = this.z = 0;
+}
+Vector3D.prototype.add = function(v)
+{
+	this.x += v.x;
+	this.y += v.y;
+	this.z += v.z;
+	return this;
+};
+
+// make the prototypes easily accessible to C++
+const Vector2Dprototype = Vector2D.prototype;
+const Vector3Dprototype = Vector3D.prototype;

binaries/data/mods/_test.sim/simulation/data/pathfinder.rng

@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<element name="Pathfinder" 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/>
+  <interleave>
+    <element name="MaxSameTurnMoves">
+      <data type="nonNegativeInteger"/>
+    </element>
+    <element name="PassabilityClasses">
+      <oneOrMore>
+        <element>
+          <anyName/>
+          <interleave>
+            <optional>
+              <element name="MinWaterDepth">
+                <data type="decimal"/>
+              </element>
+            </optional>
+            <optional>
+              <!-- TODO: fixed type -->
+              <element name="MaxWaterDepth">
+                <data type="decimal"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="MaxTerrainSlope">
+                <data type="decimal"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="MinShoreDistance">
+                <data type="decimal"/>
+              </element>
+            </optional>
+            <optional>
+              <element name="MaxShoreDistance">
+                <data type="decimal"/>
+              </element>
+            </optional>
+          </interleave>
+        </element>
+      </oneOrMore>
+    </element>
+    <element name="MovementClasses">
+      <oneOrMore>
+        <element>
+          <anyName/>
+          <interleave>
+            <attribute name="Speed">
+              <data type="decimal"/>
+            </attribute>
+            <attribute name="Cost">
+              <data type="decimal"/>
+            </attribute>
+            <optional>
+              <element name="UnitClasses">
+                <zeroOrMore>
+                  <element>
+                    <anyName/>
+                    <interleave>
+                      <attribute name="Speed">
+                        <data type="decimal"/>
+                      </attribute>
+                      <attribute name="Cost">
+                        <data type="decimal"/>
+                      </attribute>
+                    </interleave>
+                  </element>
+                </zeroOrMore>
+              </element>
+            </optional>
+          </interleave>
+        </element>
+      </oneOrMore>
+    </element>
+  </interleave>
+</element>

binaries/data/mods/_test.sim/simulation/data/pathfinder.xml

@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Pathfinder>
+  <!-- Sets limit on the number of same turns moves we will process -->
+  <!-- Setting the value to 0 disable this functionality -->
+  <MaxSameTurnMoves>64</MaxSameTurnMoves>
+  
   <PassabilityClasses>
+
+    <!-- Unit pathfinding classes: -->
+    <unrestricted/>
     <default>
       <MaxWaterDepth>2</MaxWaterDepth>
       <MaxTerrainSlope>1.0</MaxTerrainSlope>
@@ -8,8 +15,37 @@
     <ship>
       <MinWaterDepth>1</MinWaterDepth>
     </ship>
+    <!-- Building construction classes:
+    * Land is used for most buildings, which must be away
+        from water and not on cliffs or mountains.
+    * Shore is used for docks, which must be near water and
+        land, yet shallow enough for builders to approach.
+    -->
+    <building-land>
+      <MaxWaterDepth>0</MaxWaterDepth>
+      <MinShoreDistance>1.0</MinShoreDistance>
+      <MaxTerrainSlope>1.0</MaxTerrainSlope>
+    </building-land>
+    <building-shore>
+      <MaxShoreDistance>2.0</MaxShoreDistance>
+      <MaxTerrainSlope>1.25</MaxTerrainSlope>
+    </building-shore>
+
   </PassabilityClasses>
+  
+  <!--
+    Warning: Movement costs are a subtle tradeoff between
+    pathfinding accuracy and computation cost. Be extremely
+    careful if you change them.
+    (Speeds are safer to change, but ought to be kept roughly
+    in sync with costs.)
+  -->
   <MovementClasses>
     <default Speed="1.0" Cost="1.08"/>
+    <city Speed="1.0" Cost="1.0">
+      <UnitClasses>
+        <infantry Speed="1.4" Cost="0.6"/>
+      </UnitClasses>
+    </city>
   </MovementClasses>
 </Pathfinder>

binaries/data/mods/_test.sim/simulation/data/territorymanager.rng

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<element name="TerritoryManager" 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/>
+  <interleave>
+    <element name="ImpassableCost">
+      <data type="integer">
+        <param name="minInclusive">0</param>
+        <param name="maxInclusive">255</param>
+      </data>
+    </element>
+    <element name="BorderThickness">
+      <data type="decimal"/>
+    </element>
+    <element name="BorderSeparation">
+      <data type="decimal"/>
+    </element>
+  </interleave>
+</element>

binaries/data/mods/_test.sim/simulation/data/territorymanager.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TerritoryManager>
   <ImpassableCost>4</ImpassableCost>
-  <BorderThickness>0.5</BorderThickness>
-  <BorderSeparation>0.55</BorderSeparation>
+  <BorderThickness>0.75</BorderThickness>
+  <BorderSeparation>0.85</BorderSeparation>
 </TerritoryManager>

binaries/data/mods/_test.sim/simulation/templates/inherit_a.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+	<Test2A datatype="tokens">
+		a b c
+	</Test2A>
+</Entity>

binaries/data/mods/_test.sim/simulation/templates/inherit_b.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="inherit_a">
+	<Test2A datatype="tokens">
+		d
+	</Test2A>
+</Entity>

binaries/data/mods/_test.sim/simulation/templates/inherit_c.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity>
+	<Test2A a="b">
+		a b c
+	</Test2A>
+</Entity>

binaries/data/mods/_test.sim/simulation/templates/inherit_d.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="inherit_c">
+	<Test2A c="d"/>
+</Entity>

binaries/data/mods/_test.sim/simulation/templates/special/filter/foundation.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity filtered="">
+  <AIProxy merge=""/>
+  <Armour merge=""/>
+  <BuildRestrictions merge=""/>
+  <!-- Don't provide population bonuses yet (but still do take up population cost) -->
+  <Cost merge="">
+    <PopulationBonus>0</PopulationBonus>
+  </Cost>
+  <Decay merge=""/>
+  <Health>
+    <Initial>1</Initial>
+  </Health>
+  <Fogging merge=""/>
+  <Footprint merge=""/>
+  <!-- Add the Foundation component, to deal with the construction process -->
+  <Foundation replace=""/>
+  <Health merge=""/>
+  <Identity merge=""/>
+  <!-- Foundations shouldn't initially block unit movement -->
+  <Obstruction merge="">
+    <DisableBlockMovement>true</DisableBlockMovement>
+    <DisableBlockPathfinding>true</DisableBlockPathfinding>
+  </Obstruction>
+  <OverlayRenderer merge=""/>
+  <Ownership merge=""/>
+  <Position merge=""/>
+  <RallyPoint merge=""/>
+  <RallyPointRenderer merge=""/>
+  <Selectable merge=""/>
+  <Sound merge=""/>
+  <StatusBars merge=""/>
+  <Visibility merge=""/>
+  <!-- Foundations should be visible themselves in fog-of-war if their base template is,
+       but shouldn't have any vision range -->
+  <Vision merge="">
+    <Range>0</Range>
+    <RevealShore merge="">false</RevealShore>
+  </Vision>
+  <!-- Switch the actor to foundation mode -->
+  <VisualActor>
+    <Foundation/>
+  </VisualActor>
+</Entity>

binaries/data/mods/_test.sim/simulation/templates/unit.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity>
-    <VisualActor>
-        <Actor>example</Actor>
-        <SilhouetteDisplay>false</SilhouetteDisplay>
-        <SilhouetteOccluder>false</SilhouetteOccluder>
-        <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
-    </VisualActor>
-    <Selectable/>
-    <Position>
-        <Altitude>0</Altitude>
-        <Anchor>upright</Anchor>
-        <Floating>false</Floating>
-        <TurnRate>6.0</TurnRate>
-    </Position>
-    <UnitAI/>
-</Entity>

binaries/data/mods/_test.sim/simulation/templates/unitobstruct.xml

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Entity>
-    <VisualActor>
-        <Actor>example</Actor>
-        <SilhouetteDisplay>false</SilhouetteDisplay>
-        <SilhouetteOccluder>false</SilhouetteOccluder>
-        <VisibleInAtlasOnly>false</VisibleInAtlasOnly>
-    </VisualActor>
-    <Selectable/>
-    <Position>
-        <Altitude>0</Altitude>
-        <Anchor>upright</Anchor>
-        <Floating>false</Floating>
-        <TurnRate>6.0</TurnRate>
-    </Position>
-    <UnitAI/>
-    <Footprint>
-        <Circle radius="4"/>
-        <Height>1.0</Height>
-    </Footprint>
-    <Obstruction>
-        <Unit radius="4"/>
-        <Active>true</Active>
-        <BlockMovement>true</BlockMovement>
-        <BlockPathfinding>false</BlockPathfinding>
-        <BlockFoundation>false</BlockFoundation>
-        <BlockConstruction>true</BlockConstruction>
-        <DisableBlockMovement>false</DisableBlockMovement>
-        <DisableBlockPathfinding>false</DisableBlockPathfinding>
-    </Obstruction>
-</Entity>

binaries/data/mods/mod/art/LICENSE.txt

@@ -0,0 +1,19 @@
+The files in this directory are Copyright (C) 2014 Wildfire Games.
+
+These files are licensed under the Creative Commons Attribution-Share Alike 3.0
+(CC-by-sa) license, available at http://creativecommons.org/licenses/by-sa/3.0/
+
+Briefly, this means:
+
+* You may use, modify and distribute these files, for commercial and
+  non-commercial purposes.
+
+* If you distribute one of these files, you must include attribution (e.g.
+  in the credits screen of a game or a video, or in a text file accompanying
+  the files). The attribution must include:
+  * A link to http://creativecommons.org/licenses/by-sa/3.0/
+  * The name "Wildfire Games" as the original author
+  * A link to http://www.wildfiregames.com/
+
+* If you distribute one of these files, you must release it (and any
+  modifications you have made to it) under the CC-by-sa license.

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

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

@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<element name="Textures" xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <a:documentation/>
+  <!--
+    NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
+      and use a converter tool like trang to generate the Relax NG XML (.rng) file
+  -->
+  <a:documentation/>
+  <zeroOrMore>
+    <element name="File">
+      <interleave>
+        <optional>
+          <attribute name="pattern"/>
+        </optional>
+        <optional>
+          <attribute name="format">
+            <choice>
+              <value>dxt1</value>
+              <value>dxt3</value>
+              <value>dxt5</value>
+              <value>rgba</value>
+              <value>alpha</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="mipmap">
+            <choice>
+              <value>true</value>
+              <value>false</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="normal">
+            <choice>
+              <value>true</value>
+              <value>false</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="alpha">
+            <choice>
+              <value>none</value>
+              <value>player</value>
+              <value>transparency</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="filter">
+            <choice>
+              <value>box</value>
+              <value>triangle</value>
+              <value>kaiser</value>
+            </choice>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="kaiserwidth">
+            <data type="float"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="kaiseralpha">
+            <data type="float"/>
+          </attribute>
+        </optional>
+        <optional>
+          <attribute name="kaiserstretch">
+            <data type="float"/>
+          </attribute>
+        </optional>
+      </interleave>
+    </element>
+  </zeroOrMore>
+</element>

binaries/data/mods/mod/art/textures/textures.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Textures>
+  <File pattern="*" format="dxt5" mipmap="true" filter="box"/>
+</Textures>

binaries/data/mods/mod/audio/LICENSE.txt

@@ -0,0 +1,19 @@
+The files in this directory are Copyright (C) 2009 Wildfire Games.
+
+These files are licensed under the Creative Commons Attribution-Share Alike 3.0
+(CC-by-sa) license, available at http://creativecommons.org/licenses/by-sa/3.0/
+
+Briefly, this means:
+
+* You may use, modify and distribute these files, for commercial and
+  non-commercial purposes.
+
+* If you distribute one of these files, you must include attribution (e.g.
+  in the credits screen of a game or a video, or in a text file accompanying
+  the files). The attribution must include:
+  * A link to http://creativecommons.org/licenses/by-sa/3.0/
+  * The name "Wildfire Games" as the original author
+  * A link to http://www.wildfiregames.com/
+
+* If you distribute one of these files, you must release it (and any
+  modifications you have made to it) under the CC-by-sa license.

binaries/data/mods/mod/audio/interface/ui/ui_button_click.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<RandPitch>1</RandPitch>
+	<Threshold>1</Threshold>
+	<Path>audio/interface/ui</Path>
+	<Sound>ui_button_click.ogg</Sound>
+	<Sound>ui_button_longclick.ogg</Sound>
+</SoundGroup>

binaries/data/mods/mod/audio/interface/ui/ui_button_longclick.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8" standalone="no" ?>
+<SoundGroup>
+	<Gain>1</Gain>
+	<Priority>100</Priority>
+	<ConeGain>1</ConeGain>
+	<Looping>0</Looping>
+	<RandOrder>1</RandOrder>
+	<RandGain>1</RandGain>
+	<RandPitch>1</RandPitch>
+	<Threshold>1</Threshold>
+	<Path>audio/interface/ui</Path>
+	<Sound>ui_button_longclick.ogg</Sound>
+</SoundGroup>

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

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

@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <define name="flag">
+    <a:documentation/>
+    <!--
+      NOTE: To modify this Relax NG grammar, edit the Relax NG Compact (.rnc) file
+        and use a converter tool like trang to generate the Relax NG XML (.rng) file
+    -->
+    <a:documentation/>
+    <a:documentation/>
+    <!-- Types # -->
+    <a:documentation/>
+    <choice>
+      <value>0</value>
+      <value>1</value>
+    </choice>
+  </define>
+  <start>
+    <ref name="SoundGroup"/>
+  </start>
+  <define name="SoundGroup">
+    <element name="SoundGroup">
+      <interleave>
+        <optional>
+          <element name="Gain">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Looping">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Omnipresent">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="HeardBy">
+            <value>owner</value>
+          </element>
+        </optional>
+        <optional>
+          <element name="Distanceless">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Pitch">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Priority">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="RandOrder">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="RandGain">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="GainUpper">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="GainLower">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="RandPitch">
+            <ref name="flag"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="PitchUpper">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="PitchLower">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="ConeGain">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="ConeInner">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="ConeOuter">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Threshold">
+            <data type="float"/>
+          </element>
+        </optional>
+        <optional>
+          <element name="Decay">
+            <data type="float"/>
+          </element>
+        </optional>
+        <oneOrMore>
+          <element name="Sound">
+            <text/>
+          </element>
+        </oneOrMore>
+        <element name="Path">
+          <text/>
+        </element>
+      </interleave>
+    </element>
+  </define>
+</grammar>