Magnus Norddahl 1d941c9839 Merge remote-tracking branch 'gzdoom/master' into qzdoom ... # Conflicts: # src/r_plane.cpp # src/win32/zdoom.rc		2017-01-13 13:21:10 +01:00
..
colormaps.cpp	- fixed: Crashing when using the "restart" ccmd	2016-10-21 19:26:05 -04:00
colormaps.h	Merge https://github.com/coelckers/gzdoom	2016-12-28 21:16:14 -05:00
r_interpolate.cpp	- split DObject::Destroy into the main method, a native OnDestroy and a scripted OnDestroy method and made the main method non-virtual	2017-01-12 22:49:18 +01:00
r_interpolate.h	- split DObject::Destroy into the main method, a native OnDestroy and a scripted OnDestroy method and made the main method non-virtual	2017-01-12 22:49:18 +01:00
r_translate.cpp	Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript	2016-11-30 18:46:23 +01:00
r_translate.h	- scriptified Heretic's Skull Rod.	2016-11-25 16:05:03 +01:00
renderstyle.cpp	- removed farchive.cpp and .h	2016-09-22 00:48:22 +02:00
renderstyle.h	- Fixed a few corner cases where forcing alpha wouldn't work.	2016-10-03 13:14:48 -05:00
sprites.cpp	- got rid of clearbuf.	2016-12-09 08:13:08 -05:00
sprites.h	- converted scale variables in AActor, FMapThing and skin to float.	2016-03-20 12:13:00 +01:00
voxels.cpp	- Fixed wrong argument format in voxeldef parser code.	2016-12-10 14:02:12 +01:00
voxels.h	- floatified most of r_data (The interpolations cannot be done yet.)	2016-03-24 14:11:41 +01:00