Fixes typo in OS X bundle build script.

Changes SDL2 version in build-osx-libs.sh to Hg snapshot SDL-2.0.4-9134,
refs #2852

This was SVN commit r15849.

LICENSE.txt

@@ -51,8 +51,13 @@ in particular, let us know and we can try to clarify it.
   /source/lib
     MIT
 
-  /source/lobby/pkcs5_pbkdf2.cpp
-    ISC
+  /source/third_party/encryption
+    GPL version 2 (or later)
+    ISC (pkcs5_pbkdf2.cpp)
+    MIT (pkcs5_pbkdf2.h)
+
+  /source/third-party/jsonspirit
+    MIT
 
   /source/third_party/mikktspace
     zlib
@@ -60,6 +65,9 @@ in particular, let us know and we can try to clarify it.
   /source/third_party/mongoose
     MIT
 
+  /source/third_party/tinygettext
+    GPL version 2 (or later) - see license_gpl-2.0.txt
+
   /source/tools
     Various - see LICENSE.txt within that directory
 

binaries/data/config/default.cfg

@@ -20,8 +20,14 @@
 ; Enable/disable windowed mode by default. (Use Alt+Enter to toggle in the game.)
 windowed = false
 
+; Show detailed tooltips (Unit stats)
+showdetailedtooltips = false
+
 ; Enable/disable the splashscreen
-splashscreenenable = true
+splashscreendisable = false
+
+; Splashscreen version (date of last modification). By default, 0 to force splashscreen to appear at first launch.
+splashscreenversion = 0
 
 ; Pause the game on window focus loss (Only applicable to single player mode)
 pauseonfocusloss = true
@@ -41,15 +47,20 @@ 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
+
 ; System settings:
 
-waternormals = true
+; if false, actors won't be rendered but anything entity will be.
+renderactors = true
+
+waterugly=false; 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
 shadowpcf = true
@@ -270,6 +281,7 @@ hotkey.session.kill = Delete                ; Destroy selected units
 hotkey.session.stop = "H"                   ; Stop the current action
 hotkey.session.attack = "Ctrl+Alt"          ; Modifier to force attack instead of another action
 hotkey.session.attackmove = Ctrl            ; Modifier to attackmove when clicking on a point
+hotkey.session.attackmoveUnit = "Ctrl+Q"    ; Modifier to attackmove targeting only units when clicking on a point (should contain the attackmove keys)
 hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building
 hotkey.session.autorallypoint = Ctrl        ; Modifier to set the rally point on the building itself
 hotkey.session.guard = "G"                  ; Modifier to escort/guard when clicking on unit/building
@@ -277,6 +289,7 @@ hotkey.session.queue = Shift                ; Modifier to queue unit orders inst
 hotkey.session.batchtrain = Shift           ; Modifier to train units in batches
 hotkey.session.massbarter = Shift           ; Modifier to barter bunch of resources
 hotkey.session.masstribute = Shift          ; Modifier to tribute bunch of resources
+hotkey.session.fulltradeswap = Shift        ; Modifier to put the desired trade resource to 100%
 hotkey.session.unloadtype = Shift           ; Modifier to unload all units of type
 hotkey.session.deselectgroup = Ctrl         ; Modifier to deselect units when clicking group icon, instead of selecting
 hotkey.session.rotate.cw = RightBracket     ; Rotate building placement preview clockwise
@@ -296,6 +309,7 @@ hotkey.session.queueunit.8 = Comma          ; add eighth unit type to queue
 
 ; > OVERLAY KEYS
 hotkey.fps.toggle = "Alt+F"                  ; Toggle frame counter
+hotkey.realtime.toggle = "Alt+T"             ; Toggle current display of computer time
 hotkey.session.devcommands.toggle = "Alt+D"  ; Toggle developer commands panel
 hotkey.session.gui.toggle = "Alt+G"          ; Toggle visibility of session GUI
 hotkey.menu.toggle = "F10"                   ; Toggle in-game menu
@@ -307,7 +321,6 @@ hotkey.session.highlightguarded = PgUp       ; Toggle highlight of guarded units
 ; > HOTKEYS ONLY
 hotkey.chat = Return                        ; Toggle chat window
 hotkey.teamchat = "T"                       ; Toggle chat window in team chat mode
-hotkey.complete.playername = "Alt+C"        ; Complete a player's name
 
 ; > GUI TEXTBOX HOTKEYS
 hotkey.text.delete.left = "Ctrl+Backspace"    ; Delete word to the left of cursor
@@ -318,17 +331,17 @@ hotkey.text.move.right = "Ctrl+RightArrow"    ; Move cursor to start of word to
 ; > 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
+hotkey.profile2.toggle = "Ctrl+F11"         ; Enable/disable HTTP/GPU modes for new profiler
 
-profiler2.http.autoenable = false           ; Enable HTTP server output at startup (default off for security/performance)
+profiler2.autoenable = false                ; Enable HTTP server output at startup (default off for security/performance)
 profiler2.script.enable = false             ; Enable Javascript profiling. Needs to be set before startup and can't be changed later. (default off for performance)
-profiler2.gpu.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
 
-; > JS DEBUGGER
-jsdebugger.enable = false                   ; Enable Javascript debugging (default off for security/performance)
+; 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.
 
 ; > QUICKSAVE
 hotkey.quicksave = "Shift+F5"
@@ -355,6 +368,14 @@ gui.cursorblinkrate = 0.5          ; Cursor blink rate in seconds (0.0 to disabl
 
 ; Multiplayer lobby preferences
 lobby.server = "lobby.wildfiregames.com"  ; Address of lobby server
-lobby.xpartamupp = "wfgbot"               ; Name of the server-side xmpp client that manage games
+lobby.xpartamupp = "wfgbot17"             ; Name of the server-side xmpp client that manage games
 lobby.chattimestamp = false               ; Show time chat message was posted
-lobby.room = "arena15"                    ; Default MUC room to join
+lobby.room = "arena17"                    ; Default MUC room to join
+lobby.history = 0                         ; Number of past messages to display on join
+
+; Overlay Preferences
+overlay.fps = "false"                     ; Show frames per second in top right corner
+overlay.realtime = "false"                ; Show current system time in top right corner
+
+; MOD SETTINGS
+mod.enabledmods = "mod public"

binaries/data/config/keys.txt

@@ -147,6 +147,9 @@ Right Mouse Button, MouseRight
 Middle Mouse Button, MouseMiddle
 Mouse Wheel Up, WheelUp
 Mouse Wheel Down, WheelDown
+MouseButtonX, MouseNX # where X is a number 1-255, for extra mouse buttons
+## (note that some mice start numbering their buttons at higher numbers
+##  so the first extra button on your mouse might be #8 here)
 
 ## Special keys for international and non-QWERTY keyboards:
 World0, W0

binaries/data/l10n/.tx/config

@@ -0,0 +1,8 @@
+[main]
+host = https://www.transifex.com
+
+[0ad.engine]
+file_filter = <lang>.engine.po
+source_file = engine.pot
+source_lang = en
+

binaries/data/l10n/messages.json

@@ -0,0 +1,30 @@
+[
+	{
+		"output": "engine.pot",
+		"inputRoot": "../../../source",
+		"project": "Pyrogenesis",
+		"copyrightHolder": "Wildfire Games",
+		"rules": [
+			{
+				"extractor": "cpp",
+				"filemasks": {
+					"includeMasks": ["**.cpp"],
+					"excludeMasks": ["third_party/**", "tools/**"]
+				},
+				"options": {
+					"keywords": {
+						"Translate": [1],
+						"TranslatePlural": [1, 2],
+						"TranslateWithContext": [[1], 2],
+						"TranslatePluralWithContext": [[1], 2, 3],
+						"MarkForTranslation": [1],
+						"MarkForTranslationWithContext": [[1], 2]
+					},
+					"commentTags": [
+						"Translation:"
+					]
+				}
+			}
+		]
+	}
+]

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/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.