Skip to content

Commit

Permalink
Update version to 2.4.26
Browse files Browse the repository at this point in the history
  • Loading branch information
blast007 committed Nov 20, 2022
1 parent 20059a7 commit bf80702
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 23 deletions.
4 changes: 2 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
BZFlag Release Notes
====================

BZFlag 2.4.25
-------------
BZFlag 2.4.26 "Tanksgiving" (2022-11-20)
-----------------------------------------

* Fix incorrect rotation math for API custom zones
- Alfredo Tupone, Vladimir Jimenez
Expand Down
8 changes: 4 additions & 4 deletions MSVC/Version.rc
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,4,25,0
PRODUCTVERSION 2,4,25,0
FILEVERSION 2,4,26,0
PRODUCTVERSION 2,4,26,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -32,12 +32,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Tim Riker"
VALUE "FileDescription", "BZFlag"
VALUE "FileVersion", "2.4.25.0"
VALUE "FileVersion", "2.4.26.0"
VALUE "InternalName", "version.rc"
VALUE "LegalCopyright", "Copyright (c) 1993-2021 Tim Riker"
VALUE "OriginalFilename", "version.rc"
VALUE "ProductName", "BZFlag"
VALUE "ProductVersion", "2.4.25.0"
VALUE "ProductVersion", "2.4.26.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
BZFlag 2.4.25
BZFlag 2.4.26
http://BZFlag.org/
Copyright (c) 1993-2021 Tim Riker

Expand Down
4 changes: 2 additions & 2 deletions Xcode/BZFlag-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>2.4.25</string>
<string>2.4.26</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>2.4.25</string>
<string>2.4.26</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.arcade-games</string>
<key>LSMinimumSystemVersion</key>
Expand Down
16 changes: 8 additions & 8 deletions Xcode/BZFlag.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1789,7 +1789,7 @@
03C338CC1AFB5AFC00E8F655 /* SDL2Window.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL2Window.h; sourceTree = "<group>"; };
03C5E79716707857005A26C4 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = "<group>"; };
03C5E7BC1670A3DA005A26C4 /* lib3D.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = lib3D.a; sourceTree = BUILT_PRODUCTS_DIR; };
03C8EE25167ABE2300BB07A5 /* BZFlag-2.4.25.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BZFlag-2.4.25.app"; sourceTree = BUILT_PRODUCTS_DIR; };
03C8EE25167ABE2300BB07A5 /* BZFlag-2.4.26.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "BZFlag-2.4.26.app"; sourceTree = BUILT_PRODUCTS_DIR; };
03CC33EC1E3D4A8A00CF55BC /* VotingArbiter.cxx */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VotingArbiter.cxx; sourceTree = "<group>"; };
03CC33ED1E3D4A8A00CF55BC /* VotingArbiter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VotingArbiter.h; sourceTree = "<group>"; };
03CDB24516A0BA81001DA037 /* superUser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = superUser.cpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -3398,7 +3398,7 @@
0394E967167B2D7B007F4035 /* Targets */ = {
isa = PBXGroup;
children = (
03C8EE25167ABE2300BB07A5 /* BZFlag-2.4.25.app */,
03C8EE25167ABE2300BB07A5 /* BZFlag-2.4.26.app */,
03C5E7BC1670A3DA005A26C4 /* lib3D.a */,
0357A7BC1670AF8E0056C938 /* libcommon.a */,
0357A7EB1670B11A0056C938 /* libnet.a */,
Expand Down Expand Up @@ -4666,9 +4666,9 @@
productReference = 03C5E7BC1670A3DA005A26C4 /* lib3D.a */;
productType = "com.apple.product-type.library.static";
};
03C8EE24167ABE2300BB07A5 /* BZFlag-2.4.25 */ = {
03C8EE24167ABE2300BB07A5 /* BZFlag-2.4.26 */ = {
isa = PBXNativeTarget;
buildConfigurationList = 03C8EE3E167ABE2300BB07A5 /* Build configuration list for PBXNativeTarget "BZFlag-2.4.25" */;
buildConfigurationList = 03C8EE3E167ABE2300BB07A5 /* Build configuration list for PBXNativeTarget "BZFlag-2.4.26" */;
buildPhases = (
03C8EE21167ABE2300BB07A5 /* Sources */,
03C8EE22167ABE2300BB07A5 /* Frameworks */,
Expand Down Expand Up @@ -4719,9 +4719,9 @@
0394E92C167B29D8007F4035 /* PBXTargetDependency */,
0394E942167B2AA9007F4035 /* PBXTargetDependency */,
);
name = "BZFlag-2.4.25";
name = "BZFlag-2.4.26";
productName = BZFlag;
productReference = 03C8EE25167ABE2300BB07A5 /* BZFlag-2.4.25.app */;
productReference = 03C8EE25167ABE2300BB07A5 /* BZFlag-2.4.26.app */;
productType = "com.apple.product-type.application";
};
03FA742D1742601B00573D2D /* serverSidePlayerSample */ = {
Expand Down Expand Up @@ -4813,7 +4813,7 @@
projectDirPath = "";
projectRoot = "";
targets = (
03C8EE24167ABE2300BB07A5 /* BZFlag-2.4.25 */,
03C8EE24167ABE2300BB07A5 /* BZFlag-2.4.26 */,
0355E7B8174264D7006E2991 /* Pre-Build Script */,
03C5E7BB1670A3DA005A26C4 /* 3D */,
0357A7BB1670AF8E0056C938 /* common */,
Expand Down Expand Up @@ -8089,7 +8089,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
03C8EE3E167ABE2300BB07A5 /* Build configuration list for PBXNativeTarget "BZFlag-2.4.25" */ = {
03C8EE3E167ABE2300BB07A5 /* Build configuration list for PBXNativeTarget "BZFlag-2.4.26" */ = {
isa = XCConfigurationList;
buildConfigurations = (
03C8EE3F167ABE2300BB07A5 /* Debug */,
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ dnl Minimum version of autoconf required. Should coincide with the
dnl setting in the autogen.sh script.
AC_PREREQ([2.68])

AC_INIT([BZFlag],[2.4.25],[http://BZFlag.org/],[bzflag])
AC_INIT([BZFlag],[2.4.26],[http://BZFlag.org/],[bzflag])
AC_CONFIG_SRCDIR(src/bzflag/bzflag.cxx)
AC_CONFIG_MACRO_DIR([m4])

Expand Down
Binary file modified data/title.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified misc/art/title.psd
Binary file not shown.
6 changes: 3 additions & 3 deletions package/win32/nsis/BZFlag.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

!define VER_MAJOR 2
!define VER_MINOR 4
!define VER_REVISION 25
!define VER_REVISION 26

;!define TYPE "release"
!define TYPE "release"
;!define TYPE "alpha"
;!define TYPE "beta"
!define TYPE "devel"
;!define TYPE "devel"
;!define TYPE "RC"

!define TYPE_REVISION "0"
Expand Down
4 changes: 2 additions & 2 deletions src/date/buildDate.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@
#endif

#ifndef BZ_REV
# define BZ_REV 25
# define BZ_REV 26
#endif

// DEVEL | RC# | STABLE | MAINT
#ifndef BZ_BUILD_TYPE
# define BZ_BUILD_TYPE "DEVEL"
# define BZ_BUILD_TYPE "MAINT"
#endif

const char *bzfcopyright = "Copyright (c) 1993-2021 Tim Riker";
Expand Down

0 comments on commit bf80702

Please sign in to comment.