gzdoom/src/g_hexen
Christoph Oelckers bf747075e8 Merge branch 'master' into scripting
Conflicts:
	src/actor.h
	src/g_hexen/a_clericstaff.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
2016-01-17 20:57:55 +01:00
..
a_bats.cpp - Update scripting branch to latest version of trunk. 2012-07-17 02:53:53 +00:00
a_bishop.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_blastradius.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_boostarmor.cpp - Changed compilation for g_doom, g_heretic, g_hexen and g_strife folders 2008-09-15 14:11:05 +00:00
a_centaur.cpp - Converted all action functions be directly callable by the VM (though they are not yet 2010-02-12 06:04:57 +00:00
a_clericflame.cpp - Converted all action functions be directly callable by the VM (though they are not yet 2010-02-12 06:04:57 +00:00
a_clericholy.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_clericmace.cpp Merge branch 'master' into gonesolong 2014-12-21 21:15:11 -06:00
a_clericstaff.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_dragon.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_fighteraxe.cpp Merge branch 'master' into gonesolong 2014-12-21 21:15:11 -06:00
a_fighterhammer.cpp Merge branch 'master' into gonesolong 2014-12-21 21:15:11 -06:00
a_fighterplayer.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_fighterquietus.cpp Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00
a_firedemon.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_flechette.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_flies.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_fog.cpp - Update scripting branch to latest version of trunk. 2012-07-17 02:53:53 +00:00
a_healingradius.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_heresiarch.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_hexenglobal.h - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_hexenmisc.cpp Add flies (doomed #112) from the Hexen retail beta 2015-04-02 17:52:54 -05:00
a_hexenspecialdecs.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_iceguy.cpp Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00
a_korax.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_magecone.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_magelightning.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
a_magestaff.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_pig.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_serpent.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_spike.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_summon.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_teleportother.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_wraith.cpp - Update scripting branch to latest version of trunk. 2012-07-17 02:53:53 +00:00