OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity
vkdoom_m/src/g_heretic
History
Randy Heit 4deeb8d8ae Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/p_local.h
	src/p_map.cpp
	src/sdl/i_main.cpp
	src/thingdef/thingdef_codeptr.cpp
2013-06-25 19:28:25 -05:00
..
a_chicken.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_dsparil.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_hereticartifacts.cpp - Update to latest version in trunk. 2012-10-17 04:24:54 +00:00
a_hereticimp.cpp - Synced the scripting branch with trunk. 2010-02-17 04:46:11 +00:00
a_hereticmisc.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_hereticweaps.cpp Merge branch 'master' into scripting 2013-06-25 19:28:25 -05:00
a_ironlich.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_knight.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00
a_wizard.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00