qzdoom-gpl/src/g_strife
Randy Heit b5e4153c78 Merge branch 'master' into gonesolong
Conflicts:
	src/CMakeLists.txt
	src/b_think.cpp
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_clericstaff.cpp
	src/g_hexen/a_fighterplayer.cpp
	src/namedef.h
	src/p_enemy.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/p_teleport.cpp
	src/sc_man_tokens.h
	src/thingdef/thingdef_codeptr.cpp
	src/thingdef/thingdef_function.cpp
	src/thingdef/thingdef_parse.cpp
	wadsrc/static/actors/actor.txt
	wadsrc/static/actors/constants.txt
	wadsrc/static/actors/shared/inventory.txt

- Added register reuse to VMFunctionBuilder for FxPick's code emitter.
- Note to self: Need to reimplement IsPointerEqual and CheckClass, which
  were added to thingdef_function.cpp over the past year, as this file no
  longer exists in this branch.
2014-12-21 21:15:11 -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 Merge branch 'master' into gonesolong 2014-12-21 21:15:11 -06: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 Merge branch 'master' into gonesolong 2014-12-21 21:15:11 -06: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 Merge branch 'master' into gonesolong 2014-12-21 21:15:11 -06: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 Merge branch 'master' into gonesolong 2014-12-21 21:15:11 -06:00