gzdoom/src/r_data
Randy Heit b3b0886b64 Merge branch 'scripting'
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
2016-02-04 15:17:22 -06: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 what appears to be a debug breakpoint. 2016-01-23 19:36:13 -05:00
r_interpolate.h - fixed: Interpolations were deleted too early. 2016-01-21 11:58:44 +01:00
r_translate.cpp - create a separate translation table for Heretic's rain pillar. 2016-02-01 10:45:33 +01:00
r_translate.h - create a separate translation table for Heretic's rain pillar. 2016-02-01 10:45:33 +01: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