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

691 Commits (a0f13ff73ec35d51af3377063f1b7d7b424fd05e)

Author SHA1 Message Date
Per Inge Mathisen fb78afcdae Remove unused global loopTileCount 2011-12-02 14:29:21 +01:00
Cyp eab15fdbd4 Use glcMeasureString instead of glcMeasureCountedString to avoid excessive valgrind warnings. 
Triggered when typing unicode (and pressing Enter).
 2011-12-02 10:58:15 +01:00
Cyp a370b0b6a6 Simplify pie_DrawShadow(), and make it more efficient. 2011-11-27 13:44:35 +01:00
Cyp 2f816f5bf4 Re-add and fix up fallback for 1.4 ≤ OpenGL < 2.0. 
Patch by some linear combination of safety0ff, cybersphinx and Cyp.
 2011-11-26 19:48:04 +01:00
safety0ff 454c86348e pie_SetTexturePage is implemented for 1 texture unit, don't use it to bind textures to other ones. 2011-11-25 16:51:55 -05:00
Cyp a63604fd15 power: Display power needed to start production in interface. 2011-11-07 21:10:37 +01:00
Cyp f4dba73b0c Add ETA to production and research progress bars. 
Should make it easier to answer, when people ask you “How long until ripples are ready?”.

Clarity-enhancing suggestions by cybersphinx.
 2011-10-30 16:32:10 +01:00
cybersphinx 73c1d98637 Make texture compression optional. 
Two variants:

1. Use the --notexturecompression command line option.

2. Put "notexturecompression=1" into the config file. Can be overridden
with the --texturecompression command line option.

Closes #2864.
 2011-10-30 14:41:10 +01:00
Per Inge Mathisen c0fec82d43 Slight cleanup of fog setting code 2011-10-16 20:01:30 -04:00
Per Inge Mathisen 55a6259b12 Add support for ECM jammers. ECM jammers will significantly shorten the range 
of vision of enemy units and buildings. Not enabled by default. This simplifies
the vision code, merging terrain discovery and object vision, fixing ticket:2917
in the process. Closes ticket:340. Radar detector changed, no longer does
targetting, but allows discovery over 5x longer range instead, and can discover
ECM emissions.
 2011-10-16 15:01:58 -04:00
Per Inge Mathisen 13be294b85 Increase the max number of textures in the game from 128 to 255, as requested by our esteemed artists. 2011-10-13 00:09:51 -04:00
cybersphinx 2dbd06e9b1 Get rid of the unmaintained makefile.win32s. 
Closes #2900.
 2011-09-25 19:58:13 +02:00
Per Inge Mathisen b6112ae391 Remove some unused code 2011-09-03 21:26:20 -04:00
Cyp 86c9451525 Show planned structure blueprints to allies. 2011-09-02 18:35:01 +02:00
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