Christoph Oelckers 0bcbacea53 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/posix/sdl/hardware.cpp		2016-03-04 01:21:59 +01:00
..
chex	- added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.)	2015-04-27 10:24:49 +02:00
doom	Merge remote-tracking branch 'remotes/zdoom/master'	2016-03-01 18:50:45 +01:00
heretic	Normalize line endings	2016-03-01 09:47:10 -06:00
hexen	Normalize line endings	2016-03-01 09:47:10 -06:00
raven	Normalize line endings	2016-03-01 09:47:10 -06:00
shared	Normalize line endings	2016-03-01 09:47:10 -06:00
strife	Normalize line endings	2016-03-01 09:47:10 -06:00
actor.txt	- fixed: A_Blast read the blast radius as an int, but used it as fixed_t. Also changed the definition of this parameter to float.	2016-03-03 10:23:04 +01:00
constants.txt	Added CBF_NOACTORS to A_CheckBlock.	2016-03-02 20:35:54 -06:00