gzdoom/src/g_doom
Christoph Oelckers bc63b70d88 Merge branch 'master' into scripting
Conflicts:
	src/actor.h
	src/fragglescript/t_func.cpp
	src/g_doom/a_bossbrain.cpp
	src/g_doom/a_revenant.cpp
	src/g_heretic/a_hereticartifacts.cpp
	src/g_heretic/a_hereticweaps.cpp
	src/g_heretic/a_knight.cpp
	src/g_hexen/a_bishop.cpp
	src/g_hexen/a_clericholy.cpp
	src/g_hexen/a_dragon.cpp
	src/g_hexen/a_firedemon.cpp
	src/g_hexen/a_flechette.cpp
	src/g_hexen/a_heresiarch.cpp
	src/g_hexen/a_hexenspecialdecs.cpp
	src/g_hexen/a_iceguy.cpp
	src/g_hexen/a_korax.cpp
	src/g_hexen/a_magelightning.cpp
	src/g_hexen/a_serpent.cpp
	src/g_hexen/a_spike.cpp
	src/g_hexen/a_wraith.cpp
	src/g_raven/a_minotaur.cpp
	src/g_shared/a_bridge.cpp
	src/g_shared/a_pickups.cpp
	src/g_shared/a_randomspawner.cpp
	src/g_strife/a_alienspectres.cpp
	src/g_strife/a_crusader.cpp
	src/g_strife/a_entityboss.cpp
	src/g_strife/a_inquisitor.cpp
	src/g_strife/a_loremaster.cpp
	src/g_strife/a_programmer.cpp
	src/g_strife/a_sentinel.cpp
	src/g_strife/a_spectral.cpp
	src/g_strife/a_strifestuff.cpp
	src/g_strife/a_strifeweapons.cpp
	src/g_strife/a_thingstoblowup.cpp
	src/p_local.h
	src/r_utility.cpp
2016-01-19 13:43:11 +01: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 'master' into scripting 2016-01-19 13:43:11 +01: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