Zack Middleton
e45538b1c5
Merge branch 'master' into game/eliteforce
...
Conflicts:
README.md
code/server/sv_client.c
2018-03-03 19:27:28 -06:00
Edward Betts
fe42b8653d
Correct spelling mistakes.
2017-11-22 01:40:20 -06:00
Zack Middleton
4837f4619e
Merge branch 'master' into game/eliteforce
...
Conflicts:
code/client/cl_main.c
code/qcommon/common.c
code/qcommon/files.c
code/qcommon/msg.c
code/qcommon/q_shared.h
code/renderercommon/tr_common.h
code/renderergl2/tr_extensions.c
code/sdl/sdl_glimp.c
2017-09-17 23:16:55 -05:00
Zack Middleton
4dffc52c1d
Add warnings for animMap and videoMap shader keywords
2017-07-02 17:00:07 -05:00
Zack Middleton
6b9a3a47db
Merge branch 'master' into game/eliteforce
...
Conflicts:
code/renderergl1/tr_main.c
code/renderergl2/tr_main.c
2015-07-09 18:42:11 -05:00
Zack Middleton
5e575ae82e
Apply greyscaling to fog blocks
2015-07-04 19:17:58 -05:00
Zack Middleton
956bea9cda
Merge branch 'master' into game/eliteforce
2015-03-23 23:54:32 -05:00
Ensiform
43c7f1e734
Inform how many shader stages the max is in the warning message
2015-01-26 02:39:59 -06:00
Zack Middleton
b7cd6b6088
Elite Force white space clean up
...
Also fixed some code to match ioq3 (a few comments, a printf, ..).
2014-10-29 10:13:12 -05:00
Zack Middleton
c6e5f060fe
Port Elite Force iorev2231 patch to latest ioq3
...
Port Thilo Schulz's Elite Force Holomatch patch to latest ioq3.
Patch for ioq3 svn r2231.
No support for OpenGL2 renderer yet.
2014-10-29 07:15:12 -05:00
Zack Middleton
a955d975b7
Add function for clearing global shader instead of duplicating the code
2014-09-27 01:35:35 -05:00
Tim Angus
621a72e698
Fix a few warnings
2014-08-30 17:29:23 +01:00
Zack Middleton
e5f54c584a
Fix incorrect rgbGen const reading uninitialized memory
...
If ParseVector fails, color isn't fully set.
2014-08-27 20:35:16 -05:00
Zack Middleton
eeeaf3f125
Fix potential buffer overflow caused by long tcMod args
...
Found by Coverity.
2014-05-25 18:44:17 -05:00
Zack Middleton
63d1911c18
Parse q3map_sunExt in OpenGL1 too
...
Used for drawing sun, which is supported by both OpenGL1 and OpenGL2.
OpenGL2 already parses it.
2014-03-11 12:38:53 -05:00
Zack Middleton
07290a7d52
Fix typo in animMap and videoMap warnings
2014-03-10 19:58:55 -05:00
Zack Middleton
d4f785c465
Improve warning for shader missing opening brace
2013-06-02 21:59:01 -05:00
Zack Middleton
3ec2b02dce
Check for shaders without closing brace
...
Shaders without closing brace can eat shaders in other files.
Pass depth to SkipBracedSection instead of reparsing text as it messed up parse line numbers.
2013-06-02 21:55:19 -05:00
Zack Middleton
eb73dcb7f4
Catch more bad shader syntax cases
...
Use to only ignore file in cases where both { and \0 were missing after shader name. Now ignore file when either are missing, such as "}\0".
2013-05-30 22:58:58 -05:00
/dev/humancontroller
9e9d6fa52c
clean up return statements a bit more
2013-05-30 15:43:21 -05:00
Tim Angus
98360bcd57
Fix some of the things clang --analyze flagged
2013-03-26 16:50:03 +00:00
SmileTheory
9eef320c91
Remove some more automatic sRGB image flags.
2013-03-12 22:00:51 -07:00
Tim Angus
37c69a8009
Move renderers a bit closer together
2013-03-12 17:52:29 +00:00
Tim Angus
f6fb9eb602
renderer -> renderergl1, rend2 -> renderergl2
2013-02-15 23:46:37 +00:00
