1
1
forked from 0ad/0ad

Bump version to alpha 26.

Last alpha 25 commit was [[SVN:25860]]

Accepted by: @Freagarach, @asterix
Comments by: @wraitii
Differential Revision: https://code.wildfiregames.com/D4215
This was SVN commit r25861.
This commit is contained in:
Stan 2021-08-27 16:32:34 +00:00
parent af4896b4c5
commit 4a9bac2811
28 changed files with 55 additions and 157 deletions

View File

@ -466,7 +466,7 @@ extended = true ; Whether to display the chat history
[lobby]
history = 0 ; Number of past messages to display on join
room = "arena25" ; Default MUC room to join
room = "arena26" ; 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)
@ -474,8 +474,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 = "wfgbot25" ; Name of the server-side XMPP-account that manage games
echelon = "echelon25" ; Name of the server-side XMPP-account that manages ratings
xpartamupp = "wfgbot26" ; Name of the server-side XMPP-account that manage games
echelon = "echelon26" ; 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
@ -494,7 +494,8 @@ delay = 200 ; Duration in milliseconds that is waited b
enabledmods = "mod public"
[modio]
public_key = "RWTVElEmCfAMGk/jtMc2I9/ElBvoJituKdbDWqqj6D69qz2cKexU4gv+" ; Public key corresponding to the private key valid mods are signed with
public_key = "RWR/X/zDEJSHEfioDC/EO2So3TRMUmAH4O6A1a3ZhMwcqQA61xqBPPGa" ; 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]

View File

@ -6,7 +6,7 @@
* A mod is defined by a mod.json file, for example
* {
* "name": "0ad",
* "version": "0.0.24",
* "version": "0.0.26",
* "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.24", "rote"]
* "dependencies": ["0ad<=0.0.26", "rote"]
* }
*
* A mod is identified by the directory name.

View File

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

View File

@ -1,111 +1,7 @@
{
"Name": "Demo campaign - new maps",
"Description": "Discover the new maps in Alpha 25 with a demo campaign, taking you through all of them.",
"Levels": {
"alpine_valleys_2p": {
"Map": "skirmishes/alpine_valleys_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"bactria_2p": {
"Map": "skirmishes/bactria_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"belgian_bog_2p": {
"Map": "skirmishes/belgian_bog_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"butana_steppe_2p": {
"Map": "skirmishes/butana_steppe_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"cisalpine_winter_2p": {
"Map": "skirmishes/cisalpine_winter_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"crocodilopolis_4p": {
"Map": "skirmishes/crocodilopolis_4p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"gallic_highlands_2p": {
"Map": "skirmishes/gallic_highlands_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"hindu_kush_2p": {
"Map": "skirmishes/hindu_kush_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"hydaspes_river_4p": {
"Map": "skirmishes/hydaspes_river_4p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"magadha_2p": {
"Map": "skirmishes/magadha_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"miletus_peninsula_2p": {
"Map": "skirmishes/miletus_peninsula_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"nubian_frontier_2p": {
"Map": "skirmishes/nubian_frontier_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"saharan_oases_2p": {
"Map": "skirmishes/saharan_oases_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"scythia_4p": {
"Map": "skirmishes/scythia_4p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"sporades_islands_2p": {
"Map": "skirmishes/sporades_islands_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"syria_2p": {
"Map": "skirmishes/syria_2p.xml",
"MapType": "skirmish",
"useGameSetup": true
},
"white_cliffs_of_dover_5p": {
"Map": "skirmishes/white_cliffs_of_dover_5p.xml",
"MapType": "skirmish",
"useGameSetup": true
}
},
"Order": [
"alpine_valleys_2p",
"bactria_2p",
"belgian_bog_2p",
"butana_steppe_2p",
"cisalpine_winter_2p",
"crocodilopolis_4p",
"gallic_highlands_2p",
"hindu_kush_2p",
"hydaspes_river_4p",
"magadha_2p",
"miletus_peninsula_2p",
"nubian_frontier_2p",
"saharan_oases_2p",
"scythia_4p",
"sporades_islands_2p",
"syria_2p",
"white_cliffs_of_dover_5p"
],
"Description": "Discover the new maps in Alpha XXVI with a demo campaign, taking you through all of them.",
"Levels": {},
"Order": [],
"ShowUnavailable": true
}

View File

@ -22,7 +22,8 @@
"List": [
{ "nick": "feneur", "name": "Erik Johansson" },
{ "nick": "Itms", "name": "Nicolas Auvray" },
{ "nick": "Mythos_Ruler", "name": "Michael D. Hafer" }
{ "nick": "Mythos_Ruler", "name": "Michael D. Hafer" },
{ "nick": "Stan", "name": "Stanislas Dolcini" }
]
},
{

View File

@ -15,7 +15,7 @@ var g_ProjectInformation = {
"caption": getBuildString()
},
"productDescription": {
"caption": setStringTags(translate("Alpha XXV: Yaunā"), { "font": "sans-bold-16" }) + "\n\n" +
"caption": setStringTags(translate("Alpha XXVI: Z——"), { "font": "sans-bold-16" }) + "\n\n" +
translate("Notice: This game is under development and many features have not been added yet.")
}
};

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">
<translatableAttribute id="caption">Alpha XXV: Yaunā</translatableAttribute>
<translatableAttribute id="caption">Alpha XXVI: Z——</translatableAttribute>
</object>
<!-- Displays build date and revision number-->

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
{
"name": "0ad",
"version": "0.0.25",
"version": "0.0.26",
"label": "0 A.D. Empires Ascendant",
"url": "https://play0ad.com",
"description": "A free, open-source, historical RTS game.",

View File

@ -24,7 +24,7 @@
#include "lib/sysdep/sysdep.h"
#include "lib/svn_revision.h"
const char* engine_version = "0.0.25";
const char* engine_version = "0.0.26";
const char* main_window_name = "0 A.D.";
// convert contents of file <in_filename> from char to wchar_t and