dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Switch main branch to Release 29

Browse source
This commit is contained in:
phosit 2025-11-27 19:13:48 +01:00
parent d14ee373bf
commit b67faf35c3
No known key found for this signature in database
GPG key ID: C9430B600671C268
9 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
binaries/data/config/default.cfg
View file

@ -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

2
binaries/data/mods/mod/gui/modmod/validatemod.js
View file

@ -5,7 +5,7 @@ const g_ModProperties = {
"type": "string",
"validate": validateName
},
// example: "0.28.0"
// example: "0.29.0"
"version": {
"required": true,
"type": "string",

2
binaries/data/mods/public/gui/pregame/ProjectInformation.js
View file

@ -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.")
}
};

2
binaries/data/mods/public/gui/session/top_panel/BuildLabel.xml
View file

@ -3,7 +3,7 @@
<!-- IMPORTANT: remember to update pregame/ProjectInformation.js in sync with this: -->
<object type="text" style="ModernLabelText" text_valign="top" ghost="true" size="0% 1 100% 100%">
<translatableAttribute id="caption">Release XXVIII: Boiorix</translatableAttribute>
<translatableAttribute id="caption">Release XXIX: C--</translatableAttribute>
</object>
<!-- Displays build date and build version-->

2
binaries/data/mods/public/mod.json
View file

@ -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.",

2
build/jenkins/pipelines/bundles.Jenkinsfile
View file

@ -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')

2
source/lib/build_version.h
View file

@ -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
/*

2
source/tools/dist/build-unix-tarballs.sh vendored
View file

@ -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

2
source/tools/dist/build-win-installer.sh vendored
View file

@ -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"}