Merge pull request #1878 from odamex/release/12.3.0

Merge release/12.3.0 to stable

CMakeLists.txt

@@ -16,7 +16,7 @@
 
 cmake_minimum_required(VERSION 3.19)
 
-project(Odamex VERSION 12.2.1)
+project(Odamex VERSION 12.3.0)
 
 include(CMakeDependentOption)
 
@@ -76,7 +76,7 @@ if(NOT APPLE AND NOT WIN32)
 endif()
 
 set(PROJECT_COPYRIGHT "2006-2026")
-set(PROJECT_RC_VERSION "12,2,1,0")
+set(PROJECT_RC_VERSION "12,3,0,0")
 set(PROJECT_COMPANY "The Odamex Team")
 
 # Include early required commands for specific systems

README

@@ -1,5 +1,5 @@
 ===============================================================================
-                              Odamex v12.2.1 README
+                              Odamex v12.3.0 README
                                https://odamex.net
 ===============================================================================
 

ag-odalaunch/res/Info.plist

@@ -19,13 +19,13 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>12.2.1</string>
+	<string>12.3.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>12.2.1</string>
+	<string>12.3.0</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2006-2026 The Odamex Team</string>
 	<key>CFBundleLongVersionString</key>
-	<string>12.2.1</string>
+	<string>12.3.0</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2006-2026 The Odamex Team</string>
 	<key>LSRequiresCarbon</key>

ag-odalaunch/src/agol_about.cpp

@@ -3,7 +3,7 @@
 //
 // $Id$
 //
-// Copyright (C) 2006-2020 by The Odamex Team.
+// Copyright (C) 2006-2026 by The Odamex Team.
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License

ag-odalaunch/src/agol_about.h

@@ -3,7 +3,7 @@
 //
 // $Id$
 //
-// Copyright (C) 2006-2020 by The Odamex Team.
+// Copyright (C) 2006-2026 by The Odamex Team.
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License

common/c_doc.cpp

@@ -420,8 +420,8 @@ std::string BuildCvarDocJSON()
 /**
  * @brief Emit a generated document.
  *
- * INFODUMP_FILE writes a file in the write directory.
- * INFODUMP_STDOUT prints the document to stdout instead.
+ * infodumpdest_t::FILE writes a file in the write directory.
+ * infodumpdest_t::STDOUT prints the document to stdout instead.
  *
  * @param doc Document contents to emit.
  * @param basename Name to give the file, without an extension.
@@ -432,7 +432,7 @@ std::string BuildCvarDocJSON()
 bool EmitInfoDump(const std::string& doc, const char* basename, const char* ext,
                   infodumpdest_t dest)
 {
-	if (dest == INFODUMP_STDOUT)
+	if (dest == infodumpdest_t::STDOUT)
 	{
 		fwrite(doc.data(), sizeof(char), doc.size(), stdout);
 		fflush(stdout);
@@ -477,12 +477,12 @@ bool C_WriteCvarDocJSON(infodumpdest_t dest)
 
 BEGIN_COMMAND(cvardoc)
 {
-	C_WriteCvarDoc(INFODUMP_FILE);
+	C_WriteCvarDoc(infodumpdest_t::FILE);
 }
 END_COMMAND(cvardoc)
 
 BEGIN_COMMAND(cvardocjson)
 {
-	C_WriteCvarDocJSON(INFODUMP_FILE);
+	C_WriteCvarDocJSON(infodumpdest_t::FILE);
 }
 END_COMMAND(cvardocjson)

common/c_doc.h

@@ -25,10 +25,10 @@
 #include <string>
 
 // Where a generated document should be sent.
-enum infodumpdest_t
+enum class infodumpdest_t
 {
-	INFODUMP_FILE,
-	INFODUMP_STDOUT,
+	FILE,
+	STDOUT,
 };
 
 bool EmitInfoDump(const std::string& doc, const char* basename, const char* ext,

common/d_main.cpp

@@ -1083,49 +1083,26 @@ bool C_WriteVersion(infodumpdest_t dest)
 namespace
 {
 
-infodumpdest_t D_InfoDumpDest()
+constexpr infodumpdest_t D_InfoDumpDest([[maybe_unused]] infodumpdest_t dest)
 {
-#ifdef _WIN32
-	return INFODUMP_FILE;
+#if defined(_WIN32) && defined(CLIENT_APP)
+	return infodumpdest_t::FILE;
 #else
-	return INFODUMP_STDOUT;
+	return dest;
 #endif
 }
 
-//
-// --version
-//
-bool D_DumpVersion()
-{
-	return C_WriteVersion(D_InfoDumpDest());
-}
-
-//
-// --cvardoc
-//
-bool D_DumpCvarDoc()
-{
-	return C_WriteCvarDoc(D_InfoDumpDest());
-}
-
-//
-// --cvardocjson
-//
-bool D_DumpCvarDocJSON()
-{
-	return C_WriteCvarDocJSON(D_InfoDumpDest());
-}
-
 struct infodump_t
 {
 	const char* param;  // the switch, including its leading dashes
-	bool (*handler)();  // writes the information out, false if it could not
+	bool (*handler)(infodumpdest_t);  // writes the information out, false if it could not
+	infodumpdest_t dest; // whether to write to stdout or a file
 };
 
 const std::array InfoDumps = {
-    infodump_t{"--version", D_DumpVersion},
-    infodump_t{"--cvardoc", D_DumpCvarDoc},
-    infodump_t{"--cvardocjson", D_DumpCvarDocJSON},
+    infodump_t{"--version", C_WriteVersion, infodumpdest_t::STDOUT},
+    infodump_t{"--cvardoc", C_WriteCvarDoc, infodumpdest_t::FILE},
+    infodump_t{"--cvardocjson", C_WriteCvarDocJSON, infodumpdest_t::STDOUT},
 };
 
 } // namespace
@@ -1138,22 +1115,18 @@ const std::array InfoDumps = {
 //
 void D_CheckInfoDumps()
 {
-	bool dumped = false;
 	bool ok = true;
 
 	for (const infodump_t& dump : InfoDumps)
 	{
 		if (Args.CheckParm(dump.param))
 		{
-			if (!dump.handler())
+			if (!dump.handler(D_InfoDumpDest(dump.dest)))
 				ok = false;
 
-			dumped = true;
+			exit(ok ? EXIT_SUCCESS : EXIT_FAILURE);
 		}
 	}
-
-	if (dumped)
-		exit(ok ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
 

common/odainfo.cpp

@@ -2332,7 +2332,7 @@ mobjinfo_t odamobjinfo[] = {
     {
         // MT_HORDESPAWN
         MT_HORDESPAWN,
-        5302,        // doomednum
+        -1,        // doomednum
         S_TNT1,        // spawnstate
         100,           // spawnhealth
         0,             // gibhealth
@@ -2372,7 +2372,7 @@ mobjinfo_t odamobjinfo[] = {
     {
         // MT_CAREPACK
         MT_CAREPACK,
-        5301,        // doomednum
+        -1,        // doomednum
         S_CARE,        // spawnstate
         1000,          // spawnhealth
         0,             // gibhealth

common/p_hordespawn.h

@@ -26,7 +26,6 @@
 #include "actor.h"
 #include "p_hordedefine.h"
 
-// [CMB] id24spec implementation specific range(s) needed in the future
 #define TTYPE_HORDE_SMALLMONSTER (5300)
 #define TTYPE_HORDE_ITEM (5301)
 #define TTYPE_HORDE_MONSTER (5302)

common/p_mapformat.cpp

@@ -419,12 +419,17 @@ bool P_IsThingNoFogTeleportLine(const short special)
 	       special == 268 || special == 269;
 }
 
+bool P_IsGenLockedDoorLine(const short special)
+{
+	return special >= GenLockedBase && special < GenDoorBase;
+}
+
 bool P_IsCompatibleLockedDoorLine(const short special)
 {
 	if (map_format.getZDoom())
 		return false;
 
-	if (special >= GenLockedBase && special < GenDoorBase)
+	if (P_IsGenLockedDoorLine(special))
 		return true;
 
 	return special == 26 || special == 27 || special == 28 || special == 32 ||
@@ -437,6 +442,9 @@ bool P_IsCompatibleMultiKeyDoorLine(const short special)
 	if (map_format.getZDoom())
 		return false;
 
+	if (!P_IsGenLockedDoorLine(special))
+		return false;
+
 	const int lock = (special & LockedKey) >> LockedKeyShift;
 
 	return lock == 0 || lock == 7;
@@ -448,7 +456,7 @@ bool P_IsCompatibleBlueDoorLine(const short special)
 		return false;
 
 	const int lock = (special & LockedKey) >> LockedKeyShift;
-	const bool genericlock = lock == BCard || lock == BSkull;
+	const bool genericlock = P_IsGenLockedDoorLine(special) && (lock == BCard || lock == BSkull);
 
 	return special == 26 || special == 32 || special == 99 || special == 133 || genericlock;
 }
@@ -459,7 +467,7 @@ bool P_IsCompatibleRedDoorLine(const short special)
 		return false;
 
 	const int lock = (special & LockedKey) >> LockedKeyShift;
-	const bool genericlock = lock == RCard || lock == RSkull;
+	const bool genericlock = P_IsGenLockedDoorLine(special) && (lock == RCard || lock == RSkull);
 
 	return special == 28 || special == 33 || special == 134 || special == 135 || genericlock;
 }
@@ -470,7 +478,7 @@ bool P_IsCompatibleYellowDoorLine(const short special)
 		return false;
 
 	const int lock = (special & LockedKey) >> LockedKeyShift;
-	const bool genericlock = lock == YCard || lock == YSkull;
+	const bool genericlock = P_IsGenLockedDoorLine(special) && (lock == YCard || lock == YSkull);
 
 	return special == 27 || special == 34 || special == 136 || special == 137 || genericlock;
 }

common/p_mobj.cpp

@@ -3171,6 +3171,12 @@ void P_SpawnMapThing (mapthing2_t& mthing, int position)
 		type = MT_MUSICSOURCE;
 	}
 
+	if (!inSpawnMap && P_IsHordeThing(mthing.type))
+	{
+		type = MT_HORDESPAWN;
+		::level.detected_gametype = GM_HORDE;
+	}
+
 	// [CMB] find the value in the mobjinfo table if we asked for a specific type; otherwise check the spawn table
 	mobjinfo_t* info = nullptr;
 	if (type == -1)
@@ -3189,12 +3195,6 @@ void P_SpawnMapThing (mapthing2_t& mthing, int position)
 			type = MT_FOUNTAIN;
 			info = &mobjinfo[type]; // mt_fountain guaranteed to exist
 		}
-
-		if (P_IsHordeThing(mthing.type))
-		{
-			type = MT_HORDESPAWN;
-			::level.detected_gametype = GM_HORDE;
-		}
 	}
 	else
 	{

common/version.h

@@ -75,10 +75,10 @@
 // Used by configuration files.  upversion.py will update thie field
 // deterministically and unambiguously so newer versions always compare
 // greater.
-#define CONFIGVERSIONSTR "012021"
+#define CONFIGVERSIONSTR "012030"
 
-#define DOTVERSIONSTR "12.2.1"
-#define GAMEVER (MAKEVER(12, 2, 1))
+#define DOTVERSIONSTR "12.3.0"
+#define GAMEVER (MAKEVER(12, 3, 0))
 
 #define COPYRIGHTSTR "Copyright (C) 2006-2026 The Odamex Team"
 
@@ -94,7 +94,7 @@
 // earlier than this version.  Needs to be exactly 16 chars long.
 //
 // upversion.py will update thie field deterministically and unambiguously.
-#define SAVESIG "ODAMEXSAVE012021"
+#define SAVESIG "ODAMEXSAVE012030"
 
 #define NETDEMOVER 3
 

config-samples/coop-all-official-wads.cfg

@@ -1,5 +1,5 @@
 // "Modern" Doom(2) Cooperative Ruleset (No Jump/No Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/coop-doom.cfg

@@ -1,5 +1,5 @@
 // Vanilla Doom(2) Cooperative Ruleset (4 Players/Ultraviolence Skill)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/coop-masterlevels.cfg

@@ -1,5 +1,5 @@
 // Master Levels Doom(2) Cooperative Ruleset (4 Players/Ultraviolence Skill)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/coop-modern.cfg

@@ -1,5 +1,5 @@
 // "Modern" Doom(2) Cooperative Ruleset (No Jump/No Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/coop-zdoom.cfg

@@ -1,5 +1,5 @@
 // "ZDOOM" Style Cooperative Ruleset (8 Players/Freelook/Jumping)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/ctf-attackdefend.cfg

@@ -1,5 +1,5 @@
 // Attack & Defend CTF with World Doom League (doomleague.org) 3v3/4v4 CTF Ruleset
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/ctf-doom.cfg

@@ -1,5 +1,5 @@
 // Vanilla Doom(2) Settings (8v8) CTF Ruleset
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/ctf-pub.cfg

@@ -1,5 +1,5 @@
 // Commonly Used 8v8 Public CTF Ruleset
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/ctf-wdl.cfg

@@ -1,5 +1,5 @@
 // World Doom League (doomleague.org) 3v3/4v4 CTF Ruleset
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/dm-doom.cfg

@@ -1,5 +1,5 @@
 // Vanilla Doom(2) Style (4 Player) Deathmatch Ruleset (50 Fraglimit/10 Min Timelimit/No Exit)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/dm-iddm1.cfg

@@ -1,5 +1,5 @@
 // "Modern" Doom 2 Style (16 Player) Deathmatch Ruleset (No Jump/No Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/dm-modern.cfg

@@ -1,5 +1,5 @@
 // "Modern" Doom 2 Style (16 Player) Deathmatch Ruleset (No Jump/No Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/dm-zdoom.cfg

@@ -1,5 +1,5 @@
 // "ZDOOM" Style (16 Player) Deathmatch Ruleset (Jump/Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/duel-altdeath.cfg

@@ -1,5 +1,5 @@
 // Vanilla Doom 2 Altdeath (Deathmatch 2.0) 1v1 Ruleset (No Fraglimit and Exiting Enabled)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/duel-ddl.cfg

@@ -1,5 +1,5 @@
 // Doom Duel League (doomleague.org) 1v1 Ruleset
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/duel-doom.cfg

@@ -1,5 +1,5 @@
 // Vanilla Doom(2) 1v1 Ruleset (With Standard U.S. Fraglimit & No Exiting)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/duel-zddl.cfg

@@ -1,5 +1,5 @@
 // ZDoom Duel League 2011 1v1 Ruleset
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/duel-zdoom.cfg

@@ -1,5 +1,5 @@
 // "ZDOOM" Style 1v1 Ruleset
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/horde-doom.cfg

@@ -1,5 +1,5 @@
 // Vanilla Doom(2) Horde Ruleset (4 Players/Ultraviolence Skill)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/horde-modern.cfg

@@ -1,5 +1,5 @@
 // "Modern" Doom(2) Horde Ruleset (No Jump/No Freelook/Ultraviolence Skill)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/horde-zdoom.cfg

@@ -1,5 +1,5 @@
 // "ZDOOM" Style Horde Ruleset (32 Players/Freelook/Jumping/Ultraviolence Skill)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/lms-2team.cfg

@@ -1,5 +1,5 @@
 // 2-Team Last Man Standing with "Modern" Doom 2 Style (8v8) Team Deathmatch Ruleset (No Jump/No Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/lms-3team.cfg

@@ -1,5 +1,5 @@
 // 3-Team Last Man Standing with "Modern" Doom 2 Style (8v8) Team Deathmatch Ruleset (No Jump/No Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/lms-ffa.cfg

@@ -1,5 +1,5 @@
 // Last Man Standing with "Modern" Doom 2 Style (16 Player) Deathmatch Ruleset (No Jump/No Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/survival-modern.cfg

@@ -1,5 +1,5 @@
 // "Modern" Doom(2) Survival Cooperative Ruleset (No Jump/No Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/tdm-doom.cfg

@@ -1,5 +1,5 @@
 // Vanilla Doom(2) Style (2v2) Team Deathmatch Ruleset (50 Fraglimit/10 Min Timelimit/No Exit)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/tdm-modern.cfg

@@ -1,5 +1,5 @@
 // "Modern" Doom 2 Style (8v8) Team Deathmatch Ruleset (No Jump/No Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

config-samples/tdm-zdoom.cfg

@@ -1,5 +1,5 @@
 // "ZDOOM" Style (8v8) Team Deathmatch Ruleset (Jump/Freelook)
-// Odamex 12.2.1
+// Odamex 12.3.0
 // For in-depth information on these variables, visit https://github.com/odamex/odamex/wiki/Console-Variables
 // Note that 1 = on, 0 = off
 

odalaunch/res/Info.plist

@@ -19,13 +19,13 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>12.2.1</string>
+	<string>12.3.0</string>
 	<key>CFBundleShortVersionString</key>
-	<string>12.2.1</string>
+	<string>12.3.0</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Copyright © 2006-2026 The Odamex Team</string>
 	<key>CFBundleLongVersionString</key>
-	<string>12.2.1</string>
+	<string>12.3.0</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2006-2026 The Odamex Team</string>
 	<key>LSRequiresCarbon</key>

odalaunch/res/odamex_cvardoc.json

@@ -1138,7 +1138,7 @@
          "type" : "boolean"
       },
       {
-         "default" : "012021",
+         "default" : "012030",
          "flags" : [ "NOENABLEDISABLE", "SERVERARCHIVE", "CLIENTARCHIVE" ],
          "helptext" : "",
          "name" : "configver",
@@ -2898,6 +2898,6 @@
    ],
    "odamex_branchname" : "",
    "odamex_commithash" : "",
-   "odamex_version" : "12.2.1",
+   "odamex_version" : "12.3.0",
    "schema_version" : 1
 }

odalaunch/res/odasrv_cvardoc.json

@@ -250,7 +250,7 @@
          "type" : "boolean"
       },
       {
-         "default" : "012021",
+         "default" : "012030",
          "flags" : [ "NOENABLEDISABLE", "SERVERARCHIVE", "CLIENTARCHIVE" ],
          "helptext" : "",
          "name" : "configver",
@@ -1397,6 +1397,6 @@
    ],
    "odamex_branchname" : "",
    "odamex_commithash" : "",
-   "odamex_version" : "12.2.1",
+   "odamex_version" : "12.3.0",
    "schema_version" : 1
 }

odalaunch/src/dlg_serverdetails.cpp

@@ -88,7 +88,7 @@ static const CvarCategories& GetCvarCategories()
 	{
 		Categories.push_back(std::make_pair(Name, std::move(Cvars)));
 	};
-
+	// TODO: Load these from cvardocjson instead.
 	Add("Gameplay Options",
 	    {"sv_gametype", "sv_teamsinplay", "sv_teamspawns", "sv_maxcorpses", "g_sides"});
 	Add("Gameplay Modifiers",
@@ -155,7 +155,7 @@ static const CvarCategories& GetCvarCategories()
 	    {"g_horde_extralife", "g_horde_goalhp", "g_horde_maxtotalhp",
 	     "g_horde_mintotalhp", "g_horde_resurrect", "g_horde_spawnempty_max",
 	     "g_horde_spawnempty_min", "g_horde_spawnfull_max",
-	     "g_horde_spawnfull_min", "g_horde_waves"});
+	     "g_horde_spawnfull_min", "g_horde_waves", "g_horde_cooldown"});
 	Add("Survival", {"g_lives", "g_lives_jointimer"});
 	Add("Rounds",
 	    {"g_rounds", "g_preroundtime", "g_postroundtime", "g_preroundreset",

odalpapi/net_packet.h

@@ -66,7 +66,7 @@
 #define VERSIONMINOR(V) ((V % 256) / 10)
 #define VERSIONPATCH(V) ((V % 256) % 10)
 
-#define VERSION (MAKEVER(12, 2, 1))
+#define VERSION (MAKEVER(12, 3, 0))
 #define PROTOCOL_VERSION 8
 
 #define TAG_ID 0xAD0

packaging/linux/net.odamex.Odamex.releases.xml

@@ -1,5 +1,5 @@
 <releases>
-  <release version="12.2.1" date="YYYY-MM-DD"/>
+  <release version="12.3.0" date="YYYY-MM-DD"/>
   <release version="12.1.0" date="2026-01-05">
     <url type="details">https://github.com/odamex/odamex/releases/tag/12.1.0</url>
     <description>

switch.cmake

@@ -37,7 +37,7 @@ set (GCONSOLE 1)
 # NACP info
 set (APP_TITLE "Odamex for Nintendo Switch")
 set (APP_AUTHOR "The Odamex Team")
-set (APP_VERSION "12.2.1")
+set (APP_VERSION "12.3.0")
 
 # Compiler stuff
 set(NACP_TOOL "${DEVKITPRO}/tools/bin/nacptool"  CACHE PATH "nacp-tool")

tools/upversion/upversion.ini

@@ -5,8 +5,8 @@
 ; Existing and new versions of Odamex, in dotted-number format.
 ; Middle number only goes up to 25, last number only goes up to 9.
 
-old_version=12.2.1
-new_version=12.2.1
+old_version=12.3.0
+new_version=12.3.0
 
 ; Existing and new year ranges.  Note that if these are the same, year
 ; replacement will be skipped entirely.  Year ranges will not be updated