09c023a2d0
Actually remove GLee files.
2011-04-03 12:39:44 +02:00
1fe2cc8f4d
Use GLEW instead of GLee. Based on patch by cybersphinx.
2011-04-02 10:08:26 +02:00
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
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
ccab8415fa
Add team-coloured blitting functions.
2011-03-18 19:18:48 +01:00
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
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
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
ad1fcb0c99
Remove some surviving “extern "C"”.
2011-03-13 10:30:13 +01:00
cc150fc2f7
Exit if shaders are not supported, and revert "Hack in the team colour when shaders aren't supported."
...
This reverts commit e0617af5e6
2011-02-25 23:01:03 +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
e0617af5e6
Hack in the team colour when shaders aren't supported.
...
Ugly, but better than nothing.
2011-02-20 22:10:12 +01:00
48ff5e55d2
Fix 2 cpp check warnings reported by pabs3.
2011-02-18 15:54:39 +01:00
d39112244b
Merge remote branch 'origin/master' into qt
...
Conflicts:
lib/framework/frame.h
src/main.cpp
2011-01-22 23:05:36 +01:00
4fb9e61548
Remove unused TEXT_DISPLAY, improve format string consistency and remove weird casts.
2011-01-18 00:20:04 +01: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
a3e5ea7276
Reduce dependence on MAX_PLAYERS == 8.
2011-01-13 15:58:46 +01:00
4ececd8e49
Fix a plethora of issues for MSVC builds
...
Rename MERGECOPY to MERGECOPYSYNC to prevent clobbering of a windows function named that.
2011-01-01 13:46:12 -05:00
53242e1571
Remove some unused legacy code from the old terrain renderer and TERRAIN_VERTEX.
2011-01-01 16:29:49 +01:00
7bd5723715
Remove the unused specular parameter to pie_Draw3DShape. It was always WZCOL_BLACK.
2011-01-01 12:58:14 +01:00
724cd69882
Define the default fog colour in the palette file instead of hard-coded.
2010-12-31 23:42:21 +01:00
e27ac240be
Inline pie_SetTranslucencyMode() and remove the entirely superfluous TRANSLUCENCY_MODE abstraction.
2010-12-31 23:02:20 +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
1c0af54edf
Merge the two variants of piestate.cpp; it too confusing to keep two files with the same name doing almost the same thing.
2010-12-31 22:18:45 +01:00
2e6332ca8c
Slight optimization: Now we draw the entire model within the same glBegin .. glEnd pair.
2010-12-31 18:59:41 +01:00
88fe0bcb2e
Remove support for non-triangle polygons in model files.
2010-12-31 18:22:22 +01:00
aafe14fbc2
Add separate shader for models rendered for buttons to remove lighting effects from those.
...
Add support for per-pixel lighting. Patch reviewed by SafetyOff.
2010-12-28 23:35:57 +01:00
af59954767
Do not spend value resources shading the backsides of polygons or setting irrelevant GL states.
2010-12-27 16:53:13 +01:00
f5ea79ed3c
Enable OpenGL lighting controlled through the vertex shader. Added two new script functions setSunPosition an setSunIntensity.
...
Added a new PIE file directive MATERIALS that sets material properties for a mesh level. Original patch reviewed by SafetyOff.
2010-12-26 22:12:53 +01:00
309398dd1d
Make Vectors fun to use. Instead of Vector2f_Sub(Vector2f_Mul(myVector, myScalar), myOtherVector), write myVector*myScalar + MyOtherVector.
...
Reviewed by Safety0ff.
2010-12-21 22:35:37 +01:00
0a064c2470
Fix GLee.cpp → GLee.c in Linux and Windows build scripts.
...
And LPTCSTR → LPCTSTR in some Windows file, apparently LPTCSTR wasn't similar enough for it to compile, closes ticket:2428.
2010-12-21 22:13:25 +01:00
760d19f776
Change Glee back to c; eliminates warnings in the mac build.
2010-12-21 15:18:18 -05:00
22285a7528
Change Glee back to c; eliminates warnings in the mac build.
2010-12-21 12:30:41 -05: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
80cc971b61
Merge remote branch 'origin/master' into qt
...
Fixed gameTime → realTime in lib/framework/wzapp.cpp, since the menus were messed up due to interpreting everything as a double-click.
Conflicts:
lib/framework/debug.c
lib/framework/input.c (became wzapp.cpp)
lib/ivis_opengl/screen.c
lib/ivis_opengl/screen.h
lib/ivis_opengl/textdraw.c
macosx/Warzone.xcodeproj/project.pbxproj (used qt version)
src/display.c
src/main.cpp
src/terrain.c
2010-12-17 00:36:10 +01:00
0646b37603
Rename *.c to *.cpp.
2010-12-16 23:28:56 +01:00
a2cd7b0592
Make everything compile successfully with g++, without -fpermissive.
2010-12-16 23:24:40 +01:00
2bcb709cf4
Move broken dependency hack out of most Makefile.am's, except the for the root.
2010-12-16 23:14:38 +01:00
b1495d43b6
Trap the ASCII_NEWLINE to only work in non MP games, to prevent abuse.
2010-12-09 00:52:44 -05:00
c687c16ee9
Tell people they will see glitches, instead of thinking that they have selective
...
color blindness for units / structures and don't have a openGL 2.0 card.
2010-12-07 20:17:50 -05:00
ac6b928ad7
Fix map preview screen redrawing, broken in f2ae61805c
...
Add entries to palette.txt for the new colors used in map preview.
Draw location of oil features.
Changelog: Enhance map preview to show oil locations.
2010-12-06 21:14:06 -05:00
50aafb279e
Don't try to render a string that is NULL. Unknown why this happens, need someone that has access to non-English systems to debug this matter more.
...
refs ticket:2209
refs tickts:2245
(cherry picked from commit b6952c184456b999fb4dfd51ced072ca1b206740)
Conflicts:
lib/ivis_opengl/textdraw.c
2010-12-06 21:13:42 -05:00
4f85821bab
Cache texture coordinate calculation on game start instead of doing them each frame. Do defensive structure stretching in the vertex shader. See ticket:2310
2010-12-05 16:17:26 +01:00
7de25a9d5b
Lay the groundwork for a more modern component drawing system. Removes support for OpenGL 1.x. See ticket:2310
2010-12-04 15:57:26 +01:00
ae6b76dda5
Fix for ivis state desync, fixes menu colour bug noticed by vexed.
2010-11-22 01:02:11 -05:00
7e872312b8
Fix opengl state clobbering, optimize terrain rendering a little.
2010-11-22 00:05:42 -05:00
Per Inge Mathisen
Buginator
Cyp
abomination
dak180
safety0ff