Christoph Oelckers f7834061df Merge commit 'b6a4511dd1e74440fad99bc673c1f2b3680dba48' into scripting ... Conflicts: src/dobjtype.cpp src/p_conversation.cpp src/p_local.h src/p_things.cpp src/thingdef/thingdef_properties.cpp (This is just the conversationID to MAPINFO stuff to keep the conflicts as small as possible)		2015-04-28 13:08:18 +02:00
..
acs	- Fix strife linetype 11 again, courtesy of Gez.	2012-02-21 19:56:25 +00:00
actors	Merge commit 'b6a4511dd1e74440fad99bc673c1f2b3680dba48' into scripting	2015-04-28 13:08:18 +02:00
filter	- 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
graphics	Multi-intermission waits for all players + changes	2014-06-17 19:46:10 +12:00
maparrows	- Added keys on the automap for Heretic in easy mode, courtesy of Gez.	2012-02-12 02:45:48 +00:00
mapinfo	- 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
sbarinfo	- Allow any parameterized SBarInfo value to use parentheses to help make the syntax a little more consistent.	2012-02-16 05:01:17 +00:00
shaders/d3d	- Removed a couple warnings about implicit vector truncation reported by fxc. (Apparently, it	2011-05-15 22:30:20 +00:00
sounds	- Reprocess all sounds with flac 1.2.1.	2009-09-15 01:55:36 +00:00
sprites	Add dot sprites for Hexen beta flies	2015-04-02 17:53:15 -05:00
textures	About a week's worth of changes here. As a heads-up, I wouldn't be	2008-07-23 04:57:26 +00:00
xlat	- fixed bad edit in linedef translation.	2014-08-21 13:38:47 +02:00
althudcf.txt	- fixed: Changing APROP_Friendly in ACS did not adjust the monster count.	2010-08-10 16:22:57 +00:00
animated.lmp	About a week's worth of changes here. As a heads-up, I wouldn't be	2008-07-23 04:57:26 +00:00
animdefs.txt	- merged menu branch back into trunk.	2010-09-14 17:28:18 +00:00
compatibility.txt	Added Archvile ghosts compatibility flags for some more maps	2015-03-26 22:02:10 -05:00
confont.lmp	About a week's worth of changes here. As a heads-up, I wouldn't be	2008-07-23 04:57:26 +00:00
dbigfont.lmp	About a week's worth of changes here. As a heads-up, I wouldn't be	2008-07-23 04:57:26 +00:00
decaldef.txt	- Fixed one small copy-paste error in decaldef.txt for SnakeScorch22.	2012-09-11 01:42:01 +00:00
decorate.txt	Add flies (doomed #112) from the Hexen retail beta	2015-04-02 17:52:54 -05:00
dehsupp.txt	- Gez's latest cleanup patch.	2009-09-17 20:54:07 +00:00
etc.h.txt	- merged 3dfloors2 branch into trunk.	2011-01-29 11:09:38 +00:00
fontdefs.txt	- fixed: The GAMEINFO parser did not correctly handle NOSPRITERENAME	2010-10-23 22:33:39 +00:00
in_epi1.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
in_epi2.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
in_epi3.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
in_htc1.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
in_htc2.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
in_htc3.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
indexfont	- fixed some incorrect file names in the new WADSRC directory and deleted obsolete makefiles.	2008-07-23 15:32:18 +00:00
iwadinfo.txt	- added some missing autoload sections (Hacx 1.2 vs. Hacx 2, Hexen vs Deathkings and Heretic vs. Shadows of the Serpent Riders.) and filter names for Strifeteaser1 and Strifeteaser2 which are needed for exporting the conversation IDs to MAPINFO	2015-04-04 20:44:27 +02:00
language.enu	- Added GOD2 and BUDDHA2 cheats.	2014-10-25 09:38:40 +02:00
language.fr	- Expand environment variables for autoload paths.	2014-07-15 21:26:26 -04:00
language.ita	- added Italian translation to OB_VOODOO (thanks to Edward-san)	2012-04-22 07:37:38 +00:00
language.ptb	- specte typo in language.ptb.	2013-08-10 21:15:06 +02:00
lockdefs.txt	- Fix mapcolor for Strife's passcard.	2011-10-03 00:38:20 +00:00
menudef.txt	Big DUMB update	2015-03-07 23:10:08 -06:00
netnotch.dat	- added Gez's patch to move Hexen's startup notches out of the EXE.	2010-03-27 21:12:08 +00:00
notch.dat	- added Gez's patch to move Hexen's startup notches out of the EXE.	2010-03-27 21:12:08 +00:00
reverbs.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
sbarinfo.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
sbigfont.lmp	About a week's worth of changes here. As a heads-up, I wouldn't be	2008-07-23 04:57:26 +00:00
sndinfo.txt	Split sndinfo.txt up into multiple files using filter directories.	2015-04-03 22:58:58 -05:00
sndseq.txt	- Fixed copy-paste fail for DoorCloseSmallWood.	2010-01-08 04:01:30 +00:00
spaldoom.lmp	About a week's worth of changes here. As a heads-up, I wouldn't be	2008-07-23 04:57:26 +00:00
spalhtic.lmp	About a week's worth of changes here. As a heads-up, I wouldn't be	2008-07-23 04:57:26 +00:00
teaminfo.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
terrain.txt	- fixed: Heretic's splashes don't alert monsters.	2010-05-11 17:30:27 +00:00
textcolors.txt	- Moved the V_InitFontColors() call earlier in the startup sequence so that	2009-02-11 00:16:05 +00:00
textures.txt	- Enable Doom 1.1 status bar support.	2012-11-09 23:03:53 +00:00
things.h.txt	- merged 3dfloors2 branch into trunk.	2011-01-29 11:09:38 +00:00
vga-rom-font.16	About a week's worth of changes here. As a heads-up, I wouldn't be	2008-07-23 04:57:26 +00:00
x11r6rgb.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
xhairs.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