Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,728 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

3573 Commits (master)

Author SHA1 Message Date
Ginger88895 7c274b1c21 Fixed a typo that caused the game to crash on mission end. 2014-02-03 08:22:26 -05:00
per 1eb4cb09e6 Try again to fix buildbot problem with GLEW 1.9 and glPopDebugGroup() 2014-01-27 22:19:55 +01:00
per d0bfea73a9 Try to fix build bot and other hosts that do not have an up to date version of GLEW. 2014-01-27 19:20:51 +01:00
per 8c0cb1bb23 Do not hardcode backdrop numbers and filenames. Allow all backdrop types to have 
random variations, based on filename base. Hardcoded limits removed. Patch by stiv,
modified by me. Closes ticket:4168
 2014-01-25 15:07:07 +01:00
per 9a6fdec2b5 Annotate the OpenGL command stream better. Now using the new KHR_debug extension with 
debug groups. Some functionality commented out until apitrace fixes a bug upstream.
For this functionality, GLEW version 1.10 or higher is required.
 2014-01-25 13:39:07 +01:00
per cba585f67b Remove unused DEPTH_CMP_LEQ_WRT_OFF 2013-12-20 19:27:29 +01:00
per 7b8cddf092 Version 3.2 requires OpenGL 2.0. 
Remove unnecessary dependencies between ivis library and main source.
Add link test program to detect and prevent new unnecessary dependencies.
 2013-12-14 17:33:32 +01:00
per eb9e6ee9f3 Remove unnecessary glClearColor calls. (They do not make fog any less broken.) 
Turn deprecated GL_CLAMP into GL_CLAMP_TO_EDGE.
 2013-12-14 15:58:04 +01:00
vexed 1e503680c3 Update MSVC build refs: e9643818d1 2013-12-07 18:53:40 -05:00
per 32318037d9 Do not use WZ_DECL_THREAD on MacOSX. This makes WZ_DECL_THREAD not worth in general for now. 2013-12-01 23:52:46 +01:00
per 7cf3ff3d29 Fix one last dependency from framework to src/, and fix a possible race condition in error reporting. 2013-12-01 19:10:38 +01:00
per 856bba37ed Remove dependency on src/ from lib/sdl and lib/qtgame, and one dependency from framework 2013-12-01 18:37:25 +01:00
per 3464fc0ddb Don't wait one minute before showing an errror in the console. That is the wrong way to implement throttling... 2013-12-01 18:10:22 +01:00
per e9643818d1 Remove dead code, which means removing two entire files. 2013-12-01 18:10:17 +01:00
per e3be45d636 Move the tiny contents of iV_ShutDown() into screenShutDown() and shut down ivi.h and ivi.cpp 2013-12-01 17:46:24 +01:00
per 3830e1ae77 Clean up interface between framework, ivis_opengl and main, reducing dependencies that go the wrong way. 
Removing unnecessary header file frameint.h
 2013-12-01 17:29:16 +01:00
vexed e37254f59e Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-11-20 20:42:09 -05:00
vexed fdd2524f1b Differentiate between maps and maps that have mods in them. Map-mods will now be shown in red on the lobby screen, and the map picker screen. It will show a red lamp next to the map if you join a game via IP or, you knowingly join a game that is hosting a map-mod. 2013-11-20 20:21:44 -05:00
vexed 8cff9973b9 Revert "map-mod fun" 
This reverts commit ac9afb2721.
(didn't mean to push this yet)
 2013-11-19 21:47:55 -05:00
vexed ac9afb2721 map-mod fun 2013-11-19 21:15:44 -05:00
vexed b4b019aa5a Merge branch 'bugfixes' 
Conflicts:
	src/init.cpp
	src/multiint.cpp
	src/power.cpp
 2013-11-19 22:18:46 -05:00
vexed 6e5e8bdd09 Fix false positive in the Coverity static analysis tool. 
The array will never be MAX_PLAYERS (11) and overrun it, since the loop goes
up to indexLen which is < MAX_PLAYERS.

This fixes a rash of asserts of 'Found no player position for player X' where
X is missing because of the false positive above, which cut the array short.

refs: cea585162d
 2013-11-18 21:56:28 -05:00
vexed fb1f90dd27 Keep a copy of our log filename that we use to work around an obscure bug(?) 
in compiler flags (windows (mingw) only).

Should now correctly show the log filename on crashes in the dialog.
 2013-11-18 21:54:48 -05:00
Cyp 35745a79a3 Fix build with C++11 and/or Qt. 
"blah"PRIu64 was interpreted as a string literal, and wzDelay was missing.
 2013-11-17 20:06:02 +01:00
per 143c5dafff Reinitialize AI data and player names each time frontend is reloaded. This closes ticket:3994. 2013-11-17 16:02:07 +01:00
per 6d34c718db When writing performance sampling data, respect the PHYSFS write dir. 
Patch by vexed, closes ticket:4098.
 2013-11-17 14:59:38 +01:00
per 491c1c3f4a Fix copy-paste bug introduced in de42fd3547 whereby 
saved effects would be erased. Closes ticket:4099. Closes ticket:4103.
 2013-11-17 14:40:10 +01:00
per dda1585f95 Fix various minor issues pointed out by Coverity scanner. 2013-11-07 00:17:07 +01:00
vexed b366d80ca5 Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-11-01 22:48:12 -04:00
vexed 1498b6c40e Reformat some messages to fit correctly in the console area. 
Don't retry UPnP configuration after it failed, and while still in the game lobby screen.
(You need to exit out of the game lobby screen to retry UPnP configuration.)
Remove UPnP entry in router on game quit.
 2013-11-01 22:09:42 -04:00
vexed 9c370f9896 Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-10-31 23:17:24 -04:00
vexed aac6622fa3 Add a wzDelay function to be used to delay things 2013-10-31 22:10:00 -04:00
vexed 4086e93c16 Portable Warzone fixes for windows. 
Fix windows paths.

Windows portable icon by forum member Duda.
Portable header & welcome images from forum member Aubergine.
Image fixes supplied by Berg.

Note: In configure stage (Windows only!), you can specify --enable-portable [default no] to
      create a portable installer. (That is, everything is self-contained in the directory
      you install Warzone 2100 to.  It will *not* use any other directory on the system.)
      If you pass --with-videos [default no], then it will add the videos with the portable
      installer and looks for the video file in \opt\sequences.wz

FIXME: Need: RUSSIAN, GERMAN, DUTCH, tranlations fixes for the warzone2100.nsi file.
(cherry picked from commit c1b29c1f5e)

Conflicts:
	src/Makefile.am
 2013-10-30 20:06:26 -04:00
vexed 2f217ab602 Merge branch 'bugfixes' 
Conflicts:
	src/multiint.cpp
 2013-10-27 21:15:49 -04:00
vexed 8f4adda206 Upgrade miniupnp to miniupnpc-1.8.20131007 *NOTE* mimiupnp source has been modified so we can compile it without errors! 
Fix UPnP so it actually works on windows & linux & most likely mac.
Add more information about UPnP progress in console.

closes ticket:4095
 2013-10-27 20:57:38 -04:00
vexed e482b58e7f fix flickering of trees (and some other objections) see 5ef1eff3ea for initial changes. 2013-10-27 19:20:02 -04:00
vexed 853179f2de Fix compile issue broken in 5f32c3eafe 2013-10-27 19:20:01 -04:00
vexed 77f37c0a0f Merge branch 'bugfixes' 
Conflicts:
	src/scriptfuncs.cpp
 2013-10-27 19:09:42 -04:00
per cea585162d Fixes for various bugs noticed by Coverity static analysis tool. 2013-10-21 22:04:27 +02:00
automerge 0428d5d14a Merge branch 'bugfixes' 2013-10-21 08:00:04 +02:00
cybersphinx 8c5d8d35ab Only check for OpenGL errors in debug builds. 
Might speed up rendering a bit.
 2013-10-20 13:57:15 +02:00
per de42fd3547 Fix saving of effects 2013-10-20 12:57:10 +02:00
Ivan Vasilov 9a2563de97 Minor fixes for bugs which can cause segfaults. 2013-10-14 00:08:25 +02:00
per 151a6a5084 Do not use texture compression on GUI images. Patch by zaaak@laposte.net. Closes ticket:4086 2013-10-13 23:27:44 +02:00
per 03175f3760 Add compatibility define for OpenGL timer query extension and older versions of GLEW. 2013-10-05 14:36:33 +02:00
per 87fb6c336a Do not clear accumulation buffers each frame (we do not use them). 2013-10-05 14:12:21 +02:00
per 5ef1eff3ea Add back alpha test for non-pre-multiplied mode PIE models for now. 
This closes ticket:4071
 2013-10-05 13:38:14 +02:00
per 5f32c3eafe Performance measurement hotkey added. Press ctrl+k in debug mode to grab a sample. 
On level exit, it writes a .csv file with your samples. Also, for each sample it
writes a screenshot with a custom filename, so you can match up the sample with a
picture of what you sampled. For analysing where we have graphics performance problems.
 2013-10-05 13:38:14 +02:00
vexed d13bc0de7d Simplify build process by getting rid of bison/flex dependencies. 
Fixes both MSVC and autotools (automake 1.12+).

Revert "Abort autogen.sh when automake 1.12+ is found."

This reverts commit 978ed8f1f9.
Should now work with automake 1.11+

fixes ticket:3887
fixes ticket:3538
closes ticket:3950

(cherry picked from commit 372eff6693)

Forgot to push these changes for commit 372eff6693

(cherry picked from commit e397b24d47)

Out of tree builds ?  Who needs them. :P

refs: 372eff6693
(cherry picked from commit 20317c2a6f)
 2013-09-21 00:14:02 +02:00
per b13f2fde02 Remove hard-coded UI box colours. Other misc cleanups forward ported from GUI work. 2013-09-14 22:26:42 +02:00