diff -Nru 0ad-data-0.0.22/binaries/data/config/default.cfg 0ad-data-0.0.23~rc3/binaries/data/config/default.cfg
--- 0ad-data-0.0.22/binaries/data/config/default.cfg 2017-06-02 22:11:05.000000000 +0000
+++ 0ad-data-0.0.23~rc3/binaries/data/config/default.cfg 2018-04-22 18:14:45.000000000 +0000
@@ -61,7 +61,7 @@
; 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.
+watereffects=true ; When disabled, force usage of the fixed pipeline water. This is faster, but really, really ugly.
waterfancyeffects = false
waterrealdepth = true
waterrefraction = true
@@ -69,9 +69,12 @@
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 = true
@@ -144,10 +147,16 @@
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+W" ; Toggle wireframe mode
-silhouettes = "Alt+S" ; Toggle unit silhouettes
+wireframe = "Alt+Shift+W" ; Toggle wireframe mode
+silhouettes = "Alt+Shift+S" ; Toggle unit silhouettes
showsky = "Alt+Z" ; Toggle sky
+; > 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
copy = "Ctrl+C" ; Copy to clipboard
paste = "Ctrl+V" ; Paste from clipboard
@@ -164,8 +173,10 @@
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.toggleaurarange = "Alt+V" ; Toggle display of aura range overlays of selected units and structures
+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
chat = Return ; Toggle chat window
@@ -233,12 +244,15 @@
[hotkey.selection]
add = Shift ; Add units to selection
-milonly = Alt ; Add only military 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"
@@ -279,7 +293,8 @@
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
-attack = Ctrl ; Modifier to attack instead of another action (eg capture)
+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
@@ -288,6 +303,7 @@
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
@@ -302,6 +318,7 @@
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
@@ -321,6 +338,10 @@
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
@@ -334,13 +355,22 @@
[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
-batchtrainingsize = 5 ; Number of units to be trained per batch (when pressing the hotkey)
-aurarange = true ; Display aura range overlays of selected units and structures
+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
@@ -356,6 +386,12 @@
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
@@ -375,10 +411,13 @@
[lobby]
history = 0 ; Number of past messages to display on join
-room = "arena22" ; Default MUC room to join
+room = "arena23" ; Default MUC room to join
server = "lobby.wildfiregames.com" ; Address of lobby server
-xpartamupp = "wfgbot22" ; Name of the server-side xmpp client that manage games
+xpartamupp = "wfgbot23" ; Name of the server-side XMPP-account that manage games
+echelon = "echelon23" ; 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
+secureauth = true ; Secure Lobby Authentication: This prevents the impersonation of other players. The lobby server confirms the identity of the player before they join.
[lobby.columns]
gamerating = false ; Show the average rating of the participating players in a column of the gamelist
@@ -394,6 +433,14 @@
[mod]
enabledmods = "mod public"
+[modio]
+public_key = "RWQBhIRg+dOifTWlwgYHe8RfD8bqoDh1cCvygboAl3GOUKiCo0NlF4fw" ; Public key corresponding to the private key valid mods are signed with
+
+[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.
Binary files /tmp/tmperR1TQ/z0muIM7iXY/0ad-data-0.0.22/binaries/data/mods/mod/mod.zip and /tmp/tmperR1TQ/fau1UibALD/0ad-data-0.0.23~rc3/binaries/data/mods/mod/mod.zip differ
Binary files /tmp/tmperR1TQ/z0muIM7iXY/0ad-data-0.0.22/binaries/data/mods/public/public.zip and /tmp/tmperR1TQ/fau1UibALD/0ad-data-0.0.23~rc3/binaries/data/mods/public/public.zip differ
diff -Nru 0ad-data-0.0.22/binaries/data/tools/atlas/help.json 0ad-data-0.0.23~rc3/binaries/data/tools/atlas/help.json
--- 0ad-data-0.0.22/binaries/data/tools/atlas/help.json 1970-01-01 00:00:00.000000000 +0000
+++ 0ad-data-0.0.23~rc3/binaries/data/tools/atlas/help.json 2017-08-21 23:32:29.000000000 +0000
@@ -0,0 +1,13 @@
+{
+ "Manual": {
+ "title": "&Atlas Manual",
+ "tooltip": "Click to visit the 0 A.D. Atlas Wiki.",
+ "url": "https://trac.wildfiregames.com/wiki/Atlas_Manual"
+ },
+ "ReportBug": {
+ "title": "Report a &Bug",
+ "tooltip": "Click to visit our bug tracker to report a crash or other error.",
+ "url": "https://trac.wildfiregames.com/wiki/ReportingErrors"
+ }
+}
+
diff -Nru 0ad-data-0.0.22/binaries/data/tools/atlas/lists.xml 0ad-data-0.0.23~rc3/binaries/data/tools/atlas/lists.xml
--- 0ad-data-0.0.22/binaries/data/tools/atlas/lists.xml 2016-08-11 14:35:50.000000000 +0000
+++ 0ad-data-0.0.23~rc3/binaries/data/tools/atlas/lists.xml 2018-04-07 18:46:09.000000000 +0000
@@ -1,62 +1,66 @@
-
-
-
- - root
- - head
- - helmet
- - head_extra
- - l_hand
- - shield
- - l_forearm
- - l_shoulder
- - r_hand
- - r_forearm
- - r_shoulder
- - chest
- - back
- - shoulders
- - l_leg
- - r_leg
- - l_hip
- - r_hip
- - tree
- - props_main
- - props_fancy
-
-
-
- - baseTex
- - aoTex
- - normTex
- - specTex
-
-
-
- - idle
- - walk
- - run
- - attack_melee
- - attack_ranged
- - attack_capture
- - attack_slaughter
- - death
- - build
- - heal
- - promotion
- - gather_fruit
- - gather_grain
- - gather_meat
- - gather_tree
- - gather_rock
- - gather_ore
- - gather_ruins
- - gather_treasure
- - feeding
- - garrisoned
- - gate_closed
- - gate_closing
- - gate_open
- - gate_opening
-
-
-
+
+
+
+ - root
+ - head
+ - helmet
+ - head_extra
+ - l_hand
+ - shield
+ - l_forearm
+ - l_shoulder
+ - r_hand
+ - r_forearm
+ - r_shoulder
+ - chest
+ - back
+ - shoulders
+ - l_leg
+ - r_leg
+ - l_hip
+ - r_hip
+ - tree
+ - props_main
+ - props_fancy
+
+
+ - baseTex
+ - aoTex
+ - normTex
+ - specTex
+
+
+ - idle
+ - walk
+ - run
+ - attack_melee
+ - attack_ranged
+ - attack_capture
+ - attack_slaughter
+ - death
+ - build
+ - heal
+ - promotion
+ - gather_fruit
+ - gather_grain
+ - gather_meat
+ - gather_tree
+ - gather_rock
+ - gather_ore
+ - gather_praise
+ - gather_ruins
+ - gather_treasure
+ - feeding
+ - garrisoned
+ - gate_closed
+ - gate_closing
+ - gate_open
+ - carry_meat
+ - carry_wood
+ - carry_metal
+ - phalanx_idle
+ - phalanx_back_idle
+ - phalanx_walk
+ - phalanx_run
+
+
diff -Nru 0ad-data-0.0.22/debian/changelog 0ad-data-0.0.23~rc3/debian/changelog
--- 0ad-data-0.0.22/debian/changelog 2017-07-27 10:25:19.000000000 +0000
+++ 0ad-data-0.0.23~rc3/debian/changelog 2018-05-16 14:15:05.000000000 +0000
@@ -1,8 +1,21 @@
-0ad-data (0.0.22-0ubuntu1~16.04~wfg0) xenial; urgency=high
+0ad-data (0.0.23~rc3-0ubuntu1~16.04~wfg0) xenial; urgency=high
- * New upstream version (Alpha 22 Venustas)
+ * New upstream version (Alpha 23 Ken Wood)
- -- Rico Tzschichholz Thu, 27 Jul 2017 12:25:19 +0200
+ -- Rico Tzschichholz Wed, 16 May 2018 16:15:05 +0200
+
+0ad-data (0.0.22-1) unstable; urgency=medium
+
+ * New upstream release.
+
+ -- Ludovic Rousseau Wed, 18 Oct 2017 15:17:05 +0200
+
+0ad-data (0.0.21-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update Standards version to 3.9.8, no changes required.
+
+ -- Vincent Cheng Sat, 12 Nov 2016 17:16:08 -0800
0ad-data (0.0.20-1) unstable; urgency=medium
diff -Nru 0ad-data-0.0.22/debian/control 0ad-data-0.0.23~rc3/debian/control
--- 0ad-data-0.0.22/debian/control 2017-07-27 10:25:19.000000000 +0000
+++ 0ad-data-0.0.23~rc3/debian/control 2018-05-16 14:15:05.000000000 +0000
@@ -3,9 +3,10 @@
Priority: optional
Maintainer: Ubuntu Developers
XSBC-Original-Maintainer: Debian Games Team
-Uploaders: Vincent Cheng
+Uploaders: Vincent Cheng ,
+ Ludovic Rousseau
Build-Depends: debhelper (>= 9), dpkg-dev (>= 1.15.5)
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
Homepage: http://play0ad.com/
Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/0ad-data/
Vcs-Browser: https://anonscm.debian.org/viewvc/pkg-games/packages/trunk/0ad-data/