Rachael Alexanderson c76c65d3f7 Merge https://github.com/coelckers/gzdoom ... # Conflicts: # src/r_draw.cpp		2017-02-07 17:09:13 -05:00
..
colormaps.cpp
colormaps.h	Merge remote-tracking branch 'gzdoom/master' into qzdoom	2017-01-18 04:09:16 +01: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	- got rid of all DTA_Translation uses.	2017-02-05 00:17:29 +01:00
r_translate.h
renderstyle.cpp	- removed a few unused definitions.	2017-02-07 10:55:59 +01:00
renderstyle.h	Merge https://github.com/coelckers/gzdoom	2017-02-07 17:09:13 -05:00
sprites.cpp	- fixed: DECORATE was creating a new global constant namespace for each single included file, not just once per DECORATE lump.	2017-01-27 10:51:12 +01:00
sprites.h
voxels.cpp	- Fixed wrong argument format in voxeldef parser code.	2016-12-10 14:02:12 +01:00
voxels.h