diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg index dff56876c5..5df2129dfa 100644 --- a/binaries/data/config/default.cfg +++ b/binaries/data/config/default.cfg @@ -353,16 +353,16 @@ zoom.in = 5 zoom.out = 4 [chat] -timestamp = false ; Show time chat message was posted +timestamp = true ; Show at which time chat messages have been sent [chat.session] extended = true ; Whether to display the chat history [lobby] history = 0 ; Number of past messages to display on join -room = "arena21" ; Default MUC room to join +room = "arena22" ; Default MUC room to join server = "lobby.wildfiregames.com" ; Address of lobby server -xpartamupp = "wfgbot21" ; Name of the server-side xmpp client that manage games +xpartamupp = "wfgbot22" ; Name of the server-side xmpp client that manage games [mod] enabledmods = "mod public" diff --git a/binaries/data/mods/public/gui/splashscreen/splashscreen.txt b/binaries/data/mods/public/gui/splashscreen/splashscreen.txt index 2070bf3556..43cbf6490e 100644 --- a/binaries/data/mods/public/gui/splashscreen/splashscreen.txt +++ b/binaries/data/mods/public/gui/splashscreen/splashscreen.txt @@ -5,6 +5,4 @@ [imgleft="iconLag"]The game can have performance problems, especially with large maps and a great number of units. -[imgleft="iconMap"]This version features a new pathfinder, with increased performance, but it can be subject to new bugs. - [imgleft="iconFormation"]Formations are a work in progress, but you can toggle forming and disbanding formations as desired. diff --git a/binaries/data/mods/public/maps/random/amazon.json b/binaries/data/mods/public/maps/random/amazon.json index c49b4bbc5c..b31cd70fbb 100644 --- a/binaries/data/mods/public/maps/random/amazon.json +++ b/binaries/data/mods/public/maps/random/amazon.json @@ -5,7 +5,7 @@ "Description" : "Players are transported into the tropics to the mouth of the great Amazon, which is arguably the longest and largest river in the world. Will you triumph and take control of this tropical paradise, or will you be trampled into the dust by ruthless and ambitious enemies?", "BaseTerrain" : ["medit_sea_depths"], "BaseHeight" : 1, - "Keywords": ["new"], + "Keywords": [], "Preview" : "amazon.png", "CircularMap" : false } diff --git a/binaries/data/mods/public/maps/random/bahrain.json b/binaries/data/mods/public/maps/random/bahrain.json index 0f80f014d0..eedeb032c1 100644 --- a/binaries/data/mods/public/maps/random/bahrain.json +++ b/binaries/data/mods/public/maps/random/bahrain.json @@ -5,7 +5,7 @@ "Description" : "Bahrain, centre of the Dilmun civilization which fell in 800BC, was in turn controlled by Sumerians, Assyrians, Babylonians, Persians and other later peoples. An island strategically placed in the Sinus Persicus (Persian Gulf) and also centre of pearl trading due to its magnificent pearl fisheries, Bahrain is never left unoccupied for long. But now, with the previous occupants gone, the land prepares for war. Will you be the next Ruler of Bahrain?", "BaseTerrain" : ["medit_sea_depths"], "BaseHeight" : 1, - "Keywords": ["naval", "new"], + "Keywords": ["naval"], "Preview" : "bahrain.png", "CircularMap" : false } diff --git a/binaries/data/mods/public/maps/random/caledonian_meadows.json b/binaries/data/mods/public/maps/random/caledonian_meadows.json index 118a140455..1c934a42e6 100644 --- a/binaries/data/mods/public/maps/random/caledonian_meadows.json +++ b/binaries/data/mods/public/maps/random/caledonian_meadows.json @@ -6,7 +6,7 @@ "Description" : "Fertile lands surrounded by harsh terrain.\nRemains of recent snowfalls still haunt the forests, and torrential rivers from the snowmelt barely died away.\nAiming at a realistic terrain, this map might not always be balanced.", "CircularMap" : false, "BaseTerrain" : "whiteness", - "Keywords": ["new"], + "Keywords": [], "BaseHeight" : 0 } } diff --git a/binaries/data/mods/public/maps/random/harbor.json b/binaries/data/mods/public/maps/random/harbor.json index b6b9d55006..8b315b7fdf 100644 --- a/binaries/data/mods/public/maps/random/harbor.json +++ b/binaries/data/mods/public/maps/random/harbor.json @@ -5,7 +5,7 @@ "Description" : "Players start with some light fishing opportunities in the calm waters of a sheltered harbor. A large bounty of seafood lays beyond the protective cliffs in the deep ocean. Small passages at the base of the cliffs make for tight fighting and easy fortification. Will you fight your way through the narrow passageways or take to the sea?", "BaseTerrain" : ["medit_sea_depths"], "BaseHeight" : 2, - "Keywords": ["new"], + "Keywords": [], "Preview" : "harbor.png", "CircularMap" : true } diff --git a/binaries/data/mods/public/maps/random/howe_sound.json b/binaries/data/mods/public/maps/random/howe_sound.json index 3368c0f9f6..7b6f3ea1f0 100644 --- a/binaries/data/mods/public/maps/random/howe_sound.json +++ b/binaries/data/mods/public/maps/random/howe_sound.json @@ -5,7 +5,7 @@ "Description" : "Howe Sound is a roughly triangular network of fjords located directly northwest of present-day Vancouver, on the West Coast of today's Canada. The waters teem with whales and fish, while on land herds of muskox dig through deep snow to get at mushrooms and last summer's roots. Mines and forests also abound in this cold haven.", "BaseTerrain" : ["medit_sea_depths"], "BaseHeight" : 1, - "Keywords": ["new"], + "Keywords": [], "Preview" : "howe_sound.png", "CircularMap" : false } diff --git a/binaries/data/mods/public/maps/random/marmara.json b/binaries/data/mods/public/maps/random/marmara.json index c155cebd67..a09eaab586 100644 --- a/binaries/data/mods/public/maps/random/marmara.json +++ b/binaries/data/mods/public/maps/random/marmara.json @@ -5,7 +5,7 @@ "Description" : "The Propontis (Sea of Marmara) connects the Pontus Euxinus (Black Sea) to the Aegean Sea, and seperates Asia Minor from Thrace. To the south-west lies the Hellespont (Dardanelles), at the entrance of which the ancient city of Ilium (Troy) once stood. To the north-east lies the Bosporus Thraciae (Bosporus strait) where in time the Greek city of Byzantium would be founded, later to become the capital of the great Byzantine Empire under the new name of Constantinople. Players start on fertile land with adequate resources.", "BaseTerrain" : ["medit_sea_depths"], "BaseHeight" : 1, - "Keywords": ["new"], + "Keywords": [], "Preview" : "marmara.png", "CircularMap" : false } diff --git a/binaries/data/mods/public/maps/random/mediterranean.json b/binaries/data/mods/public/maps/random/mediterranean.json index 01994ba027..1820aee0ce 100644 --- a/binaries/data/mods/public/maps/random/mediterranean.json +++ b/binaries/data/mods/public/maps/random/mediterranean.json @@ -5,7 +5,7 @@ "Description" : "The Mediterranean, home to the Phoenicians, Greeks, Egyptians and later on Romans. They took the rudimentary knowledge and principles of organisation from Mesopotamia and forged it into something more, thereby shifting the centre of learning and knowledge to the Mediterranean Coast, thus laying the foundations of civilization as we know it today. The Mediterranean Sea is almost completely enclosed by land: on the north by Gallia Transalpina (Transalpine Gaul), Italia, Greece (Graecia) and Anatolia, on the east by Syria, on the south by Libya and Mauritania, and on the west by Iberia. The name Mediterranean is derived from Latin, but the Romans themselves preferred the term 'Mare Internum' or even 'Mare Nostrum'.", "BaseTerrain" : ["medit_sea_depths"], "BaseHeight" : 1, - "Keywords": ["new"], + "Keywords": [], "Preview" : "mediterranean.png", "CircularMap" : false } diff --git a/binaries/data/mods/public/maps/random/ngorongoro.json b/binaries/data/mods/public/maps/random/ngorongoro.json index f76877e175..85304f5e00 100644 --- a/binaries/data/mods/public/maps/random/ngorongoro.json +++ b/binaries/data/mods/public/maps/random/ngorongoro.json @@ -5,7 +5,7 @@ "Description" : "Ngorongoro Crater is the world's largest intact volcanic caldera and is one of the Seven Natural Wonders of Africa. Due to it's climate, biodiversity and history, Ngorongoro is believed by some to be Africa's Garden of Eden and the birthplace of mankind.", "BaseTerrain" : ["medit_sea_depths"], "BaseHeight" : 1, - "Keywords": ["new"], + "Keywords": [], "Preview" : "ngorongoro.png", "CircularMap" : false } diff --git a/binaries/data/mods/public/maps/random/pompeii.json b/binaries/data/mods/public/maps/random/pompeii.json index 65e422b5ba..a78ed4d0c7 100644 --- a/binaries/data/mods/public/maps/random/pompeii.json +++ b/binaries/data/mods/public/maps/random/pompeii.json @@ -4,7 +4,7 @@ "Script" : "pompeii.js", "Description" : "Pompeii was an ancient Roman coastal city, in the Campania region of Italy. Pompeii, along with much of the surrounding area, was mostly destroyed and buried under 4 to 6 meters of volcanic ash and pumice in the eruption of Mount Vesuvius in AD 79.", "BaseTerrain" : ["medit_sea_depths"], - "Keywords": ["new"], + "Keywords": [], "BaseHeight" : 1, "Preview" : "pompeii.png", "CircularMap" : false diff --git a/binaries/data/mods/public/maps/random/red_sea.json b/binaries/data/mods/public/maps/random/red_sea.json index e5b2422e43..f60c0a5a41 100644 --- a/binaries/data/mods/public/maps/random/red_sea.json +++ b/binaries/data/mods/public/maps/random/red_sea.json @@ -5,7 +5,7 @@ "Description" : "Historically, the Red Sea was a sea of many nations. Ideally situated for trade with the Far East, it was coveted by all. Although dry, this land is by no means inhospitable, and is amply provided with all resources.", "BaseTerrain" : ["medit_sea_depths"], "BaseHeight" : 1, - "Keywords": ["new"], + "Keywords": [], "Preview" : "red_sea.png", "CircularMap" : false } diff --git a/binaries/data/mods/public/maps/random/rouen.json b/binaries/data/mods/public/maps/random/rouen.json index 8f96b227c6..2b155cb524 100644 --- a/binaries/data/mods/public/maps/random/rouen.json +++ b/binaries/data/mods/public/maps/random/rouen.json @@ -5,7 +5,7 @@ "Description" : "Players start on the banks of the River Sequana (Seine) in the north of Gaul in the place of the modern-day city of Rouen. Destined to become one of the largest and most prosperous cities of medieval Europe and one of the Anglo-Norman dynasty capitals, Rouen is still a peaceful land - but not for long.", "BaseTerrain" : ["medit_sea_depths"], "BaseHeight" : 1, - "Keywords": ["new"], + "Keywords": [], "Preview" : "rouen.png", "CircularMap" : false } diff --git a/binaries/data/mods/public/maps/skirmishes/Dueling Cliffs (3v3).xml b/binaries/data/mods/public/maps/skirmishes/Dueling Cliffs (3v3).xml index b7af31feb4..0dad1e6198 100644 --- a/binaries/data/mods/public/maps/skirmishes/Dueling Cliffs (3v3).xml +++ b/binaries/data/mods/public/maps/skirmishes/Dueling Cliffs (3v3).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4182b7abbbc16279aaf36590c27756d8126db97b07a9d423f1c6c87e354e91bf -size 686408 +oid sha256:6348d0b4d4134b120386b9192a51649477232395cdbed45dbb6b19ad27e2d1b5 +size 686403 diff --git a/binaries/data/mods/public/maps/skirmishes/Two Seas (6).xml b/binaries/data/mods/public/maps/skirmishes/Two Seas (6).xml index 8f1cbba9e6..c315028544 100644 --- a/binaries/data/mods/public/maps/skirmishes/Two Seas (6).xml +++ b/binaries/data/mods/public/maps/skirmishes/Two Seas (6).xml @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29bfd946b62e123764e643cdeb8895acf636658305daa2f7f297e940555517df -size 1849110 +oid sha256:1c6d0a1de24b7a9a7d27b7aae1ada0a2a8d3f3017ede456b1aacaf96c85bcb6c +size 1849105 diff --git a/binaries/data/mods/public/mod.json b/binaries/data/mods/public/mod.json index 185fe3f634..2ade6ed3fd 100644 --- a/binaries/data/mods/public/mod.json +++ b/binaries/data/mods/public/mod.json @@ -1,6 +1,6 @@ { "name": "0ad", - "version": "0.0.21", + "version": "0.0.22", "label": "0 A.D. Empires Ascendant", "url": "play0ad.com", "description": "A free, open-source, historical RTS game.", diff --git a/source/ps/Pyrogenesis.cpp b/source/ps/Pyrogenesis.cpp index a0778993b5..6bb6826964 100644 --- a/source/ps/Pyrogenesis.cpp +++ b/source/ps/Pyrogenesis.cpp @@ -24,7 +24,7 @@ #include "lib/sysdep/sysdep.h" #include "lib/svn_revision.h" -const char engine_version[] = "0.0.21"; +const char engine_version[] = "0.0.22"; // convert contents of file from char to wchar_t and // append to file.