gzdoom/src/r_data
Christoph Oelckers 792cad89b3 Merge commit '3849cb86231ce24131a86e9c29795a8cf3706a3d' into scripting
Conflicts:
	src/g_hexen/a_clericstaff.cpp
	src/g_hexen/a_hexenspecialdecs.cpp
	src/p_acs.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_expression.cpp

(Scripting branch update part 4)
2015-04-28 11:59:33 +02:00
..
colormaps.cpp fixed: if we allow long names for the fade table we must also check for them when the colormap gets loaded. 2014-05-13 11:39:25 +02:00
colormaps.h Remove warnings warned by Clang 2015-03-08 17:21:15 -05:00
r_interpolate.cpp - removed all asserts from the interpolation objects' Destroy methods. The condition will not be true after a failed savegame write occured. 2011-07-15 13:26:36 +00:00
r_interpolate.h
r_translate.cpp - Switched to a genericly extensible representation for userinfo. 2013-05-12 18:27:03 +00:00
r_translate.h - Changed FRemapTable::AddDesaturation() to take doubles as parameters, since the C ABI always 2012-09-19 01:45:00 +00:00
renderstyle.cpp - added new renderstyles AddStencil and AddShaded. 2014-05-13 21:16:06 +02:00
renderstyle.h - added new renderstyles AddStencil and AddShaded. 2014-05-13 21:16:06 +02:00
sprites.cpp Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00
sprites.h - fixed some leftover references to the software renderer. 2011-07-07 19:53:42 +00:00
voxels.cpp - Added Gez's OverridePalette VOXELDEF flag. 2013-06-01 02:09:09 +00:00
voxels.h - Added Gez's OverridePalette VOXELDEF flag. 2013-06-01 02:09:09 +00:00