From dc830ccf55a111c86f0f382aa2de4a87e016f211 Mon Sep 17 00:00:00 2001 From: Itms Date: Tue, 7 Jan 2025 22:10:13 +0100 Subject: [PATCH] Switch main branch to Release 28 --- 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 +- .../mods/public/maps/random/coast_range.json | 2 +- .../mods/public/maps/random/foothills.json | 2 +- .../mods/public/maps/random/migration.json | 2 +- .../maps/skirmishes/arabian_oases_2p.xml | 4 +- .../skirmishes/cycladic_archipelago_3p.xml | 4 +- .../maps/skirmishes/isthmus_of_corinth_2p.xml | 4 +- .../skirmishes/north_african_savanna_2p.xml | 4 +- .../maps/skirmishes/sporades_islands_2p.xml | 4 +- .../maps/skirmishes/watering_holes_4p.xml | 4 +- .../maps/skirmishes/zagros_mountains_2p.xml | 4 +- binaries/data/mods/public/mod.json | 2 +- build/jenkins/pipelines/bundles.Jenkinsfile | 2 +- source/lib/build_version.h | 6 +-- source/tools/dist/0ad.nsi | 4 +- source/tools/dist/build-unix-win32.sh | 2 +- 21 files changed, 37 insertions(+), 81 deletions(-) diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg index 551221bba0..cc06d577e8 100644 --- a/binaries/data/config/default.cfg +++ b/binaries/data/config/default.cfg @@ -502,7 +502,7 @@ extended = true ; Whether to display the chat history [lobby] history = 0 ; Number of past messages to display on join -room = "arena27" ; Default MUC room to join +room = "arena28" ; 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) @@ -510,8 +510,8 @@ terms_url = "https://gitea.wildfiregames.com/0ad/0ad/src/branch/main/binaries/da 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 = "wfgbot27" ; Name of the server-side XMPP-account that manage games -echelon = "echelon27" ; Name of the server-side XMPP-account that manages ratings +xpartamupp = "wfgbot28" ; Name of the server-side XMPP-account that manage games +echelon = "echelon28" ; 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 @@ -536,7 +536,7 @@ enabledmods = "mod public" [modio] -public_key = "RWQv2alKl8D0zMDJR766jpYvPy4u3y77HL/iKb/lsT1Fnf6ezoMb2x8+" ; Public key corresponding to the private key valid mods are signed with +public_key = "RWRoZZuNzi1wX+Hs5NKAf+GghHwye3mFePfBzOFt3mqYUZAkqAvs69W2" ; 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 53f3d16d7c..b8eaf635e2 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.27", + * "version": "0.28.0", * "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.27", "rote"] + * "dependencies": ["0ad<=0.28.0", "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 ad9466cfcf..6607d5aec4 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.27" + // example: "0.28.0" "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 5634229b03..b1bb9da387 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 XXVII with a demo campaign, taking you through all of them.", - "Levels": { - "Arabian Oases": { - "Map": "skirmishes/arabian_oases_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - }, - "Coast Range": { - "Map": "random/coast_range", - "MapType": "random", - "useGameSetup": true - }, - "Foothills": { - "Map": "random/foothills", - "MapType": "random", - "useGameSetup": true - }, - "Isthmus of Corinth": { - "Map": "skirmishes/isthmus_of_corinth_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - }, - "Migration": { - "Map": "random/migration", - "MapType": "random", - "useGameSetup": true - }, - "Sporades Islands": { - "Map": "skirmishes/sporades_islands_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - }, - "Zagros Mountains": { - "Map": "skirmishes/zagros_mountains_2p.xml", - "MapType": "skirmish", - "useGameSetup": true - } - }, - "Order": [ - "Arabian Oases", - "Isthmus of Corinth", - "Sporades Islands", - "Zagros Mountains", - "Coast Range", - "Foothills", - "Migration" - ], + "Description": "Discover the new and improved maps in Release XXVIII 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 67a0e2412a..00ecef0899 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 XXVII: Agni"), { "font": "sans-bold-16" }) + "\n\n" + + "caption": setStringTags(translate("Release XXVIII: B——"), { "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 d0f8d52aec..f302308eb1 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 XXVII: Agni + Release XXVIII: B—— diff --git a/binaries/data/mods/public/maps/random/coast_range.json b/binaries/data/mods/public/maps/random/coast_range.json index fc6c4498b8..57a12f3a51 100644 --- a/binaries/data/mods/public/maps/random/coast_range.json +++ b/binaries/data/mods/public/maps/random/coast_range.json @@ -4,7 +4,7 @@ "Script": "coast_range.js", "Description": "All players starts on a continent surrounded by water.\n\n[color=\"red\"]IMPORTANT NOTE: This map is designed and balanced for 2 teams only.[/color]\n", "Preview": "coast_range.png", - "Keywords": ["multiplayer", "new"], + "Keywords": ["multiplayer"], "SupportedBiomes": "generic/", "CircularMap": true, "PlayerPlacements": [ diff --git a/binaries/data/mods/public/maps/random/foothills.json b/binaries/data/mods/public/maps/random/foothills.json index 77cd4bcee7..3972bf136b 100644 --- a/binaries/data/mods/public/maps/random/foothills.json +++ b/binaries/data/mods/public/maps/random/foothills.json @@ -4,7 +4,7 @@ "Script" : "foothills.js", "Description" : "A land map with rolling hills and no obstructions.", "Preview" : "foothills.png", - "Keywords": ["multiplayer", "new"], + "Keywords": ["multiplayer"], "SupportedBiomes": "generic/", "CircularMap" : true, "PlayerPlacements": [ diff --git a/binaries/data/mods/public/maps/random/migration.json b/binaries/data/mods/public/maps/random/migration.json index b794810865..db11ba8a35 100644 --- a/binaries/data/mods/public/maps/random/migration.json +++ b/binaries/data/mods/public/maps/random/migration.json @@ -3,7 +3,7 @@ "Name" : "Migration", "Script" : "migration.js", "Description" : "Players start on islands towards the outside of the map and must move to take advantage of the middle island before their resources run out.", - "Keywords": ["naval", "new"], + "Keywords": ["naval"], "Preview" : "migration.png", "SupportedBiomes": "generic/", "CircularMap" : true, diff --git a/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml b/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml index 813d20bc14..ad8307c43d 100644 --- a/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/arabian_oases_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5dc6d878c819b111b397ab313e32d95cfced3872e869bb978b62c089e89d0fab -size 486890 +oid sha256:d11b34d18febe67de5486746082a4eba1afb9483c54f236e9de6f737046943c4 +size 486878 diff --git a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml index e01743b4de..e723190f91 100644 --- a/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml +++ b/binaries/data/mods/public/maps/skirmishes/cycladic_archipelago_3p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fd8aa2b35d4ba18a6f9b3ae1fd1c9f0c35bcffd65233a7fc4dc03790029dbdd5 -size 723308 +oid sha256:3ef3d8f80f4eb99bd6cf310e0a9c8ab89ba85cf7cc46668d75319c3ac1cfb535 +size 723298 diff --git a/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml b/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml index f33e47febf..b2e64f2329 100644 --- a/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/isthmus_of_corinth_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:000219c579b2983a116b851fdf72eafa8ce6c16219ffd8d2c6490ec21f093989 -size 1159130 +oid sha256:930ccc4c63cf97b9cc9afdee187027b91ca8fca012adcea537c564a27ef3ba0e +size 1159118 diff --git a/binaries/data/mods/public/maps/skirmishes/north_african_savanna_2p.xml b/binaries/data/mods/public/maps/skirmishes/north_african_savanna_2p.xml index 972e305fa9..72e52856f1 100644 --- a/binaries/data/mods/public/maps/skirmishes/north_african_savanna_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/north_african_savanna_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e7d054f153cd57218dd7e749f8de6ea4acd366d2fdcb498a7f7a8b8c1653b0b9 -size 1383747 +oid sha256:3b8207ed5a0e01eaecfc25ecda80638b8d485eb342ea30ead9a01ab741537724 +size 1383737 diff --git a/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml b/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml index 806231359e..3a49630e89 100644 --- a/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:702f8ea185effd520ce9b6ad068b3eb4dbb6e10ca0c9fd29c0bc8315a05a439b -size 498811 +oid sha256:5430223a881de2aecd934ecd6c8017b83ba602b508d2bbee0c740082a2b72b3b +size 498801 diff --git a/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml b/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml index bb725999c8..4a3f0a2b44 100644 --- a/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml +++ b/binaries/data/mods/public/maps/skirmishes/watering_holes_4p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f58e649378100e7938d0d872808407b29cd0698ebb931788b35fb7018ae417de -size 371315 +oid sha256:23cb7477426fc088e3b691640c7e1b00cd19eb6f4803b7e45353cbbdf256531d +size 371303 diff --git a/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml b/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml index 9d8ebe8313..41abf3ccec 100644 --- a/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml +++ b/binaries/data/mods/public/maps/skirmishes/zagros_mountains_2p.xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:072fb304e0b13b9ace3566312d88b5c22b513cb5866b43179fb852a2e82c0f28 -size 682634 +oid sha256:5a8aaafeed58fe72db7d73c0e5068fcd05677e3286d7b87c9eec8ac48ae24a8b +size 682622 diff --git a/binaries/data/mods/public/mod.json b/binaries/data/mods/public/mod.json index 845d6385e6..692b26b586 100644 --- a/binaries/data/mods/public/mod.json +++ b/binaries/data/mods/public/mod.json @@ -1,6 +1,6 @@ { "name": "0ad", - "version": "0.27.0", + "version": "0.28.0", "label": "0 A.D. Empires Ascendant", "url": "https://play0ad.com", "description": "A free, open-source, historical RTS game.", diff --git a/build/jenkins/pipelines/bundles.Jenkinsfile b/build/jenkins/pipelines/bundles.Jenkinsfile index 8446605e01..f9abaf22ae 100644 --- a/build/jenkins/pipelines/bundles.Jenkinsfile +++ b/build/jenkins/pipelines/bundles.Jenkinsfile @@ -31,7 +31,7 @@ pipeline { } parameters { - string(name: 'BUNDLE_VERSION', defaultValue: '0.27.0dev', description: 'Bundle Version') + string(name: 'BUNDLE_VERSION', defaultValue: '0.28.0dev', description: 'Bundle Version') booleanParam(name: 'DO_GZIP', defaultValue: true, description: 'Create .gz unix tarballs as well as .xz') } diff --git a/source/lib/build_version.h b/source/lib/build_version.h index 35a4dd3694..0dffa25b3e 100644 --- a/source/lib/build_version.h +++ b/source/lib/build_version.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2024 Wildfire Games. +/* Copyright (C) 2025 Wildfire Games. * * Permission is hereby granted, free of charge, to any person obtaining * a copy of this software and associated documentation files (the @@ -20,6 +20,6 @@ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -#define PYROGENESIS_VERSION "0.27.0" -#define PYROGENESIS_VERSION_WORD 0,27,0,0 +#define PYROGENESIS_VERSION "0.28.0" +#define PYROGENESIS_VERSION_WORD 0,28,0,0 extern wchar_t build_version[]; diff --git a/source/tools/dist/0ad.nsi b/source/tools/dist/0ad.nsi index f25ab821e1..f656d4608a 100644 --- a/source/tools/dist/0ad.nsi +++ b/source/tools/dist/0ad.nsi @@ -26,7 +26,7 @@ OutFile "${PREFIX}-win32.exe" ;Default installation folder - InstallDir "$LOCALAPPDATA\0 A.D. alpha" + InstallDir "$LOCALAPPDATA\0 A.D." ; NOTE: we can't use folder names ending in "." because they seemingly get stripped ;Get installation folder from registry if available @@ -68,7 +68,7 @@ !define MUI_STARTMENUPAGE_REGISTRY_ROOT "HKCU" !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\0 A.D." !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Start Menu Folder" - !define MUI_STARTMENUPAGE_DEFAULTFOLDER "0 A.D. alpha" + !define MUI_STARTMENUPAGE_DEFAULTFOLDER "0 A.D." !insertmacro MUI_PAGE_STARTMENU Application $StartMenuFolder diff --git a/source/tools/dist/build-unix-win32.sh b/source/tools/dist/build-unix-win32.sh index e8b2a9aff6..4effbaea09 100755 --- a/source/tools/dist/build-unix-win32.sh +++ b/source/tools/dist/build-unix-win32.sh @@ -4,7 +4,7 @@ set -ev XZOPTS="-9 -e" GZIP7ZOPTS="-mx=9" -BUNDLE_VERSION=${BUNDLE_VERSION:="0.27.0dev"} +BUNDLE_VERSION=${BUNDLE_VERSION:="0.28.0dev"} PREFIX="0ad-${BUNDLE_VERSION}" # Collect the relevant files