diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg index 77bd195033..50f8bbd9fa 100644 --- a/binaries/data/config/default.cfg +++ b/binaries/data/config/default.cfg @@ -516,7 +516,7 @@ extended = true ; Whether to display the chat history [lobby] history = 0 ; Number of past messages to display on join -room = "arena28" ; Default MUC room to join +room = "arena29" ; 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 = true ; Whether to reject connecting to the lobby if the TLS certificate is invalid @@ -524,8 +524,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 = "wfgbot28" ; Name of the server-side XMPP-account that manage games -echelon = "echelon28" ; Name of the server-side XMPP-account that manages ratings +xpartamupp = "wfgbot29" ; Name of the server-side XMPP-account that manage games +echelon = "echelon29" ; 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 diff --git a/binaries/data/mods/mod/gui/modmod/validatemod.js b/binaries/data/mods/mod/gui/modmod/validatemod.js index 78f0fce210..328baa759c 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.28.0" + // example: "0.29.0" "version": { "required": true, "type": "string", diff --git a/binaries/data/mods/public/gui/pregame/ProjectInformation.js b/binaries/data/mods/public/gui/pregame/ProjectInformation.js index 8b54670f91..53b71a076e 100644 --- a/binaries/data/mods/public/gui/pregame/ProjectInformation.js +++ b/binaries/data/mods/public/gui/pregame/ProjectInformation.js @@ -15,7 +15,7 @@ export const projectInformation = { "caption": getBuildString() }, "productDescription": { - "caption": setStringTags(translate("Release XXVIII: Boiorix"), { "font": "sans-bold-16" }) + "\n\n" + + "caption": setStringTags(translate("Release XXIX: C--"), { "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 a5c96e2c4f..f3e3985560 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 @@ - Release XXVIII: Boiorix + Release XXIX: C-- diff --git a/binaries/data/mods/public/mod.json b/binaries/data/mods/public/mod.json index 692b26b586..d297e2d7a0 100644 --- a/binaries/data/mods/public/mod.json +++ b/binaries/data/mods/public/mod.json @@ -1,6 +1,6 @@ { "name": "0ad", - "version": "0.28.0", + "version": "0.29.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 2bf3db9882..3a954616b0 100644 --- a/build/jenkins/pipelines/bundles.Jenkinsfile +++ b/build/jenkins/pipelines/bundles.Jenkinsfile @@ -37,7 +37,7 @@ pipeline { } parameters { - string(name: 'BUNDLE_VERSION', defaultValue: '0.28.0dev', description: 'Bundle Version') + string(name: 'BUNDLE_VERSION', defaultValue: '0.29.0dev', description: 'Bundle Version') string(name: 'NIGHTLY_REVISION', defaultValue: 'HEAD', description: 'Nightly SVN revision from which to build the bundles') booleanParam(name: 'PATCH_BUILD', defaultValue: false, description: 'Apply patch generated from upstream job patch-release onto the nightly build') 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 b38463674d..e8a798b63f 100644 --- a/source/lib/build_version.h +++ b/source/lib/build_version.h @@ -32,7 +32,7 @@ * TODO: This does not respect semver. */ #define PS_VERSION_MAJOR 0 -#define PS_VERSION_MINOR 28 +#define PS_VERSION_MINOR 29 #define PS_VERSION_PATCH 0 /* diff --git a/source/tools/dist/build-unix-tarballs.sh b/source/tools/dist/build-unix-tarballs.sh index 8640f19f87..970b276526 100755 --- a/source/tools/dist/build-unix-tarballs.sh +++ b/source/tools/dist/build-unix-tarballs.sh @@ -4,7 +4,7 @@ set -ev XZOPTS="-9 -e" GZIP7ZOPTS="-mx=9" -BUNDLE_VERSION=${BUNDLE_VERSION:="0.28.0dev"} +BUNDLE_VERSION=${BUNDLE_VERSION:="0.29.0dev"} PREFIX="0ad-${BUNDLE_VERSION}" # Prefetch third party tarballs diff --git a/source/tools/dist/build-win-installer.sh b/source/tools/dist/build-win-installer.sh index d38d95cab5..d4e1307ac2 100755 --- a/source/tools/dist/build-win-installer.sh +++ b/source/tools/dist/build-win-installer.sh @@ -1,7 +1,7 @@ #!/bin/sh set -ev -BUNDLE_VERSION=${BUNDLE_VERSION:="0.28.0dev"} +BUNDLE_VERSION=${BUNDLE_VERSION:="0.29.0dev"} PREFIX="0ad-${BUNDLE_VERSION}" WINARCH=${WINARCH:="win32"}