Christoph Oelckers 251cdacf26 Merge branch 'master' into scripting ... Conflicts: src/g_shared/a_randomspawner.cpp src/g_strife/a_strifeweapons.cpp src/thingdef/thingdef_parse.cpp wadsrc/static/actors/constants.txt		2013-09-03 09:01:28 +02:00
..
chex	- Added Gez's patch for moving tag strings into the language file and adding tags for all weapons and inventory items.	2010-08-18 20:26:25 +00:00
doom	- fixed: the ExplosiveBarrel's height was wrong.	2013-02-22 21:18:29 +00:00
heretic	- fixed: GoldWandPuff2 requires the PUFFONACTORS flag.	2013-06-24 02:25:16 +02:00
hexen	- Fixed: r4226 had bad copy-paste angles for Demon2's XDeath.	2013-04-30 04:49:24 +00:00
raven	- Fixed: ArtiTeleport was missing its SpawnID.	2012-11-13 04:59:38 +00:00
shared	Merge branch 'master' into scripting	2013-08-18 12:18:59 +02:00
strife	- fixed typo in Strife spectre's obituary message and added it to the DECORATE definition of the spectre.	2013-08-10 20:42:34 +02:00
actor.txt	Merge branch 'master' into scripting	2013-09-03 09:01:28 +02:00
constants.txt	Merge branch 'master' into scripting	2013-09-03 09:01:28 +02:00