Bump version

odamex · Sep 7, 2021 · 41835cd · 41835cd
1 parent 17438d7
commit 41835cd
Show file tree

Hide file tree

Showing 33 changed files with 42 additions and 42 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,7 @@
 
 cmake_minimum_required(VERSION 3.13)
 
-project(Odamex VERSION 0.9.4)
+project(Odamex VERSION 0.9.5)
 
 include(CMakeDependentOption)
 
@@ -47,7 +47,7 @@ cmake_dependent_option( ENABLE_PORTMIDI "Enable portmidi support" 1 BUILD_CLIENT
 cmake_dependent_option( USE_MINIUPNP "Build with UPnP support" 1 BUILD_SERVER 0 )
 
 set(PROJECT_COPYRIGHT "2006-2021")
-set(PROJECT_RC_VERSION "0,9,4,0")
+set(PROJECT_RC_VERSION "0,9,5,0")
 set(PROJECT_COMPANY "The Odamex Team")
 
 # Use C++ 98/03 for all targets

diff --git a/README b/README
@@ -1,5 +1,5 @@
 ===============================================================================
-                              Odamex v0.9.4 README
+                              Odamex v0.9.5 README
                                https://odamex.net
 ===============================================================================
 

diff --git a/Xbox/README.Xbox b/Xbox/README.Xbox
@@ -1,5 +1,5 @@
 ===============================================================================
-                            Odamex v0.9.4 for Xbox
+                            Odamex v0.9.5 for Xbox
                               http://odamex.net/
                                  Authored by:
                             Michael "Hyper_Eye" Wood

diff --git a/ag-odalaunch/res/Info.plist b/ag-odalaunch/res/Info.plist
@@ -19,13 +19,13 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.4</string>
+	<string>0.9.5</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.4</string>
+	<string>0.9.5</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Copyright © 2006-2021 The Odamex Team</string>
 	<key>CFBundleLongVersionString</key>
-	<string>0.9.4</string>
+	<string>0.9.5</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2006-2021 The Odamex Team</string>
 	<key>LSRequiresCarbon</key>

diff --git a/common/version.h b/common/version.h
@@ -72,10 +72,10 @@
 // Used by configuration files.  upversion.py will update thie field
 // deterministically and unambiguously so newer versions always compare
 // greater.
-#define CONFIGVERSIONSTR "94"
+#define CONFIGVERSIONSTR "95"
 
-#define DOTVERSIONSTR "0.9.4"
-#define GAMEVER (MAKEVER(0, 9, 4))
+#define DOTVERSIONSTR "0.9.5"
+#define GAMEVER (MAKEVER(0, 9, 5))
 
 #define COPYRIGHTSTR "Copyright (C) 2006-2021 The Odamex Team"
 
@@ -91,7 +91,7 @@
 // earlier than this version.  Needs to be exactly 16 chars long.
 // 
 // upversion.py will update thie field deterministically and unambiguously.
-#define SAVESIG "ODAMEXSAVE094   "
+#define SAVESIG "ODAMEXSAVE095   "
 
 #define NETDEMOVER 3
 

diff --git a/config-samples/coop-doom.cfg b/config-samples/coop-doom.cfg
@@ -1,5 +1,5 @@
 // Vanilla Doom(2) Cooperative Ruleset (4 Players/Ultraviolence Skill)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/coop-masterlevels.cfg b/config-samples/coop-masterlevels.cfg
@@ -1,5 +1,5 @@
 // Vanilla Doom(2) Cooperative Ruleset (4 Players/Ultraviolence Skill)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/coop-modern.cfg b/config-samples/coop-modern.cfg
@@ -1,5 +1,5 @@
 // "Modern" Doom(2) Cooperative Ruleset (No Jump/No Freelook)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/coop-zdoom.cfg b/config-samples/coop-zdoom.cfg
@@ -1,5 +1,5 @@
 // "ZDOOM" Style Cooperative Ruleset (8 Players/Freelook/Jumping)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/ctf-attackdefend.cfg b/config-samples/ctf-attackdefend.cfg
@@ -1,5 +1,5 @@
 // Attack & Defend CTF with World Doom League (doomleague.org) 3v3/4v4 CTF Ruleset
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/ctf-doom.cfg b/config-samples/ctf-doom.cfg
@@ -1,5 +1,5 @@
 // Vanilla Doom(2) Settings (8v8) CTF Ruleset
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/ctf-pub.cfg b/config-samples/ctf-pub.cfg
@@ -1,5 +1,5 @@
 // Commonly Used 8v8 Public CTF Ruleset
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/ctf-wdl.cfg b/config-samples/ctf-wdl.cfg
@@ -1,5 +1,5 @@
 // World Doom League (doomleague.org) 3v3/4v4 CTF Ruleset
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/dm-doom.cfg b/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 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/dm-modern.cfg b/config-samples/dm-modern.cfg
@@ -1,5 +1,5 @@
 // "Modern" Doom 2 Style (16 Player) Deathmatch Ruleset (No Jump/No Freelook)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/dm-zdoom.cfg b/config-samples/dm-zdoom.cfg
@@ -1,5 +1,5 @@
 // "ZDOOM" Style (16 Player) Deathmatch Ruleset (Jump/Freelook)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/duel-altdeath.cfg b/config-samples/duel-altdeath.cfg
@@ -1,5 +1,5 @@
 // Vanilla Doom 2 Altdeath (Deathmatch 2.0) 1v1 Ruleset (No Fraglimit and Exiting Enabled)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/duel-ddl.cfg b/config-samples/duel-ddl.cfg
@@ -1,5 +1,5 @@
 // Doom Duel League (doomleague.org) 1v1 Ruleset
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/duel-doom.cfg b/config-samples/duel-doom.cfg
@@ -1,5 +1,5 @@
 // Vanilla Doom(2) 1v1 Ruleset (With Standard U.S. Fraglimit & No Exiting)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/duel-zddl.cfg b/config-samples/duel-zddl.cfg
@@ -1,5 +1,5 @@
 // ZDoom Duel League 2011 1v1 Ruleset
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/duel-zdoom.cfg b/config-samples/duel-zdoom.cfg
@@ -1,5 +1,5 @@
 // "ZDOOM" Style 1v1 Ruleset
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/lms-2team.cfg b/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 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/lms-3team.cfg b/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 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/lms-ffa.cfg b/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 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/survival-modern.cfg b/config-samples/survival-modern.cfg
@@ -1,5 +1,5 @@
 // "Modern" Doom(2) Survival Cooperative Ruleset (No Jump/No Freelook)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/tdm-doom.cfg b/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 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/tdm-modern.cfg b/config-samples/tdm-modern.cfg
@@ -1,5 +1,5 @@
 // "Modern" Doom 2 Style (8v8) Team Deathmatch Ruleset (No Jump/No Freelook)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/config-samples/tdm-zdoom.cfg b/config-samples/tdm-zdoom.cfg
@@ -1,5 +1,5 @@
 // "ZDOOM" Style (8v8) Team Deathmatch Ruleset (Jump/Freelook)
-// Odamex 0.9.4
+// Odamex 0.9.5
 // For in-depth information on these variables, visit http://odamex.net/wiki/Category:Server_variables
 // Note that 1 = on, 0 = off
 

diff --git a/installer/windows/build_release.ps1 b/installer/windows/build_release.ps1
@@ -9,7 +9,7 @@
 # These parameters can and should be changed for new versions.
 # 
 
-Set-Variable -Name "OdamexVersion" -Value "0.9.4"
+Set-Variable -Name "OdamexVersion" -Value "0.9.5"
 Set-Variable -Name "OdamexTestSuffix" -Value "" # "-RC3"
 
 #

diff --git a/odalaunch/res/Info.plist b/odalaunch/res/Info.plist
@@ -19,13 +19,13 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.9.4</string>
+	<string>0.9.5</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.9.4</string>
+	<string>0.9.5</string>
 	<key>CFBundleGetInfoString</key>
 	<string>Copyright © 2006-2021 The Odamex Team</string>
 	<key>CFBundleLongVersionString</key>
-	<string>0.9.4</string>
+	<string>0.9.5</string>
 	<key>NSHumanReadableCopyright</key>
 	<string>Copyright © 2006-2021 The Odamex Team</string>
 	<key>LSRequiresCarbon</key>

diff --git a/odalpapi/net_packet.h b/odalpapi/net_packet.h
@@ -66,7 +66,7 @@
 #define VERSIONMINOR(V) ((V % 256) / 10)
 #define VERSIONPATCH(V) ((V % 256) % 10)
 
-#define VERSION (MAKEVER(0, 9, 4))
+#define VERSION (MAKEVER(0, 9, 5))
 #define PROTOCOL_VERSION 8
 
 #define TAG_ID 0xAD0

diff --git a/switch.cmake b/switch.cmake
@@ -41,7 +41,7 @@ set (GCONSOLE 1)
 # NACP info
 set (APP_TITLE "Odamex for Nintendo Switch")
 set (APP_AUTHOR "The Odamex Team")
-set (APP_VERSION "0.9.4")
+set (APP_VERSION "0.9.5")
 
 # Compiler stuff
 set(NACP_TOOL "${DEVKITPRO}/tools/bin/nacptool"  CACHE PATH "nacp-tool")

diff --git a/tools/upversion/upversion.ini b/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=0.9.3
-new_version=0.9.4
+old_version=0.9.4
+new_version=0.9.5
 
 ; Existing and new year ranges.  Note that if these are the same, year
 ; replacement will be skipped entirely.  Year ranges will not be updated