Christoph Oelckers dda73b531c Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/CMakeLists.txt # src/p_setup.cpp # src/r_defs.h # src/version.h This only updates to a compileable state. The new portals are not yet functional in the hardware renderer because they require some refactoring in the data management first.		2016-02-05 12:31:41 +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 branch 'master' of https://github.com/rheit/zdoom	2015-09-19 12:32:22 +02:00
heretic	Fixed missing hit sound for Heretic weapon Dragon Claw	2015-09-16 13:38:47 +03:00
hexen	- moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them.	2015-04-04 00:39:09 +02:00
raven	- moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them.	2015-04-04 00:39:09 +02:00
shared	Merge branch 'scripting'	2016-02-04 15:17:22 -06:00
strife	- fixed incorrect state settings in Macil.	2015-11-25 13:06:39 +01:00
actor.txt	Merge branch 'scripting'	2016-02-04 15:17:22 -06:00
constants.txt	Merge branch 'scripting'	2016-02-04 15:17:22 -06:00