Christoph Oelckers 6bfbe30b99 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/CMakeLists.txt # src/g_level.cpp # src/p_saveg.cpp # src/r_defs.h # src/version.h (note that this commit will not compile!)		2016-09-24 00:40:15 +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	- integrated dynamic light definitions into regular DECORATE as another include.	2016-09-22 09:32:04 +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	- fixed: An actor's default stencil color should be set in DECORATE instead of doing some hackery elsewhere to compensate for the lack of initialization.	2016-09-23 19:19:26 +02:00
constants.txt	- renamed flag to be more descriptive.	2016-08-16 09:02:23 +02:00