Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
  • 2 commits
  • 33 files changed
  • 0 commit comments
  • 2 contributors
Showing with 8 additions and 8 deletions.
  1. +2 −2 configure.ac
  2. BIN data/base/texpages/page-100-rock-earth-rockies.png
  3. BIN data/base/texpages/page-101-cliff-rockies.png
  4. BIN data/base/texpages/page-102-bottom-rockies.png
  5. BIN data/base/texpages/page-103-tiles-rockies.png
  6. BIN data/base/texpages/page-104-snowgrass-rockies.png
  7. BIN data/base/texpages/page-105-snow-rockies.png
  8. BIN data/base/texpages/page-106-snowrock-rockies.png
  9. BIN data/base/texpages/page-107-brown-earth-rockies.png
  10. BIN data/base/texpages/page-108-snowcliff-rockies.png
  11. BIN data/base/texpages/page-80-water-1.png
  12. BIN data/base/texpages/page-81-water-2.png
  13. BIN data/base/texpages/page-82-yellow-sand-arizona.png
  14. BIN data/base/texpages/page-83-red-earth-arizona.png
  15. BIN data/base/texpages/page-84-tiles-arizona.png
  16. BIN data/base/texpages/page-85-cliff-arizona.png
  17. BIN data/base/texpages/page-86-bottom-arizona.png
  18. BIN data/base/texpages/page-87-mud-arizona.png
  19. BIN data/base/texpages/page-88-grass-arizona.png
  20. BIN data/base/texpages/page-89-gray-rubble-urban.png
  21. BIN data/base/texpages/page-90-green-urban.png
  22. BIN data/base/texpages/page-91-tiles-urban.png
  23. BIN data/base/texpages/page-92-medium-tiles-urban.png
  24. BIN data/base/texpages/page-93-big-tiles-urban.png
  25. BIN data/base/texpages/page-94-cliffs-urban.png
  26. BIN data/base/texpages/page-95-brown-rocks-urban.png
  27. BIN data/base/texpages/page-96-burned-ground-urban.png
  28. BIN data/base/texpages/page-97-burned-tiles-urban.png
  29. BIN data/base/texpages/page-98-bottom-urban.png
  30. BIN data/base/texpages/page-99-grass-rockies.png
  31. +1 −1 lib/netplay/netplay.cpp
  32. +1 −1 src/version.cpp
  33. +4 −4 win32/warzone2100.rc
View
4 configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.56])
-AC_INIT([Warzone 2100],[3.1git],[http://wz2100.net/],[warzone2100])
+AC_INIT([Warzone 2100],[3.1_beta4],[http://wz2100.net/],[warzone2100])
AM_INIT_AUTOMAKE([1.10 tar-ustar])
@@ -262,7 +262,7 @@ AS_IF([test "x$enable_sound" != "xyes"],[
# Add later for stricter checking: -Wextra -Wmissing-declarations -Wstrict-prototypes
AC_ARG_ENABLE([debug],
AS_HELP_STRING([--enable-debug[=yes/relaxed/profile/debugprofile/optimised/no]],[Compile debug version [[yes]]]),
- [ enable_debug=${enableval} ], [ enable_debug=yes ])
+ [ enable_debug=${enableval} ], [ enable_debug=no ])
AC_MSG_CHECKING([whether to compile in debug mode])
AC_MSG_RESULT([${enable_debug}])
View
BIN data/base/texpages/page-100-rock-earth-rockies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-101-cliff-rockies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-102-bottom-rockies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-103-tiles-rockies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-104-snowgrass-rockies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-105-snow-rockies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-106-snowrock-rockies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-107-brown-earth-rockies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-108-snowcliff-rockies.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-80-water-1.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-81-water-2.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-82-yellow-sand-arizona.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-83-red-earth-arizona.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-84-tiles-arizona.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-85-cliff-arizona.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-86-bottom-arizona.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-87-mud-arizona.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-88-grass-arizona.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-89-gray-rubble-urban.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-90-green-urban.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-91-tiles-urban.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-92-medium-tiles-urban.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-93-big-tiles-urban.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-94-cliffs-urban.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-95-brown-rocks-urban.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
BIN data/base/texpages/page-96-burned-ground-urban.png
Diff not rendered.
View
BIN data/base/texpages/page-97-burned-tiles-urban.png
Diff not rendered.
View
BIN data/base/texpages/page-98-bottom-urban.png
Diff not rendered.
View
BIN data/base/texpages/page-99-grass-rockies.png
Diff not rendered.
View
2 lib/netplay/netplay.cpp
@@ -165,7 +165,7 @@ unsigned NET_PlayerConnectionStatus[CONNECTIONSTATUS_NORMAL][MAX_PLAYERS];
**/
static char const *versionString = version_getVersionString();
static int NETCODE_VERSION_MAJOR = 6;
-static int NETCODE_VERSION_MINOR = 5;
+static int NETCODE_VERSION_MINOR = 20120221;
bool NETisCorrectVersion(uint32_t game_version_major, uint32_t game_version_minor)
{
View
2 src/version.cpp
@@ -47,7 +47,7 @@ unsigned int version_getRevision()
const char* version_getVersionString()
{
- static const char* version_string = NULL;
+ static const char* version_string = "3.1_beta4";
if (version_string == NULL)
{
View
8 win32/warzone2100.rc
@@ -4,8 +4,8 @@
//
1 VERSIONINFO
- FILEVERSION 9,9,9,9
- PRODUCTVERSION 9,9,9,9
+ FILEVERSION 3,0,99,4
+ PRODUCTVERSION 3,0,99,4
FILEFLAGSMASK 0x0L
#ifdef _DEBUG
FILEFLAGS 0x1L
@@ -22,12 +22,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Warzone 2100 Project"
VALUE "FileDescription", "Warzone 2100"
- VALUE "FileVersion", "master"
+ VALUE "FileVersion", "3.1_beta4"
VALUE "InternalName", "Warzone 2100"
VALUE "LegalCopyright", "Copyright � 2005-2010 Warzone 2100 Project"
VALUE "OriginalFilename", "warzone2100.exe"
VALUE "ProductName", "Warzone 2100"
- VALUE "ProductVersion", "master"
+ VALUE "ProductVersion", "3.1_beta4"
END
END
BLOCK "VarFileInfo"

No commit comments for this range

Something went wrong with that request. Please try again.