zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-12-12 13:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity
qzdoom-gpl/src/g_heretic
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_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 Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00
a_hereticweaps.cpp Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06:00
a_ironlich.cpp Merge branch 'master' into gonesolong 2014-12-20 19:13:14 -06: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