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

677 Commits (f2e506e6ddef07375562a29df72f7c9c35331110)

Author SHA1 Message Date
vexed 8b8d2b676a Bring back scaled fonts as were in commit b3c2fabf16 
re: commit ebc8976dc1
 2011-07-17 14:53:47 -04:00
dak180 9357171481 Bring back QuesoGLC for the mac builds. 
X11 (Apple's official version for 10.6) is not required to be installed to run the game.

Refs #2824.
 2011-07-17 14:10:27 -04:00
vexed ebc8976dc1 Bring back quesoGLC to Warzone. 
This renders the text much faster than what Qt offers, and also fixes issues with Vsync being ON, on windows.

patch fixes by Safety0ff

closes ticket:2824

This patch basically reverts:
828c0f72ae
Revert 9e29aa5210 which reverted the removal of QuesoGLC, to start
    working on fixing the font rendering with Qt.

NOTE: On some systems, there is a assertion failure with FcFini().
We could fix the issue by doing a embed of quesoGLC in our repo, or hope the fontconfig
guys fix the issue upstream.
See ticket:2824 for more discussion on this issue.
 2011-07-17 13:15:15 -04:00
Rene Jochum d51379938d Remove old cursor code. Refs #2823. 2011-07-14 23:10:35 +02:00
Buginator be2c105b7a Update build for Release builds & using STLport. 
Update release builds to SSE2 + STLport.
 2011-06-25 19:48:46 -04:00
safety0ff c4539a463e Remove now unused functions to prevent future misuse. 
Graphics functions should not be used for deterministic code.
 2011-06-12 17:33:13 +00:00
Per Inge Mathisen 10249e5095 Fix int overflow in radar blip drawing. Closes ticket:2731, reviewed by Safety0ff. 2011-05-22 14:37:53 +02:00
Per Inge Mathisen 8aca9437a4 Add support for normal map loading. (Note that normal map rendering is still not supported by shaders.) Patch reviewed by Safety0ff. 2011-05-22 13:59:30 +02:00
cybersphinx b3c2fabf16 Scale the video subtitle font with the resolution used. 2011-05-13 22:55:17 +02:00
Buginator 199a6d3c27 Move GLEW out of the project, and put it into the dev-package instead. 2011-05-02 20:02:12 -04:00
Buginator ce10843e02 Add a FSAA menu option. 
NOTE: It is impossible to tell what the max level the card (drivers) supports,
without actually testing for said level.
 2011-04-26 22:41:49 -04:00
cybersphinx 4c68d121d6 Don't uselessly include static libraries in other static libraries. 
Saves ~40 MB of diskspace when building.
 2011-04-25 21:33:53 +02:00
Per Inge Mathisen 86a92ed314 Rendering cleanup, by Safety0ff. Closes ticket 2664. 2011-04-25 12:30:30 +02:00
Per Inge Mathisen 3f8cecb841 Merge branch 'master' into qt 
Conflicts:
	configure.ac
	lib/ivis_opengl/Makefile.am
	lib/ivis_opengl/glew/glew.vcxproj
	lib/ivis_opengl/glew/glew.vcxproj.filters
	lib/ivis_opengl/piedraw.cpp
	lib/ivis_opengl/piemode.cpp
	lib/ivis_opengl/piestate.cpp
	lib/ivis_opengl/screen.cpp
	lib/ivis_opengl/tex.cpp
	lib/sequence/Makefile.am
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Glew-All.xcconfig
	macosx/configs/QuesoGLC-All.xcconfig
	macosx/configs/Warzone-All.xcconfig
	src/Makefile.am
	src/texture.cpp
	win32/libs/Makefile
	win32/libs/glew/Makefile
	win32/libs/glew/patches/glew_pkgconfig.diff
 2011-04-25 00:51:13 +02:00
Per Inge Mathisen bbf4cb0587 qt branch: Rewrite config file handling to use WzConfig. Also removes unused option to disable 
coloured mouse cursors, and the old "registry" code. Qt virtual physfs filesytem initialization
move to the main function, since it is now needed earlier.
 2011-04-21 12:58:51 +02:00
safety0ff 45c61b0b54 Only check for OpenGL 4 support if GLEW supports it. 2011-04-21 00:56:08 +00:00
cybersphinx 4f0296e801 Remove redundant info from the crashdumps. 2011-04-20 17:15:40 +02:00
Buginator bd28224a27 Partial revert of 1fe2cc8f4d 
Use Glew's macros to check if the function is supported or not.
(cherry picked from commit 3f96f2e323)
 2011-04-20 17:11:20 +02:00
cybersphinx f312fd3e7d Demote GLEW version message to LOG_3D/crashdumps. 
Also remove a few spaces before colons.
 2011-04-20 17:11:04 +02:00
Per Inge Mathisen 777d50cd59 Remove more GLee related files 2011-04-20 16:44:10 +02:00
safety0ff be2feff7aa Remove redundant glu.h inclusions (taken care of by framework/opengl.h -> GL/glew.h -> glu.h). 2011-04-20 16:28:41 +02:00
safety0ff 2cb9d1e737 Fix glew cross compilation. 2011-04-20 16:28:41 +02:00
cybersphinx c80e14ca35 Use glew instead of GLee. 
Not sure if 1.5.4 is actually the minimal version we need.

Conflicts:

	configure.ac
	lib/ivis_common/tex.h
	lib/ivis_opengl/pieblitfunc.c
	lib/ivis_opengl/piefunc.c
	lib/ivis_opengl/piematrix.c
	lib/ivis_opengl/screen.c
 2011-04-20 16:28:41 +02:00
cybersphinx 3481d2e0f6 Rip out our integrated GLee copy. 
Conflicts:

	po/update-po.sh
	src/display3d.c
 2011-04-20 16:28:41 +02:00
Per Inge Mathisen dda501bf13 Merge remote branch 'origin/master' into qt 
Conflicts:
	data/base/script/text/cam1a.slo
	lib/exceptionhandler/exceptionhandler.vcxproj
	lib/exceptionhandler/exchndl.h
	lib/framework/framework.vcxproj
	lib/gamelib/gamelib.vcxproj
	lib/iniparser/iniparser.vcxproj
	lib/ivis_opengl/ivis_common.vcproj
	lib/ivis_opengl/ivis_opengl.vcxproj
	lib/netplay/netplay.vcxproj
	lib/script/script.vcxproj
	lib/sequence/sequence.vcxproj
	lib/sound/sound.vcxproj
	lib/widget/widget.vcxproj
	macosx/README.BUILD.txt
	macosx/Warzone.xcodeproj/project.pbxproj
	src/Warzone2100.vcxproj
	src/main.cpp
 2011-04-17 23:17:24 +02:00
Per Inge Mathisen 68b940da82 A bit early to check for OpenGL 4.x already, don't you think? Breaks with earlier versions of GLEW. 2011-04-17 22:10:42 +02:00
Buginator 3f96f2e323 Partial revert of 1fe2cc8f4d 
Use Glew's macros to check if the function is supported or not.
 2011-04-17 15:45:44 -04:00
Buginator 0af6d3fcef Fix VS2k10 files for Qt 2011-04-17 15:42:14 -04:00
cybersphinx 8f2ac8e0c8 Demote GLEW version message to LOG_3D/crashdumps. 
Also remove a few spaces before colons.
 2011-04-10 22:56:11 +02:00
Per Inge Mathisen 09c023a2d0 Actually remove GLee files. 2011-04-03 12:39:44 +02:00
Per Inge Mathisen 1fe2cc8f4d Use GLEW instead of GLee. Based on patch by cybersphinx. 2011-04-02 10:08:26 +02:00
Buginator 84e4bf40cf Cleanup VS2k10 project files 2011-03-31 19:14:18 -04:00
Buginator f431fc08c7 Remove a file that wasn't in the project's frustum. 2011-03-26 00:48:32 -04:00
Buginator 1f5d94a564 Fix VS2k10 for Qt. 
NOTE: All Qt headers *MUST* be before of the other headers, or else we get tons of conflicts
***
DO NOT CHANGE HEADER ORDER, unless you know what you are doing, it will fubar
other build systems!
****
close ticket:2570
 2011-03-24 20:06:59 -04:00
Cyp 23f318fe39 Merge branch 'master' into qt 
Conflicts:
	lib/exceptionhandler/exceptionhandler.vcproj
	lib/framework/frame.h
	lib/framework/framework.vcproj
	lib/framework/input.h
	lib/gamelib/gamelib.vcproj
	lib/iniparser/iniparser.vcproj
	lib/ivis_opengl/ivis_opengl.vcproj
	lib/netplay/netplay.vcproj
	lib/script/script.vcproj
	lib/sequence/sequence.vcproj
	lib/sound/sound.vcproj
	lib/widget/widget.vcproj
	macosx/Warzone.xcodeproj/project.pbxproj (resolved in favour of qt)
	src/Makefile.am
	win32/Warzone2100.vcproj
 2011-03-22 00:01:28 +01:00
Cyp ccab8415fa Add team-coloured blitting functions. 2011-03-18 19:18:48 +01:00
Buginator 5cfd2e9dbe Initial VS2k10 changes. 
VS2k5 (no longer supported with platform SDK)& VS2k8 are NOT supported anymore.
Redo other aspects as well in preparation of moving libs out of the main codebase.
NOTE: You *must* have msysgit installed, and it should be in your system path,
or you can modify the local property sheet to point to it.
This is needed to generate the autorevision.h file, (that fix is next)
 2011-03-17 21:35:00 -04:00
Cyp e689ad51d5 Merge remote branch 'origin/master' into qt 
Conflicts:
	configure.ac
	lib/exceptionhandler/exceptionhandler.h
	lib/framework/SDL_framerate.h
	lib/framework/cursors.h
	lib/framework/input.cpp
	lib/framework/input.h
	lib/ivis_opengl/pieclip.h
	lib/ivis_opengl/screen.cpp
	macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
	src/console.cpp
	src/console.h
	src/frontend.cpp
	win32/libs/Makefile
and src/Makefile.am (resolved by Safety0ff)
 2011-03-13 22:31:19 +01:00
abomination a72c41aeec fix [s]BOOL[/s] bool by 4B0/\/\1|\|4710|\| 
[Edit by Cyp: Removed a "typedef int bool;" when building on non-windows.]
 2011-03-13 12:32:24 +01:00
Cyp ad1fcb0c99 Remove some surviving “extern "C"”. 2011-03-13 10:30:13 +01:00
Cyp cc150fc2f7 Exit if shaders are not supported, and revert "Hack in the team colour when shaders aren't supported." 
This reverts commit e0617af5e6.

If you are building from source, and you cannot upgrade your graphics drivers, you can revert this revert, and the game may be playable for now.
 2011-02-25 23:01:03 +01:00
Cyp a7730ccd15 Change "typedef struct {...} Blah;" into "struct Blah {...};". 
Removed a few structs due to disuse.
 2011-02-25 21:30:13 +01:00
Cyp dc4cf90ce5 Merge branch 'master' into qt 
Conflicts:
	lib/framework/input.cpp
	lib/ivis_opengl/screen.cpp
	lib/ivis_opengl/screen.h
	lib/widget/scrap.cpp
	lib/widget/scrap.h
	macosx/Warzone.xcodeproj/project.pbxproj
	src/multiint.cpp
 2011-02-25 18:59:41 +01:00
Cyp 4a1b5fb543 Bump year. 
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
 2011-02-25 18:50:54 +01:00
Cyp ae2ce18314 Bump year. 
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
 2011-02-25 18:45:27 +01:00
Cyp e0617af5e6 Hack in the team colour when shaders aren't supported. 
Ugly, but better than nothing.
 2011-02-20 22:10:12 +01:00
Per Inge Mathisen 48ff5e55d2 Fix 2 cpp check warnings reported by pabs3. 2011-02-18 15:54:39 +01:00
Cyp d39112244b Merge remote branch 'origin/master' into qt 
Conflicts:
	lib/framework/frame.h
	src/main.cpp
 2011-01-22 23:05:36 +01:00
Cyp 4fb9e61548 Remove unused TEXT_DISPLAY, improve format string consistency and remove weird casts. 2011-01-18 00:20:04 +01:00
Cyp 28f9830a63 Merge remote branch 'origin/master' into qt 
Conflicts:
	lib/framework/SDL_framerate.h
	lib/framework/cursors.h
	lib/framework/input.h
	lib/ivis_common/Makefile.am
	lib/ivis_common/piestate.cpp
	lib/ivis_common/pietypes.h
	lib/ivis_opengl/imd.h
	lib/ivis_opengl/piestate.cpp
	lib/ivis_opengl/piestate.h
	lib/ivis_opengl/pietypes.h
	lib/sound/audio.h
	lib/sound/sound.vcproj
	lib/sound/track.h
	lib/widget/editbox.cpp
	lib/widget/scrap.h
	macosx/Warzone.xcodeproj/project.pbxproj
	macosx/configs/Warzone-All.xcconfig
	src/Makefile.am
 2011-01-14 19:26:55 +01:00