Christoph Oelckers 18ebe92cfc Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/g_level.cpp		2016-06-01 11:45:57 +02: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 branch 'master' of https://github.com/rheit/zdoom	2016-03-12 16:55:59 +01:00
heretic	- fixed: TAG_BLASTERP was on the wrong actor.	2016-04-19 02:06:36 +02: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	Not like this makes a difference.	2016-05-18 11:19:24 +02:00
strife	- replaced AActor::vel and player_t::Vel with a floating point version.	2016-03-20 00:54:18 +01:00
actor.txt	- Added GetCrouchFactor(ptr).	2016-05-29 12:43:46 +02:00
constants.txt	- Added A_WeaponOffset(x = 0, y = 32, flags).	2016-05-18 11:19:24 +02:00