qzdoom/src/g_strife
Randy Heit 2d87eb0ba2 Merge branch 'master' into gonesolong
Conflicts:
	src/CMakeLists.txt
	src/actor.h
	src/g_heretic/a_hereticmisc.cpp
	src/g_heretic/a_hereticweaps.cpp
	src/g_heretic/a_ironlich.cpp
	src/info.h
	src/namedef.h
	src/p_buildmap.cpp
	src/p_enemy.cpp
	src/p_map.cpp
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	zdoom.vcproj
2014-12-20 19:13:14 -06:00
..
a_acolyte.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_alienspectres.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_coin.cpp - Changed compilation for g_doom, g_heretic, g_hexen and g_strife folders 2008-09-15 14:11:05 +00:00
a_crusader.cpp - Sync scriptbranch with trunk. 2010-04-04 04:09:24 +00:00
a_entityboss.cpp Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00
a_inquisitor.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_loremaster.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_oracle.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_programmer.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_reaver.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_rebels.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_sentinel.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_spectral.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_stalker.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_strifeglobal.h - Removed the third parameter from dumpclasses when it was restricted it to Actors, because 2010-03-24 02:49:37 +00:00
a_strifeitems.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_strifestuff.cpp - Update to latest version in trunk. 2012-10-17 04:24:54 +00:00
a_strifeweapons.cpp Merge branch 'master' into scripting 2013-09-03 09:01:28 +02:00
a_templar.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_thingstoblowup.cpp Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00
strife_sbar.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00