zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-01 14:20:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
gzdoom/src/thingdef
History
Christoph Oelckers bf747075e8 Merge branch 'master' into scripting 
Conflicts:
	src/actor.h
	src/g_hexen/a_clericstaff.cpp
	src/p_enemy.cpp
	src/p_interaction.cpp
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
2016-01-17 20:57:55 +01:00
..
olddecorations.cpp Use PFunction instead of PSymbolActionFunction in DECORATE parser 2013-08-14 22:00:16 -05:00
thingdef.cpp - some more fixes of 'Restart'. Still not working as intended. 2015-04-28 19:03:52 +02:00
thingdef.h Eliminate .mreg section 2015-03-14 22:16:05 -05:00
thingdef_codeptr.cpp Merge branch 'master' into scripting 2016-01-17 20:57:55 +01:00
thingdef_data.cpp Merge commit '38df0665e3a2018cf1d0028a36357df6c7e908e9' into scripting 2016-01-17 19:50:34 +01:00
thingdef_exp.cpp Merge commit '8e0151b4c1b88eaf295042ea2d545a83b4b99acc' into scripting 2015-04-28 10:59:50 +02:00
thingdef_exp.h Merge commit '8e0151b4c1b88eaf295042ea2d545a83b4b99acc' into scripting 2015-04-28 10:59:50 +02:00
thingdef_expression.cpp - some GCC fixed by Edward-san. 2015-04-29 11:28:04 +02:00
thingdef_parse.cpp Merge branch 'master' into scripting 2015-04-30 12:30:36 +02:00
thingdef_properties.cpp Merge branch 'master' into scripting 2015-04-30 12:30:36 +02:00
thingdef_states.cpp - allow linefeed before braces starting a compound state action definition. 2015-05-02 22:57:29 +02:00
thingdef_type.h DECORATE cleanup 2013-08-23 22:17:08 -05:00