Merge branch 'scripting'

Browse source

Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt

...

This commit is contained in:

Randy Heit 2016-02-04 15:15:29 -06:00

parent 56359b6f23 c63f65d441

commit b3b0886b64

230 changed files with 24061 additions and 8641 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

2567

src/thingdef/thingdef_codeptr.cpp

View file

File diff suppressed because it is too large Load diff