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

..

glsl

Use specular texture RGB as specular reflectance, multiplied by per-material value.

2013-05-03 00:32:59 -07:00

tr_animation.c

Remove RAVENMD4 #define

2013-03-18 19:05:51 +00:00

tr_backend.c

#5889: Do post-processing only on viewport portion of frame buffer.

2013-04-26 18:49:48 -07:00

tr_bsp.c

Don't scale shadow multipliers by overbrightbits, and improve documentation.

2013-04-22 21:52:16 -07:00

tr_cmds.c

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_curve.c

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_extensions.c

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_extramath.c

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_extramath.h

Simplify RE_StretchRaw() with RE_UploadCinematic() and RB_InstantQuad2().

2013-03-06 00:54:56 -08:00

tr_extratypes.h

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_fbo.c

Make all GLSL shaders use the same set of uniforms.

2013-03-20 22:53:30 -07:00

tr_fbo.h

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_flares.c

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_glsl.c

Fix zone memory leak in OpenGL2 renderer

2013-04-10 23:21:40 -05:00

tr_image.c

Fix some of the things clang --analyze flagged

2013-03-26 16:50:03 +00:00

tr_init.c

Merge branch 'master' into sdl2

2013-05-08 14:27:15 +01:00

tr_light.c

Merge branch 'HEAD' of https://github.com/ioquake/ioq3.git into suntest

2013-03-25 21:05:27 -07:00

tr_local.h

Merge branch 'master' into sdl2

2013-05-08 14:27:15 +01:00

tr_main.c

Fix some of the things clang --analyze flagged

2013-03-26 16:50:03 +00:00

tr_marks.c

Fix some of the things clang --analyze flagged

2013-03-26 16:50:03 +00:00

tr_mesh.c

Remove RAVENMD4 #define

2013-03-18 19:05:51 +00:00

tr_model_iqm.c

Show surface names in excessive vertexes and triangles warnings

2013-05-03 14:28:18 -05:00

tr_model.c

Show surface names in excessive vertexes and triangles warnings

2013-05-03 14:28:18 -05:00

tr_postprocess.c

#5889: Do post-processing only on viewport portion of frame buffer.

2013-04-26 18:49:48 -07:00

tr_postprocess.h

#5889: Do post-processing only on viewport portion of frame buffer.

2013-04-26 18:49:48 -07:00

tr_scene.c

Don't scale shadow multipliers by overbrightbits, and improve documentation.

2013-04-22 21:52:16 -07:00

tr_shade_calc.c

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_shade.c

Add sunlight/lightmap merging by multiply (r_sunlightMode 1)

2013-04-02 00:17:24 -07:00

tr_shader.c

Don't scale shadow multipliers by overbrightbits, and improve documentation.

2013-04-22 21:52:16 -07:00

tr_shadows.c

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_sky.c

Make all GLSL shaders use the same set of uniforms.

2013-03-20 22:53:30 -07:00

tr_subs.c

renderer -> renderergl1, rend2 -> renderergl2

2013-02-15 23:46:37 +00:00

tr_surface.c

Make all GLSL shaders use the same set of uniforms.

2013-03-20 22:53:30 -07:00

tr_vbo.c

Remove a few name tags

2013-02-16 21:03:56 +00:00

tr_world.c

Fix some of the things clang --analyze flagged

2013-03-26 16:50:03 +00:00