gzdoom-gles/wadsrc/static/actors
Randy Heit 4deeb8d8ae Merge branch 'master' into scripting
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/p_local.h
	src/p_map.cpp
	src/sdl/i_main.cpp
	src/thingdef/thingdef_codeptr.cpp
2013-06-25 19:28:25 -05: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 - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
strife - fixed the Peasants DECORATE definition. 2013-05-30 21:07:29 +00:00
actor.txt Merge branch 'master' into scripting 2013-06-25 19:28:25 -05:00
constants.txt - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00