Merge commit '125afcf3de' into scripting

Browse source

Conflicts:
	src/p_local.h
	src/p_mobj.cpp
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/shared/inventory.txt

...

This commit is contained in:

Christoph Oelckers 2016-01-17 19:09:05 +01:00

parent 40a2665726 125afcf3de

commit 5207aa6cc0

51 changed files with 2596 additions and 2131 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

3693

src/p_interaction.cpp

View file

File diff suppressed because it is too large Load diff