Starting sunlight experimentation branch
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
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
Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	code/renderergl2/tr_shade.c
Fix and improve GetWaterFog

It was broken in opengl1 (always returned earily if world was loaded).
Actually check all brush surfaces (not just the first surface multiple times).
Always set values even if map has no water fog.
Update com_renderer at vid_restart

This is what happens in ioq3, I broke it when moving renderer init to common.
Use global fog if underwater and no water fog at view point

Always check for water fog, even if underwater flag isn't set. Water fog might be better described as view fog.
Rename water fog to view fog

waterfogvars is still supported in shaders, for RTCW/ET compatibility.
Add "lightmap" shader stage keyword to OpenGL2 renderer

This is a direct copy of code in the OpenGL1 renderer, ported from ET.
Don't enable Theora in Code::Blocks engine project

It's disabled in Makefile by default
Merge remote-tracking branch 'spearmint/master'