Merge branch 'master' into scripting

Browse source

Conflicts:
	src/actor.h
	src/g_hexen/a_hexenspecialdecs.cpp
	src/g_strife/a_thingstoblowup.cpp
	src/thingdef/thingdef_codeptr.cpp

...

This commit is contained in:

Christoph Oelckers 2016-01-20 11:45:57 +01:00

parent b73e1e65f5 83cbf6cae5

commit 4b9647e539

23 changed files with 484 additions and 448 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

342

src/p_mobj.cpp

View file

File diff suppressed because it is too large Load diff