qzdoom/src/g_doom
Randy Heit b3b0886b64 Merge branch 'scripting'
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
2016-02-04 15:17:22 -06:00
..
a_arachnotron.cpp - Be stricter about types accepted by spawning functions. 2010-04-03 04:07:17 +00:00
a_archvile.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_bossbrain.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_bruiser.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_cacodemon.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_cyberdemon.cpp - Be stricter about types accepted by spawning functions. 2010-04-03 04:07:17 +00:00
a_demon.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_doomglobal.h - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_doomimp.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_doommisc.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_doomweaps.cpp Merge branch 'scripting' 2016-02-04 15:17:22 -06:00
a_fatso.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_keen.cpp - Sync scripting branch with what was in trunk on Sunday. I believe that would be revision 2739. 2010-09-16 03:14:32 +00:00
a_lostsoul.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_painelemental.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_possessed.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_revenant.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_scriptedmarine.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_spidermaster.cpp - Sync scriptbranch with trunk. 2010-04-04 04:09:24 +00:00