Adds notice of saved game issues to Aegis' description

This was SVN commit r13332.
Added mauryan healer skin and head.
2013-04-01 15:03:31 +00:00 · 2013-04-01 00:48:18 +00:00 · 2013-03-31 23:53:53 +00:00 · 2013-03-30 07:30:54 +00:00 · 2013-03-25 05:01:36 +00:00 · 2013-03-24 09:10:32 +00:00
2669 changed files with 187586 additions and 11061 deletions
@@ -8,5 +8,4 @@
 *.png filter=lfs diff=lfs merge=lfs -text
 *.psa filter=lfs diff=lfs merge=lfs -text
 *.ttf filter=lfs diff=lfs merge=lfs -text
-binaries/data/mods/internal/maps/**/*.xml filter=lfs diff=lfs merge=lfs -text
 binaries/data/mods/public/maps/**/*.xml filter=lfs diff=lfs merge=lfs -text
@@ -14,24 +14,6 @@ the file's path.
 Some files don't yet have licensing details specified - if you care about any
 in particular, let us know and we can try to clarify it.

-  /source
-    GPL version 2 (or later) - see license_gpl-2.0.txt
-
-  /source/lib
-    MIT
-
-  /source/third_party/mikktspace
-    zlib
-
-  /source/third_party/mongoose
-    MIT
-
-  /source/tools
-    Various (unspecified)
-
-  /source/tools/atlas
-    GPL version 2 (or later) - see license_gpl-2.0.txt
-
  /binaries/data
    GPL version 2 (or later) - see license_gpl-2.0.txt

@@ -48,11 +30,35 @@ in particular, let us know and we can try to clarify it.
    Proprietary - see license_dbghelp.txt for restrictions you must agree to
    before distributing this particular file

-  /libraries
-    Various - see individual directories and files for details
-
  /build
    Various (unspecified)

+  /build/premake/premake4
+    BSD
+
+  /build/premake/*.lua
+    MIT
+
  /docs
    Various (unspecified)
+
+  /libraries
+    Various - see LICENSE.txt within that directory
+
+  /source
+    GPL version 2 (or later) - see license_gpl-2.0.txt
+
+  /source/lib
+    MIT
+
+  /source/third_party/mikktspace
+    zlib
+
+  /source/third_party/mongoose
+    MIT
+
+  /source/tools
+    Various - see LICENSE.txt within that directory
+
+  /source/tools/atlas
+    GPL version 2 (or later) - see license_gpl-2.0.txt
@@ -21,8 +21,7 @@
 windowed = false

 ; Enable/disable the splashscreen
-; Currently commented out in default.cfg because of a bug with writing configuration files
-;splashscreenenable = true
+splashscreenenable = true

 ; Pause the game on window focus loss (Only applicable to single player mode)
 pauseonfocusloss = true
@@ -30,6 +29,9 @@ pauseonfocusloss = true
 ; Default player name to use in multiplayer
 ; playername = "anonymous"

+; Default server name or IP to use in multiplayer
+multiplayerserver = "127.0.0.1"
+
 ; Force a particular resolution. (If these are 0, the default is
 ; to keep the current desktop resolution in fullscreen mode or to
 ; use 1024x768 in windowed mode.)
@@ -157,41 +159,41 @@ view.height.min = 16
 ; See keys.txt for the list of key names.

 ; > SYSTEM SETTINGS
-hotkey.exit = "Alt+F4", "Ctrl+Break"        ; Exit to desktop
+hotkey.exit = "Alt+F4", "Ctrl+Break", "Super+Q" ; Exit to desktop
 hotkey.leave = Escape                       ; End current game or Exit
 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 = "K"           ; Toggle product/company watermark for official screenshots
+hotkey.screenshot.watermark = "Alt+K"       ; Toggle product/company watermark for official screenshots
 hotkey.wireframe = "Alt+W"                  ; Toggle wireframe mode
 hotkey.silhouettes = "Alt+S"                ; Toggle unit silhouettes
 hotkey.showsky = "Alt+Z"                    ; Toggle sky

 ; > CAMERA SETTINGS
-hotkey.camera.reset = "H"                                 ; 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.reset = "H"                                   ; 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, ForwardSlash             ; 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.pan = MouseMiddle, ForwardSlash               ; 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

 ; > CONSOLE SETTINGS
 hotkey.console.toggle = BackQuote, F9       ; Open/close console
@@ -241,11 +243,13 @@ hotkey.selection.group.add.9 = "Shift+9"

 ; > SESSION CONTROLS
 hotkey.session.kill = Delete                ; Destroy selected units
-hotkey.session.attack = Ctrl				; Modifier to force attack instead of another action
+hotkey.session.attack = "Ctrl+Alt"          ; Modifier to force attack instead of another action
 hotkey.session.garrison = Ctrl              ; Modifier to garrison when clicking on building
+hotkey.session.attackmove = Ctrl            ; Modifier to attackmove when clicking on a point
 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
@@ -286,11 +290,15 @@ hotkey.profile.save = "Shift+F11"           ; Save current profiler data to logs
 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

+; > JS DEBUGGER
+jsdebugger.enable = false                   ; Enable Javascript debugging (default off for security/performance) 			
+
 ; > QUICKSAVE
 hotkey.quicksave = "Shift+F5"
 hotkey.quickload = "Shift+F8"
@@ -304,3 +312,6 @@ joystick.camera.rotate.x = 3
 joystick.camera.rotate.y = 2
 joystick.camera.zoom.in = 5
 joystick.camera.zoom.out = 4
+
+; GENERAL GUI SETTINGS
+gui.cursorblinkrate = 0.5          ; Cursor blink rate in seconds (0.0 to disable blinking)
@@ -120,16 +120,18 @@ Caps Lock, CapsLock
 Scroll Lock, ScrlLock
 Right Shift, RightShift
 Left Shift, LeftShift
+Shift, AnyShift
 Right Ctrl, RightCtrl
 Left Ctrl, LeftCtrl
+Ctrl, AnyCtrl
 Right Alt, RightAlt
 Left Alt, LeftAlt
-Right Meta
-Left Meta
+Alt, AnyAlt
 Left Super, LeftWin
 Right Super, RightWin
+Super, AnyWindows		## Windows key, also Command/meta key on Macs
 Alt Gr, AltGr
-Compose 
+Compose

 Help
 Print Screen, PrtSc
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant name="straight_a">
-      <mesh>gaia/cliff_a.dae</mesh>
-    </variant>
-    <variant name="corner_inside">
-      <mesh>gaia/cliff_a_corner_inside.dae</mesh>
-    </variant>
-  </group>
-  <group>
-    <variant>
-      <textures><texture file="gaia/cliff_desert_a.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <material>basic_trans.xml</material>
-</actor>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="chinese merchant sail">
-      <mesh>props/chin_merch_sail.dae</mesh>
-      <textures><texture file="props/chin_sail_dragon.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant frequency="100" name="chinese trireme sail">
-      <mesh>props/chin_tri_sail.dae</mesh>
-      <textures><texture file="props/chin_sail_dragon.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant name="Chinese Merchant Ship">
-      <mesh>structural/chin_merch.dae</mesh>
-      <props>
-        <prop actor="props/structures/chinese/merchant_sail.xml" attachpoint="root"/>
-      </props>
-      <textures><texture file="structural/chin_ship.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <float/>
-  <group>
-    <variant name="Chinese Trireme">
-      <mesh>structural/chin_tri.dae</mesh>
-      <props>
-        <prop actor="props/structures/chinese/trireme_sail.xml" attachpoint="root"/>
-        <prop actor="props/units/weapons/arrow_front.xml" attachpoint="projectile"/>
-      </props>
-      <textures><texture file="structural/chin_ship.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-  <material>player_trans.xml</material>
-</actor>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<actor version="1">
-  <castshadow/>
-  <group>
-    <variant>
-      <mesh>structural/wonder_colosseum_main.dae</mesh>
-      <props>
-        <prop actor="props/structures/miscellaneous/colosseum_details.xml" attachpoint="root"/>
-        <prop actor="props/structures/miscellaneous/colosseum_interior.xml" attachpoint="root"/>
-        <prop actor="props/structures/miscellaneous/colosseum_roof.xml" attachpoint="root"/>
-      </props>
-      <textures><texture file="null_white.dds" name="baseTex"/></textures>
-    </variant>
-  </group>
-</actor>
--- a/Show More
+++ b/Show More