From f68528777fe31e27f5cd437b4c963153e816723d Mon Sep 17 00:00:00 2001 From: Stan Date: Tue, 4 Oct 2022 17:05:11 +0000 Subject: [PATCH] Bump version to alpha 27. Last alpha 26 commit was [[SVN:27104]] Accepted by: @asterix, @vladislavbelov Discussed with: @Freagarach, @wraitii, @implodedok, @Itms Refs: #6625 Differential Revision: https://code.wildfiregames.com/D4789 This was SVN commit r27105. --- binaries/data/config/default.cfg | 8 +-- binaries/data/mods/mod/gui/modmod/modmod.js | 4 +- .../data/mods/mod/gui/modmod/validatemod.js | 2 +- .../data/mods/public/campaigns/new_maps.json | 50 ++----------------- .../public/gui/pregame/ProjectInformation.js | 2 +- .../gui/session/top_panel/BuildLabel.xml | 2 +- .../maps/skirmishes/acropolis_bay_2p.xml | 4 +- .../maps/skirmishes/corinthian_isthmus_2p.xml | 4 +- .../skirmishes/cycladic_archipelago_2p.xml | 4 +- .../maps/skirmishes/median_oasis_2p.xml | 4 +- .../public/maps/skirmishes/tarim_basin_2p.xml | 4 +- .../public/maps/skirmishes/tarim_basin_4p.xml | 4 +- .../public/maps/skirmishes/yangtze_2p.xml | 4 +- binaries/data/mods/public/mod.json | 2 +- source/ps/Pyrogenesis.cpp | 2 +- 15 files changed, 28 insertions(+), 72 deletions(-) diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg index 966c5ee8b6..d787adff35 100644 --- a/binaries/data/config/default.cfg +++ b/binaries/data/config/default.cfg @@ -480,7 +480,7 @@ extended = true ; Whether to display the chat history [lobby] history = 0 ; Number of past messages to display on join -room = "arena26" ; Default MUC room to join +room = "arena27" ; 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) @@ -488,8 +488,8 @@ terms_url = "https://trac.wildfiregames.com/browser/ps/trunk/binaries/data/mods/ 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 = "wfgbot26" ; Name of the server-side XMPP-account that manage games -echelon = "echelon26" ; Name of the server-side XMPP-account that manages ratings +xpartamupp = "wfgbot27" ; Name of the server-side XMPP-account that manage games +echelon = "echelon27" ; 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 @@ -509,7 +509,7 @@ enabledmods = "mod public" [modio] -public_key = "RWQa4XiSn+BLxIYXNrXyz68wwTGWyZ7+kxDtZuLHBXkCtt+lLB8VnpdM" ; Public key corresponding to the private key valid mods are signed with +public_key = "RWQv2alKl8D0zMDJR766jpYvPy4u3y77HL/iKb/lsT1Fnf6ezoMb2x8+" ; 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] diff --git a/binaries/data/mods/mod/gui/modmod/modmod.js b/binaries/data/mods/mod/gui/modmod/modmod.js index 8a30354543..1d0b6d2e2f 100644 --- a/binaries/data/mods/mod/gui/modmod/modmod.js +++ b/binaries/data/mods/mod/gui/modmod/modmod.js @@ -6,7 +6,7 @@ * A mod is defined by a mod.json file, for example * { * "name": "0ad", - * "version": "0.0.26", + * "version": "0.0.27", * "label": "0 A.D. - Empires Ascendant", * "url": "https://wildfiregames.com/", * "description": "A free, open-source, historical RTS game.", @@ -19,7 +19,7 @@ * "label": "Mod 2", * "version": "1.1", * "description": "", - * "dependencies": ["0ad<=0.0.26", "rote"] + * "dependencies": ["0ad<=0.0.27", "rote"] * } * * A mod is identified by the directory name. diff --git a/binaries/data/mods/mod/gui/modmod/validatemod.js b/binaries/data/mods/mod/gui/modmod/validatemod.js index 63acaaa16f..0af0972636 100644 --- a/binaries/data/mods/mod/gui/modmod/validatemod.js +++ b/binaries/data/mods/mod/gui/modmod/validatemod.js @@ -5,7 +5,7 @@ const g_ModProperties = { "type": "string", "validate": validateName }, - // example: "0.0.26" + // example: "0.0.27" "version": { "required": true, "type": "string", diff --git a/binaries/data/mods/public/campaigns/new_maps.json b/binaries/data/mods/public/campaigns/new_maps.json index b85e7a3336..dd77bc27ae 100644 --- a/binaries/data/mods/public/campaigns/new_maps.json +++ b/binaries/data/mods/public/campaigns/new_maps.json @@ -1,51 +1,7 @@ { "Name": "Demo campaign - new maps", - "Description": "Discover the new and improved maps in Alpha XXVI with a demo campaign, taking you through all of them.", - "Levels": { - "Chang Jiang": { - "Map": "skirmishes/yangtze_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - }, - "Median Oasis": { - "Map": "skirmishes/median_oasis_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - }, - "Acropolis Bay": { - "Map": "skirmishes/acropolis_bay_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - }, - "Corinthian Isthmus": { - "Map": "skirmishes/corinthian_isthmus_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - }, - "Cycladic Archipelago": { - "Map": "skirmishes/cycladic_archipelago_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - }, - "Tarim Basin 2p": { - "Map": "skirmishes/tarim_basin_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - }, - "Tarim Basin 4p": { - "Map": "skirmishes/tarim_basin_4p.xml", - "MapType": "skirmish", - "useGameSetup": true - } - }, - "Order": [ - "Chang Jiang", - "Median Oasis", - "Acropolis Bay", - "Corinthian Isthmus", - "Cycladic Archipelago", - "Tarim Basin 2p", - "Tarim Basin 4p" - ], + "Description": "Discover the new and improved maps in Alpha XXVII with a demo campaign, taking you through all of them.", + "Levels": {}, + "Order": [], "ShowUnavailable": true } diff --git a/binaries/data/mods/public/gui/pregame/ProjectInformation.js b/binaries/data/mods/public/gui/pregame/ProjectInformation.js index cb2e008acc..a7da87f1fc 100644 --- a/binaries/data/mods/public/gui/pregame/ProjectInformation.js +++ b/binaries/data/mods/public/gui/pregame/ProjectInformation.js @@ -15,7 +15,7 @@ var g_ProjectInformation = { "caption": getBuildString() }, "productDescription": { - "caption": setStringTags(translate("Alpha XXVI: Zhuangzi"), { "font": "sans-bold-16" }) + "\n\n" + + "caption": setStringTags(translate("Alpha XXVII: ———"), { "font": "sans-bold-16" }) + "\n\n" + translate("Notice: This game is under development and many features have not been added yet.") } }; diff --git a/binaries/data/mods/public/gui/session/top_panel/BuildLabel.xml b/binaries/data/mods/public/gui/session/top_panel/BuildLabel.xml index 69b6023d03..e13cf1382f 100644 --- a/binaries/data/mods/public/gui/session/top_panel/BuildLabel.xml +++ b/binaries/data/mods/public/gui/session/top_panel/BuildLabel.xml @@ -3,7 +3,7 @@ - Alpha XXVI: Zhuangzi + Alpha XXVII: ——— diff --git a/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml b/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml index b8f03b515a..6586d58c60 100644 --- a/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/acropolis_bay_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:08a2ad126bb1a5217a1772582ca961eb646b95d807d0e6a5b1f53cdec41121bb -size 847910 +oid sha256:87ba40130bbc84d6a9a702bb2ba7c62e6d61dad217ba32bf2f81bf0caf98fcb3 +size 847897 diff --git a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml index c8364e3153..818a09be99 100644 --- a/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/corinthian_isthmus_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:908a0e91dd4b755e246675c4c9a41f4a09c15070525e2ade62ce196687f0cc21 -size 474066 +oid sha256:52bf193f8c7a49ff2f592364db9c68e833b0099f936d1d006da2ae165f6156a2 +size 474054 diff --git a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml index 608b197734..aba2d14d75 100644 --- a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23a1b6f8dfd557f7854f329a85d64e19b077444c5e3cc6011573879422b72cb4 -size 488589 +oid sha256:6bb3caf401776862707b6af324be536b7bd41853dd3aa8c5eaf99dcb0a50842c +size 488579 diff --git a/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml b/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml index 87dfab0c60..8651bb024f 100644 --- a/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/median_oasis_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1cb706793ec2537f7e66832895520e045b19d6a94106fd949112a38dc2b5e5b7 -size 452073 +oid sha256:9baa6ab102b247bbfac07806b4450ba65d5e9215ed0f03f4aa63662302262074 +size 452061 diff --git a/binaries/data/mods/public/maps/skirmishes/tarim_basin_2p.xml b/binaries/data/mods/public/maps/skirmishes/tarim_basin_2p.xml index dc75901f17..6550b3a2d9 100644 --- a/binaries/data/mods/public/maps/skirmishes/tarim_basin_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/tarim_basin_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23f5b7b940f3324790cc19dd1e81c0c03db587a67aa812b05170d94acfb5f200 -size 323903 +oid sha256:e622cbfe3ed819fb67a764fa90fb4090b9fab8d338b74ee3ab83e7f8309480c3 +size 323891 diff --git a/binaries/data/mods/public/maps/skirmishes/tarim_basin_4p.xml b/binaries/data/mods/public/maps/skirmishes/tarim_basin_4p.xml index eddee1f873..3bbec86e77 100644 --- a/binaries/data/mods/public/maps/skirmishes/tarim_basin_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/tarim_basin_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:62a534c251aa98a5a969faa2926855102f38725361d939e3f0a80cdb5427ac35 -size 361113 +oid sha256:73c5e9f4a2342ebfa8f589b0b1d72a51a41a0bd48e9872c12223bb367cee2e87 +size 361101 diff --git a/binaries/data/mods/public/maps/skirmishes/yangtze_2p.xml b/binaries/data/mods/public/maps/skirmishes/yangtze_2p.xml index 0c445722ba..d80a7cd8b1 100644 --- a/binaries/data/mods/public/maps/skirmishes/yangtze_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/yangtze_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d41df0e01c809833c09ae2a96b203e545d598a26bbb222f5b8cd5ef4040abee4 -size 495761 +oid sha256:32d5cbe235edc44ce2669f4d0dead514806db08a9290c6ad1245874ee909fbb5 +size 495751 diff --git a/binaries/data/mods/public/mod.json b/binaries/data/mods/public/mod.json index c26a9efe6f..cd461a00b5 100644 --- a/binaries/data/mods/public/mod.json +++ b/binaries/data/mods/public/mod.json @@ -1,6 +1,6 @@ { "name": "0ad", - "version": "0.0.26", + "version": "0.0.27", "label": "0 A.D. Empires Ascendant", "url": "https://play0ad.com", "description": "A free, open-source, historical RTS game.", diff --git a/source/ps/Pyrogenesis.cpp b/source/ps/Pyrogenesis.cpp index 9effc75581..d5ed1d7b6d 100644 --- a/source/ps/Pyrogenesis.cpp +++ b/source/ps/Pyrogenesis.cpp @@ -24,7 +24,7 @@ #include "lib/sysdep/sysdep.h" #include "lib/svn_revision.h" -const char* engine_version = "0.0.26"; +const char* engine_version = "0.0.27"; const char* main_window_name = "0 A.D."; // convert contents of file from char to wchar_t and