Index: ps/trunk/binaries/data/config/default.cfg =================================================================== --- ps/trunk/binaries/data/config/default.cfg +++ ps/trunk/binaries/data/config/default.cfg @@ -466,7 +466,7 @@ [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_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 @@ 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] Index: ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.js =================================================================== --- ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.js +++ ps/trunk/binaries/data/mods/mod/gui/modmod/modmod.js @@ -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. Index: ps/trunk/binaries/data/mods/mod/gui/modmod/validatemod.js =================================================================== --- ps/trunk/binaries/data/mods/mod/gui/modmod/validatemod.js +++ ps/trunk/binaries/data/mods/mod/gui/modmod/validatemod.js @@ -5,7 +5,7 @@ "type": "string", "validate": validateName }, - // example: "0.0.24" + // example: "0.0.26" "version": { "required": true, "type": "string", Index: ps/trunk/binaries/data/mods/public/campaigns/new_maps.json =================================================================== --- ps/trunk/binaries/data/mods/public/campaigns/new_maps.json +++ ps/trunk/binaries/data/mods/public/campaigns/new_maps.json @@ -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 } Index: ps/trunk/binaries/data/mods/public/gui/credits/texts/special.json =================================================================== --- ps/trunk/binaries/data/mods/public/gui/credits/texts/special.json +++ ps/trunk/binaries/data/mods/public/gui/credits/texts/special.json @@ -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" } ] }, { Index: ps/trunk/binaries/data/mods/public/gui/pregame/ProjectInformation.js =================================================================== --- ps/trunk/binaries/data/mods/public/gui/pregame/ProjectInformation.js +++ ps/trunk/binaries/data/mods/public/gui/pregame/ProjectInformation.js @@ -15,7 +15,7 @@ "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.") } }; Index: ps/trunk/binaries/data/mods/public/gui/session/top_panel/BuildLabel.xml =================================================================== --- ps/trunk/binaries/data/mods/public/gui/session/top_panel/BuildLabel.xml +++ ps/trunk/binaries/data/mods/public/gui/session/top_panel/BuildLabel.xml @@ -3,7 +3,7 @@ - Alpha XXV: Yaunā + Alpha XXVI: Z—— Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/alpine_valleys_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "The high peaks and valleys of the Alps.\n\nEach player starts the match nestled in a safe green valley. Between lies the treacherous Alps mountain range.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Alpine Valleys (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/bactria_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "In the Eastern land of Bactria lies the rich valley carved by the Oxus River.\n\nSouth of the river are rich arable lands and plentiful wood and forage. North of the river lie a mountain range pierced by wide mountain passes and guarded by natural defensive positions.\n\nWithin the mountains can be found riches as well as danger. The player who can exploit the mountainous area the best will have a significant advantage over their adversary.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Bactriana (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/belgian_bog_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "Two players face off across a large bog somewhere in the Rhine lowlands.\n\nWood is abundant, but Metal and Stone are hard to find and extract. Hunting and foraging is plentiful.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Belgian Bog (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/butana_steppe_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "South of the Sahara, East of the Nile, lies a semi-arid region today known as the Butana Steppe.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Island of Mero\u00eb (2)", "PlayerData": [ { Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/cisalpine_winter_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/cisalpine_winter_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/cisalpine_winter_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "Northern Italy near the Alps is called Cisalpine Gaul by the Romans. It's a fertile area contested by the Gauls, Etruscans, and Romans alike. \n\nCAUTION: Map has a lot of snow particles that could affect graphics performance on low-end hardware.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Cisalpine Winter (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/crocodilopolis_4p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "The ancient lake of Moeris near the Nile River in the Libyan Desert has been settled and used by the Egyptians since prehistoric times. \n\nThe surrounding lands are dotted with ancient and new monuments and temples, while the lake itself is stocked full of Tilapia, ready for fishing. ", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Crocodilopolis (4)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/gallic_highlands_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "The Highlands of central Gaul.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Gallic Highlands (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/hindu_kush_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "The Hindu Kush mountains separate India from Bactria (modern day Afghanistan) and form a frontier between the Seleucid and Mauryan realms. This area was later under the control of the Greco-Bactrian and Indo-Greek kingdoms of the later Hellenistic period. \n\nThe area is low on wood resources, but high on stone and metal. A trade route runs through the center of the map with Trade Depots that can be captured and used to gather resources via trade. ", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Hindu Kush (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/hydaspes_river_4p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/hydaspes_river_4p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/hydaspes_river_4p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "The Hydaspes, aka Jhelum, River in the Punjab of India. Here was the site of the great battle between the Macedonian forces under Alexander the Great and the Indian forces of the king Porus of Paurava.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Hydaspes River (4)", "PlayerData": [ "", Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/magadha_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "Two of India's greatest empires, the Maurya Empire and Gupta Empire, originated in Magadha, a region in Northern India near the sacred River Ganges.\n\nThis map was designed as a 1v1 map suitable for rated and tournament play.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Magadha (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/miletus_peninsula_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "Each player starts the match atop a large flat plateau, otherwise known as an acropolis.\n\nTo the East lies a large bay with fishing opportunities. To the West is an unclaimed acropolis overlooking the Aegean Sea.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Miletus Peninsula (2)", "PlayerData": [ {}, @@ -33854,4 +33852,4 @@ - \ No newline at end of file + Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/nubian_frontier_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/nubian_frontier_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/nubian_frontier_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "The arid and treacherous frontier between Nubia and Egypt.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Nubian Frontier (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "In the deep Sahara Desert of Africa lies an area of rocky outcrops and small oases. \n\nLarge stone quarries can be found in the cliffs, while wood and animal resources can be found near the oases dotting the landscape. Nearby fruiting Date Palms give an nice initial burst of food.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Saharan Oases (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/saharan_oases_4p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "In the deep Sahara Desert of Africa lies an area of rocky outcrops and small oases. \n\nLarge stone quarries can be found in the cliffs, while wood and animal resources can be found near the oases dotting the landscape. Nearby fruiting Date Palms give an nice initial burst of food.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Saharan Oases (4)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/sahyadri_buttes_5p.xml @@ -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": [ {}, @@ -100036,4 +100034,4 @@ - \ No newline at end of file + Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/scythia_4p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "The steppes of central Asia. A wide open grassland with few trees (about 90% fewer trees than on a temperate or Aegean map). Animal life is plentiful though, so take advantage of the hunting available. ", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Scythian Steppes (4)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/sporades_islands_2p.xml @@ -41,8 +41,7 @@ "CircularMap": true, "Description": "An islands map good for intense naval combat.", "Keywords": [ - "naval", - "new" + "naval" ], "Name": "Sporades Islands (2)", "PlayerData": [ Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/syria_2p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/syria_2p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/syria_2p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "A barren land with little wood and few animals. Treasures dot the landscape and will be essential to early growth.\n\nThe player who sets up a profitable trade caravan earliest may gain a decisive advantage.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "Coele-Syria (2)", "PlayerData": [ {}, Index: ps/trunk/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml =================================================================== --- ps/trunk/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml +++ ps/trunk/binaries/data/mods/public/maps/skirmishes/white_cliffs_of_dover_5p.xml @@ -40,9 +40,7 @@ { "CircularMap": true, "Description": "Foreigners are invading Britannia. The native Britons must fight against a massive enemy invasion force to secure their homeland for the next generation!\n\nPlayer 1 is the Britons. Players 2-5 are the invasion force, garrisoned aboard their stout ships in the channel off the White Cliffs of Dover. \n\nTeams are set by the map script, but can be altered by the players in setup if they wish to play the map contrary to the scenario defined by the designer. In that case, the game host should set a ceasefire so that the players in the boats can land peacefully and attempt to find a suitable place to plant their first settlements.\n\nAssigned civilizations are merely suggestions, and the host should set starting resources to 1000 so that Civic Centers can be built at the start.", - "Keywords": [ - "new" - ], + "Keywords": [], "Name": "White Cliffs of Dover (5)", "PlayerData": [ "", Index: ps/trunk/binaries/data/mods/public/mod.json =================================================================== --- ps/trunk/binaries/data/mods/public/mod.json +++ ps/trunk/binaries/data/mods/public/mod.json @@ -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.", Index: ps/trunk/source/ps/Pyrogenesis.cpp =================================================================== --- ps/trunk/source/ps/Pyrogenesis.cpp +++ ps/trunk/source/ps/Pyrogenesis.cpp @@ -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 from char to wchar_t and