Switch main branch to Release 28

This commit is contained in:
Itms
2025-01-07 22:10:13 +01:00
parent 60c469bb64
commit dc830ccf55
21 changed files with 37 additions and 81 deletions
+4 -4
View File
@@ -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]
+2 -2
View File
@@ -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.
@@ -5,7 +5,7 @@ const g_ModProperties = {
"type": "string",
"validate": validateName
},
// example: "0.0.27"
// example: "0.28.0"
"version": {
"required": true,
"type": "string",
@@ -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
}
@@ -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.")
}
};
@@ -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">Alpha XXVII: Agni</translatableAttribute>
<translatableAttribute id="caption">Release XXVIII: B——</translatableAttribute>
</object>
<!-- Displays build date and build version-->
@@ -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": [
@@ -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": [
@@ -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,
+1 -1
View File
@@ -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.",
+1 -1
View File
@@ -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')
}
+3 -3
View File
@@ -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[];
+2 -2
View File
@@ -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
+1 -1
View File
@@ -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