OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity
vkdoom_m/src/g_doom
History
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_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 2013-08-09 13:03:28 +02:00
a_bossbrain.cpp Merge branch 'master' into scripting 2013-06-25 19:28:25 -05: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 gonesolong 2014-12-20 19:13:14 -06:00
a_fatso.cpp - Added a RETI instruction for returning 15-bit signed immediate values. 2012-10-28 04:36:52 +00: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 - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_painelemental.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_possessed.cpp - Update scripting branch to trunk. 2012-07-14 03:04:41 +00:00
a_revenant.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_scriptedmarine.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_spidermaster.cpp - Sync scriptbranch with trunk. 2010-04-04 04:09:24 +00:00