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

19 Commits (a22282c755a0797dcde88acad71fd9a312434675)

Author SHA1 Message Date
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
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
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
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 1fe2cc8f4d Use GLEW instead of GLee. Based on patch by cybersphinx. 2011-04-02 10:08:26 +02: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 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 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 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
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
Per Inge Mathisen 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
Per Inge Mathisen 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
Cyp 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
Cyp 0646b37603 Rename *.c to *.cpp. 2010-12-16 23:28:56 +01:00