Skip to content

Commit

Permalink
Bump version to alpha 25.
Browse files Browse the repository at this point in the history
Last alpha 24 commit was rP24937. rP24938 was because the CI wasn't turned off.

Comments by: @wraitii, @Freagarach, @Nescio,

Differential Revision: https://code.wildfiregames.com/D3571

git-svn-id: https://svn.wildfiregames.com/public/ps/trunk@24939 3db68df2-c116-0410-a063-a993310a9797
  • Loading branch information
Stan authored and Stan committed Feb 27, 2021
1 parent ae4a633 commit 934feaa
Show file tree
Hide file tree
Showing 12 changed files with 15 additions and 27 deletions.
6 changes: 3 additions & 3 deletions binaries/data/config/default.cfg
Expand Up @@ -445,16 +445,16 @@ extended = true ; Whether to display the chat history

[lobby]
history = 0 ; Number of past messages to display on join
room = "arena24" ; Default MUC room to join
room = "arena25" ; 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)
terms_url = "https://trac.wildfiregames.com/browser/ps/trunk/binaries/data/mods/public/gui/prelobby/common/terms/"; Allows the user to save the text and print the terms
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 = "wfgbot24" ; Name of the server-side XMPP-account that manage games
echelon = "echelon24" ; Name of the server-side XMPP-account that manages ratings
xpartamupp = "wfgbot25" ; Name of the server-side XMPP-account that manage games
echelon = "echelon25" ; 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

Expand Down
Expand Up @@ -15,7 +15,7 @@ var g_ProjectInformation = {
"caption": getBuildString()
},
"productDescription": {
"caption": setStringTags(translate("Alpha XXIV: Xšayāršā"), { "font": "sans-bold-16" }) + "\n\n" +
"caption": setStringTags(translate("Alpha XXV: Y——"), { "font": "sans-bold-16" }) + "\n\n" +
translate("Notice: This game is under development and many features have not been added yet.")
}
};
Expand Down
Expand Up @@ -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 XXIV: Xšayāršā</translatableAttribute>
<translatableAttribute id="caption">Alpha XXV: Y——</translatableAttribute>
</object>

<!-- Displays build date and revision number-->
Expand Down
4 changes: 1 addition & 3 deletions binaries/data/mods/public/maps/skirmishes/farmland_2p.xml
Expand Up @@ -40,9 +40,7 @@
{
"CircularMap": true,
"Description": "Farmland in Eastern Europe.",
"Keywords": [
"new"
],
"Keywords": [],
"Name": "Farmland (2)",
"PlayerData": [
{},
Expand Down
4 changes: 1 addition & 3 deletions binaries/data/mods/public/maps/skirmishes/obedska_bog_4p.xml
Expand Up @@ -40,9 +40,7 @@
{
"CircularMap": true,
"Description": "A lazy river meanders through these Serbian wetlands. Stone is scarce, but many lumps of bog iron sit waiting to be found.\n\n*This map makes heavy use of grass actors which may adversely affect performance.",
"Keywords": [
"new"
],
"Keywords": [],
"Name": "Obedska Bog (4)",
"PlayerData": [
{},
Expand Down
Expand Up @@ -40,9 +40,7 @@
{
"CircularMap": true,
"Description": "A lazy river meanders through these Serbian wetlands. Stone is scarce, but many lumps of bog iron sit waiting to be found.\n\n*This map makes heavy use of grass actors which may adversely affect performance.",
"Keywords": [
"new"
],
"Keywords": [],
"Name": "Obedska Bog Night (4)",
"PlayerData": [
{},
Expand Down
4 changes: 1 addition & 3 deletions binaries/data/mods/public/maps/skirmishes/oceanside_2p.xml
Expand Up @@ -40,9 +40,7 @@
{
"CircularMap": true,
"Description": "A Lush temperate biome along an ocean. ",
"Keywords": [
"new"
],
"Keywords": [],
"Name": "Oceanside (2)",
"PlayerData": [
{},
Expand Down
Expand Up @@ -40,9 +40,7 @@
{
"CircularMap": true,
"Description": "The diverse rainforests nestled in the Sahyadri mountain range of the west coast of India. It goes without saying, wood is abundant.\n\nIberian players do not get full circuit walls, but 5 strategically placed wall towers.\n\nWARNING: This map uses a lot of floral actors on account of being a rainforest. Expect a drop in framerate, this is taxing on most mid range computers.",
"Keywords": [
"new"
],
"Keywords": [],
"Name": "Sahyadri Buttes (5)",
"PlayerData": [
{},
Expand Down Expand Up @@ -102840,4 +102838,4 @@
</Entity>
</Entities>
<Paths/>
</Scenario>
</Scenario>
Expand Up @@ -40,9 +40,7 @@
{
"CircularMap": true,
"Description": "Temperate zone map with plentiful resources. Map Size: Small",
"Keywords": [
"new"
],
"Keywords": [],
"Name": "Temperate Roadway (2)",
"PlayerData": [
{},
Expand Down
2 changes: 1 addition & 1 deletion binaries/data/mods/public/maps/skirmishes/vesuvius_6p.xml
Expand Up @@ -40,7 +40,7 @@
{
"CircularMap": true,
"Description": "Skirmish as ash lightly falls around this recently erupted volcano. The scorched landscape offers little food, though the blasted forests are still laden with useful wood.",
"Keywords": ["new"],
"Keywords": [],
"Name": "Vesuvius (6)",
"PlayerData": [
{},
Expand Down
2 changes: 1 addition & 1 deletion binaries/data/mods/public/mod.json
@@ -1,6 +1,6 @@
{
"name": "0ad",
"version": "0.0.24",
"version": "0.0.25",
"label": "0 A.D. Empires Ascendant",
"url": "https://play0ad.com",
"description": "A free, open-source, historical RTS game.",
Expand Down
2 changes: 1 addition & 1 deletion source/ps/Pyrogenesis.cpp
Expand Up @@ -24,7 +24,7 @@
#include "lib/sysdep/sysdep.h"
#include "lib/svn_revision.h"

const char* engine_version = "0.0.24";
const char* engine_version = "0.0.25";
const char* main_window_name = "0 A.D.";

// convert contents of file <in_filename> from char to wchar_t and
Expand Down

0 comments on commit 934feaa

Please sign in to comment.