Christoph Oelckers 3e4678765b Merge branch 'master' into scripting ... Conflicts: src/actor.h src/thingdef/thingdef_codeptr.cpp		2013-08-18 12:18:59 +02:00
..
action.txt
blood.txt
botstuff.txt
bridge.txt
camera.txt
damagetypes.txt
debris.txt
decal.txt
dog.txt
fountain.txt
hatetarget.txt
inventory.txt
mapmarker.txt
morph.txt
movingcamera.txt
pickups.txt
player.txt
secrettrigger.txt
sectoraction.txt
setcolor.txt
sharedmisc.txt
skies.txt
soundenvironment.txt
soundsequence.txt
spark.txt
specialspot.txt
splashes.txt
teleport.txt
waterzone.txt