Commit Graph

24 Commits

Author SHA1 Message Date
Rachael Alexanderson 32287511e2 - change type 9854 to SpotLightFlickerRandomAttitive since its old definition was just a duplicate of another one. 2018-02-04 04:11:02 -05:00
Jonathan Russell acf83c2a74 - fixing the last commit... 2018-01-04 23:13:14 +00:00
Jonathan Russell 254501d3e8 - fixing last commit, which didn't seem to work correctly 2018-01-04 23:09:48 +00:00
Jonathan Russell 7f7c720883 - added UDMF properties for spotlights (args have all been used up for dynlights) 2018-01-04 22:41:57 +00:00
Christoph Oelckers 1e950d75bd - made dynamic light attenuation completely opt-in. This can be done either by setting a MAPINFO option for lights that do not automatically specify it and with a light property. The light property will always take precedence, if set. 2016-12-07 23:17:18 +01:00
Christoph Oelckers 6e223ebc21 Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript
# Conflicts:
#	src/CMakeLists.txt
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/decorate.txt
2016-11-15 11:36:59 +01:00
Christoph Oelckers 9e2830a3db - converted the rest of actors/shared.
- moved damagetype definitions to MAPINFO. These were in DECORATE which is not correct. The old code is left for compatibility.
2016-10-14 10:46:15 +02:00
Christoph Oelckers a96d6ab072 Merge remote-tracking branch 'remotes/zdoom/master'
# Conflicts:
#	src/g_level.cpp
#	src/p_3dfloors.cpp
#	src/p_lnspec.cpp
#	src/p_saveg.cpp
#	src/p_spec.cpp
#	src/r_bsp.cpp
#	src/r_data/r_interpolate.cpp
#	src/r_data/r_translate.cpp
#	src/r_data/sprites.cpp
#	src/r_defs.h
#	src/r_sky.h
#	src/stats.h
#	src/textures/texturemanager.cpp
#	src/textures/textures.h
#	src/version.h
#	src/win32/fb_d3d9.cpp
#	src/win32/hardware.cpp
#	src/win32/i_system.cpp
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/compatibility.txt
#	wadsrc/static/language.enu
#	wadsrc/static/mapinfo/common.txt
#	wadsrc/static/menudef.txt
#	wadsrc/static/xlat/eternity.txt
2016-03-01 18:50:45 +01:00
Randy Heit 55142078d8 Normalize line endings 2016-03-01 09:47:10 -06:00
Christoph Oelckers 0e9eb2f305 Merge branch 'master' of https://github.com/rheit/zdoom 2016-01-04 11:55:07 +01:00
Christoph Oelckers bd95c5eadf - fixed: the ambient sound things need both the args from the DoomEdNum mapping and the actual map. 2016-01-04 11:52:07 +01:00
Christoph Oelckers ae16e5d195 - Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition. 2015-04-27 18:18:46 +02:00
Christoph Oelckers 6b1e7522e6 - Assigned editor number 5006 to SkyCamCompat class, to match Eternity's definition. 2015-04-27 15:14:01 +02:00
Christoph Oelckers 8762ab48d3 Merge branch 'master' of https://github.com/rheit/zdoom 2015-04-05 09:47:27 +02:00
Christoph Oelckers b6a4511dd1 - move conversation ID definition to MAPINFO as well. Uses the newly added filter feature to handle the teaser differences. 2015-04-05 00:31:15 +02:00
Christoph Oelckers b0c0012d60 - add dynamic lights to editor number table and remove them from DECORATE definitions. 2015-04-04 10:42:44 +02:00
Christoph Oelckers 338a220df8 - add empty editor number mapping for GZDoom's dynamic lights so that these will no longer produce errors when loaded with ZDoom. 2015-04-04 10:30:09 +02:00
Christoph Oelckers 51591d10b0 - handle slope things through new definition tables as well. Since these get processed outside P_SpawnMapThing it required some restructuring so that the actual spawn data is present when slope things get processed.
- removed FMapThing::Serialize because it isn't used anywhere - it was rather broken anyway.
2015-04-04 10:25:01 +02:00
Christoph Oelckers 2ec8e2c2ac - 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
Christoph Oelckers 9e5bf38123 - handle all special mapthing items (player starts, polyobj spots) via the new MAPINFO method instead of hard coding them in the spawn function.
(Note: The buildmap loading code should be adjusted to the new functionality as well eventually.)
2015-04-03 21:17:10 +02:00
Christoph Oelckers bd77f83bab - added editor number definitions to MAPINFO. 2015-04-03 13:54:38 +02:00
Christoph Oelckers 8edace83c5 - made CheatKey and EasyKey vector graphics configurable through MAPINFO. 2014-10-25 10:19:14 +02:00
Christoph Oelckers 62f846b0ab - fixed: The Lost Soul used the wrong sound in the cast call.
SVN r2914 (trunk)
2010-10-06 16:01:51 +00:00
Christoph Oelckers d9970ab9b6 - merged finale branch back into trunk.
SVN r2911 (trunk)
2010-10-06 10:44:03 +00:00