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
6f1666fde0
Terrain code should not use its own GL error function when we have a better one elsewhere.
2013-10-05 13:38:14 +02:00
035c7bf203
The WRF file directives TEXPAGE and TCMASK are no longer needed, and are now ignored.
...
Instead textures are pulled in as dependencies as needed. New qtscript function
replaceTexture() allows to explicitly replace one texture with another, and this is
used to reimplement base plates depending on tileset. The kevlar vest graphics
change in alpha campaign is not yet reimplemented, as more campaign script porting is
needed first.
2013-08-31 23:03:35 +02:00
2b82a1e379
Do not bother setting glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE)
...
repeatedly, since this is the default value, and we never set it to any other value.
2013-02-16 21:35:48 +01:00
6c6fe7c38a
Merge branch 'bugfixes'
...
Conflicts:
src/e3demo.cpp
src/e3demo.h
2013-01-16 15:44:22 -05:00
e34e7e4e0c
Seems time don't stop, so bump the year to 2013.
2013-01-16 15:34:57 -05:00
e48052ee83
Remove hard-coded restriction on number of texture pages that can be used.
2012-12-27 12:23:37 +01:00
fdf5138f49
Fix display of gateways on the map with ctrl+e in debug mode.
...
Add new qtscript function hackMarkTiles([label | x, y[, x2, y2]])
to mark areas on the map with a pulsing red colour. Call it without
parameters to clear all such marks.
2012-12-09 14:02:44 +01:00
8e83aee47e
Old map conversion fix 1: water fix, water no longer climbs cliffs.
2012-11-25 13:49:09 +01:00
4048c69be3
Old map conversion fix 1: water fix, water no longer climbs cliffs.
2012-08-10 21:01:02 +02:00
96272ebf50
Use OpenGL functions under extension names, if not present under regular names.
2012-06-16 23:25:49 +02:00
a7d2c06c28
Bring back to life old VBO hack for unlucky OpenGL 1.4 users, GLEW edition this time. Closes #3166 .
...
Removed some duplicated code for gfx info dump.
2012-02-17 01:39:12 +04:00
46d1e62c8e
Add a A_O_R to prevent crashing on null pointer
2012-02-11 16:51:18 -05:00
3e15039aa6
Unfortunately, the Project can't stop time, so bump the year.
2012-02-11 16:50:52 -05:00
9f497c6e1b
Revert "Use a grayscale texture for lightmap."
...
This reverts commit ee40d2147b
2011-12-01 00:51:40 +01:00
ee40d2147b
Use a grayscale texture for lightmap.
...
Patch reviewed by per.
2011-11-30 16:05:26 -05:00
2b928d2f29
Update lightmap even when game is paused.
...
Lightmap was updating every game tick, instead of up to once every 80ms of real time as was intended.
2011-11-25 10:23:42 +01:00
634076c243
Use iHypot(x,y) instead of iSqrt(x*x+y*y) in terrain.cpp.
2011-04-30 17:10:58 +00:00
d506c08cdc
Don't use offset player view structure.
...
Use world coordinates for mouse calculation (fixes variable mouse offset.)
Convert some gl calls to their pie_ equivalents.
2011-04-30 16:50:13 +00:00
86a92ed314
Rendering cleanup, by Safety0ff. Closes ticket 2664.
2011-04-25 12:30:30 +02:00
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
0fc0eeeb86
Fix optimized compile warnings. Remove unused GLee remains.
2011-04-25 00:32:57 +02:00
c130ed0cab
Add some comments to terrain renderer.
...
Closes #2349 .
2011-04-24 17:09:51 +00:00
2cb9d1e737
Fix glew cross compilation.
2011-04-20 16:28:41 +02:00
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
1fe2cc8f4d
Use GLEW instead of GLee. Based on patch by cybersphinx.
2011-04-02 10:08:26 +02:00
8ffb1379f3
Clear openGL error codes before entry into the routine, since it was giving fasle positives.
2011-03-24 20:07:11 -04:00
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
a7730ccd15
Change "typedef struct {...} Blah;" into "struct Blah {...};".
...
Removed a few structs due to disuse.
2011-02-25 21:30:13 +01:00
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
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
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
733ab6e911
Fix compilation with C++0x compilers.
...
Can't use nullptr, until switching to C++0x.
2011-02-15 14:28:08 +01:00
84740c4390
Reset color to white before rendering decals rather than after having changed it.
...
Fixes #2487 .
2011-02-13 15:21:41 -05:00
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
67e9635f9f
Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart.
2010-12-31 22:37:14 +01:00
91ee0f7655
Merge branch 'master' into qt
...
Conflicts:
lib/framework/frame.h
lib/framework/types.h
lib/widget/editbox.cpp
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-Debug.xcconfig
2010-12-21 03:59:22 +01:00
57d9a7dd6f
Add global using std::abs, in order to try to find and fix Windows-specific build errors.
...
Why can't certain compilers be standards-compliant?
(Why do people take the absolute value of something unsigned, anyway, even though it should be permitted.)
2010-12-20 01:46:19 +01:00
bd6b96315b
Merge branch 'cpp' into qtcpp
...
Conflicts:
lib/framework/Makefile.am
lib/framework/frame.cpp
lib/framework/framework.vcproj
lib/framework/input.cpp
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/textdraw.cpp
lib/widget/Makefile.am
lib/widget/editbox.cpp
lib/widget/scrap.cpp
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
src/Makefile.am
src/main.cpp
src/makefile.win32
2010-12-19 16:51:27 +01:00
c4ec4ffd2b
144 warnings on the wall, take some down, grind them to dust, 98 warnings on the wall.
2010-12-16 22:05:06 -05:00
3f6ecec025
Replace sqrt(x) with sqrt((double)x) to make broken compilers happy.
2010-12-16 23:28:57 +01:00
0646b37603
Rename *.c to *.cpp.
2010-12-16 23:28:56 +01:00
per
vexed
Per Inge Mathisen
haonoq
Cyp
iNoDlite
safety0ff
cybersphinx
Buginator
dak180