Tim Angus
bde7665462
Merge branch 'master' into sdl2
...
Conflicts:
code/sdl/sdl_input.c
2013-08-16 23:34:08 +01:00
Ensiform
53bbfc2cd6
Remove unused renderCommandList variable from renderers
2013-05-13 12:08:16 -05:00
Tim Angus
d9d52f0306
Merge branch 'master' into sdl2
...
Conflicts:
Makefile
code/renderercommon/qgl.h
code/renderergl1/tr_local.h
code/sdl/sdl_glimp.c
2013-05-08 14:27:15 +01:00
SmileTheory
8270d54a25
Don't scale shadow multipliers by overbrightbits, and improve documentation.
2013-04-22 21:52:16 -07:00
SmileTheory
28e14c4546
Add sunlight/lightmap merging by multiply (r_sunlightMode 1)
...
Merge additive sunlight and map lighting into one GLSL shader (r_sunlightMode 2)
Change single lightmap blends to use lightall
2013-04-02 00:17:24 -07:00
SmileTheory
66acde6d60
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
2013-03-25 21:05:27 -07:00
Zachary Slater
01efc26654
s/enum/typedef enum/g on uniform_t for glorious fix of mac build. h/t MAN-AT-ARMS
2013-03-25 14:28:01 -07:00
SmileTheory
8b23985358
Make all GLSL shaders use the same set of uniforms.
2013-03-20 22:53:30 -07:00
Tim Angus
ecd50f01c2
Remove RAVENMD4 #define
2013-03-18 19:05:51 +00:00
Tim Angus
bf25c27105
Oops missed a bit
2013-03-12 21:20:33 +00:00
Tim Angus
3e92679100
Fix USE_FREETYPE breakage
2013-03-12 19:41:52 +00:00
Tim Angus
37c69a8009
Move renderers a bit closer together
2013-03-12 17:52:29 +00:00
Zack Middleton
8aa6efe7b6
Fix origin returned by IQM's LerpTag
...
It use to return pose joint's offset from base at the lerped frame, now it returns the joint's origin at the lerped frame.
Patch by Axel Isouard and Zack Middleton.
2013-03-08 13:47:16 -06:00
Zack Middleton
c7059fbf28
Move noise function declations to tr_common.h
...
tr_noise.c is in renderercommon directory, so declare them in header there too.
2013-02-27 15:35:02 -06:00
Tim Angus
d201443350
Remove a few name tags
2013-02-16 21:03:56 +00:00
Tim Angus
2da0fd6de8
Add renderercommon/tr_common.h
2013-02-16 20:58:04 +00:00
Tim Angus
f6fb9eb602
renderer -> renderergl1, rend2 -> renderergl2
2013-02-15 23:46:37 +00:00