Christoph Oelckers 0678a469de Merge remote-tracking branch 'remotes/zdoom/master' ... # Conflicts: # src/win32/i_system.cpp # tools/re2c/re2c.vcproj		2016-02-08 21:47:19 +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: The counters for the whirlwind were initialized too late, the first time they are needed is in P_CheckMissileSpawn, which gets called from inside P_SpawnMissile. Also took the opportunity and moved them to properties that are accessible from DECORATE.	2016-02-08 13:34:54 +01: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 pull request #538 from MajorCooke/CountInv	2016-02-08 21:06:30 +01:00
constants.txt	Merge branch 'scripting'	2016-02-04 15:17:22 -06:00