zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-14 08:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity
qzdoom/src/g_heretic
History
Christoph Oelckers 4b9647e539 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_hexen/a_hexenspecialdecs.cpp
	src/g_strife/a_thingstoblowup.cpp
	src/thingdef/thingdef_codeptr.cpp
2016-01-20 11:45:57 +01:00
..
a_chicken.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_dsparil.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_hereticartifacts.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_hereticimp.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_hereticmisc.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_hereticweaps.cpp Merge branch 'master' into scripting 2016-01-20 11:45:57 +01:00
a_ironlich.cpp Merge branch 'master' into scripting 2016-01-19 13:43:11 +01:00
a_knight.cpp Merge branch 'master' into scripting 2016-01-20 11:45:57 +01:00
a_wizard.cpp - Updated scripting branch to latest version in trunk. 2013-06-07 03:31:30 +00:00