Christoph Oelckers 7ce670951b Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/CMakeLists.txt		2016-04-11 10:49:11 +02:00
..
colormaps.cpp	Normalize line endings	2016-03-01 09:47:10 -06:00
colormaps.h	Normalize line endings	2016-03-01 09:47:10 -06:00
r_interpolate.cpp	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt	2016-03-31 09:24:41 +02:00
r_interpolate.h	- floatified r_interpolate.cpp.	2016-03-30 17:11:31 +02:00
r_translate.cpp	Merge branch 'floatcvt' of https://github.com/rheit/zdoom into floatcvt	2016-03-24 16:38:09 +01:00
r_translate.h	Normalize line endings	2016-03-01 09:47:10 -06:00
renderstyle.cpp	- floatified most of r_data (The interpolations cannot be done yet.)	2016-03-24 14:11:41 +01:00
renderstyle.h	- floatified most of r_data (The interpolations cannot be done yet.)	2016-03-24 14:11:41 +01:00
sprites.cpp	Merge branch 'master' of https://github.com/rheit/zdoom	2016-04-11 10:49:11 +02:00
sprites.h	- converted scale variables in AActor, FMapThing and skin to float.	2016-03-20 12:13:00 +01:00
voxels.cpp	- floatified most of r_data (The interpolations cannot be done yet.)	2016-03-24 14:11:41 +01:00
voxels.h	- floatified most of r_data (The interpolations cannot be done yet.)	2016-03-24 14:11:41 +01:00