zdoom/qzdoom-gpl
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom-gpl.git synced 2024-12-12 21:22:22 +00:00
Code Issues Projects Releases Packages Wiki Activity
qzdoom-gpl/wadsrc/static/actors/shared
History
Christoph Oelckers 2e0f999fea Merge branch 'master' into scripting 
Conflicts:
	src/p_effect.cpp
	src/p_effect.h
	src/p_local.h
	src/p_map.cpp
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/actor.txt
	wadsrc/static/actors/shared/inventory.txt
	zdoom.vcproj
2015-04-28 14:45:13 +02:00
..
action.txt - Added MF5_MOVEWITHSECTOR flag, so you can have the benefits of MF_NOBLOCKMAP 2009-04-09 02:25:37 +00:00
blood.txt - moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them. 2015-04-04 00:39:09 +02:00
botstuff.txt About a week's worth of changes here. As a heads-up, I wouldn't be 2008-07-23 04:57:26 +00:00
bridge.txt - moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them. 2015-04-04 00:39:09 +02:00
camera.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
damagetypes.txt - added FDARI*s damagetype fix 2012-04-07 15:29:47 +00:00
debris.txt Merge commit '2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0' into scripting 2015-04-28 12:54:01 +02:00
decal.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
dog.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
fountain.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
hatetarget.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
inventory.txt Merge branch 'master' into scripting 2015-04-28 14:45:13 +02:00
mapmarker.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
morph.txt IMPORTANT NOTE: I uncommented some code depending on the missing x86.cpp file to allow this to compile, These changes must be reverted as soon as this file is added (see v_palette.cpp and win32/i_system.cpp.) 2008-08-09 11:35:42 +00:00
movingcamera.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
pickups.txt IMPORTANT NOTE: I uncommented some code depending on the missing x86.cpp file to allow this to compile, These changes must be reverted as soon as this file is added (see v_palette.cpp and win32/i_system.cpp.) 2008-08-09 11:35:42 +00:00
player.txt - added Player.Aircapacity property which is used as a multiplier for the level's air supply. 2013-08-09 11:57:14 +02:00
secrettrigger.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
sectoraction.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
setcolor.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
sharedmisc.txt Merge commit '2ec8e2c2ac61d30f7f1d666ec58ca0fd37e2e3b0' into scripting 2015-04-28 12:54:01 +02:00
skies.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
soundenvironment.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
soundsequence.txt - moved spawn ID definitions to MAPINFO as well and removed all 'Game' directives from DECORATE because editor and spawn numbers are the only thing that required them. 2015-04-04 00:39:09 +02:00
spark.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
specialspot.txt - Changed the action function declaration parser so that optional parameters 2008-08-12 20:19:47 +00:00
splashes.txt - Fixed: SNDINFO must be loaded before the textures. However, this required 2008-09-21 18:02:38 +00:00
teleport.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00
waterzone.txt - took editor numbers out of DECORATE definitions. 2015-04-03 16:34:07 +02:00