diff -Nru 0ad-data-0.0.12/binaries/data/config/default.cfg 0ad-data-0.0.13/binaries/data/config/default.cfg --- 0ad-data-0.0.12/binaries/data/config/default.cfg 2012-11-17 18:27:31.000000000 +0000 +++ 0ad-data-0.0.13/binaries/data/config/default.cfg 2013-03-15 21:59:36.000000000 +0000 @@ -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 @@ ; 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 @@ ; 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 @@ ; > 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.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.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) diff -Nru 0ad-data-0.0.12/binaries/data/config/keys.txt 0ad-data-0.0.13/binaries/data/config/keys.txt --- 0ad-data-0.0.12/binaries/data/config/keys.txt 2010-11-07 20:42:52.000000000 +0000 +++ 0ad-data-0.0.13/binaries/data/config/keys.txt 2013-02-24 21:42:21.000000000 +0000 @@ -120,16 +120,18 @@ 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 Binary files /tmp/wbWykFkZmw/0ad-data-0.0.12/binaries/data/mods/public/public.zip and /tmp/hDGGrFaUio/0ad-data-0.0.13/binaries/data/mods/public/public.zip differ diff -Nru 0ad-data-0.0.12/binaries/data/tools/atlas/lists.xml 0ad-data-0.0.13/binaries/data/tools/atlas/lists.xml --- 0ad-data-0.0.12/binaries/data/tools/atlas/lists.xml 2012-08-09 04:02:49.000000000 +0000 +++ 0ad-data-0.0.13/binaries/data/tools/atlas/lists.xml 2013-01-09 14:39:25.000000000 +0000 @@ -35,7 +35,10 @@ idle walk run - melee + attack_melee + attack_ranged + attack_charge + attack_slaughter death build heal diff -Nru 0ad-data-0.0.12/debian/changelog 0ad-data-0.0.13/debian/changelog --- 0ad-data-0.0.12/debian/changelog 2012-12-18 09:52:20.000000000 +0000 +++ 0ad-data-0.0.13/debian/changelog 2013-04-03 02:42:08.000000000 +0000 @@ -1,3 +1,9 @@ +0ad-data (0.0.13-1) unstable; urgency=low + + * New upstream release. + + -- Vincent Cheng Tue, 02 Apr 2013 19:41:54 -0700 + 0ad-data (0.0.12-1) unstable; urgency=low [ Vincent Cheng ] diff -Nru 0ad-data-0.0.12/debian/control 0ad-data-0.0.13/debian/control --- 0ad-data-0.0.12/debian/control 2012-12-18 10:02:22.000000000 +0000 +++ 0ad-data-0.0.13/debian/control 2013-03-14 02:18:29.000000000 +0000 @@ -29,8 +29,8 @@ Architecture: all Pre-Depends: dpkg (>= 1.15.6~) Depends: tex-gyre, ttf-dejavu-core, ${misc:Depends} -Breaks: 0ad-data (<< 0.0.12-1) -Replaces: 0ad-data (<< 0.0.12-1) +Breaks: 0ad-data (<< 0.0.12-1~) +Replaces: 0ad-data (<< 0.0.12-1~) Suggests: 0ad Description: Real-time strategy game of ancient warfare (common data files) 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform diff -Nru 0ad-data-0.0.12/debian/copyright 0ad-data-0.0.13/debian/copyright --- 0ad-data-0.0.12/debian/copyright 2012-12-18 08:18:40.000000000 +0000 +++ 0ad-data-0.0.13/debian/copyright 2013-02-13 05:33:17.000000000 +0000 @@ -17,6 +17,15 @@ Copyright: 2009 Polish TeX Users Group License: Gust-Font +Files: public.zip/uzip://hwdetect/hwdetect.js +Copyright: 2012 Wildfire Games +License: Expat + +Files: public.zip/uzip://simulation/ai/qbot/* + public.zip/uzip://simulation/ai/qbot-wc/* +Copyright: 2012 Wildfire Games +License: GPL-2+ + Files: debian/* Copyright: 2010-2012 Rico Tzschichholz 2012 Vincent Cheng @@ -486,6 +495,26 @@ . Creative Commons may be contacted at http://creativecommons.org/. +License: Expat + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Software, and to + permit persons to whom the Software is furnished to do so, subject to + the following conditions: + . + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + . + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + License: GPL-2+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by