Randy Heit 2d87eb0ba2 Merge branch 'master' into gonesolong ... Conflicts: src/CMakeLists.txt src/actor.h src/g_heretic/a_hereticmisc.cpp src/g_heretic/a_hereticweaps.cpp src/g_heretic/a_ironlich.cpp src/info.h src/namedef.h src/p_buildmap.cpp src/p_enemy.cpp src/p_map.cpp src/p_mobj.cpp src/thingdef/thingdef_codeptr.cpp zdoom.vcproj		2014-12-20 19:13:14 -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	- separation of software renderer from the rest of the code complete. All external access to the renderer is routed through the FRenderer interface class now, with two exceptions (2D texture drawing to a canvas and polymost testing code) that are handled by #defines.	2011-07-07 15:37:47 +00: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	- moved r_interpolate.cpp and r_translate.cpp to r_data.	2011-07-06 08:50:15 +00:00
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