Christoph Oelckers bba092cc0b Merge branch 'master' into scripting ... Conflicts: src/d_player.h src/g_doom/a_archvile.cpp src/thingdef/thingdef.h src/thingdef/thingdef_properties.cpp		2013-08-09 13:03:28 +02:00
..
acs	- Fix strife linetype 11 again, courtesy of Gez.	2012-02-21 19:56:25 +00:00
actors	Merge branch 'master' into scripting	2013-08-09 13:03:28 +02:00
graphics	- added some accented characters to the small Doom font. (thanks to hfc2x)	2012-04-22 07:35:53 +00:00
maparrows	- Added keys on the automap for Heretic in easy mode, courtesy of Gez.	2012-02-12 02:45:48 +00:00
mapinfo	- Added Gez's BFG edition patch.	2012-11-01 02:42:14 +00: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	- Fixed compilation with FMOD 4.38+. The removal of hardware voices and EAX was a fairly	2012-02-10 00:53:50 +00:00
textures
xlat	- fixed: UDMF's Doom namespace needs to retain Boom's sector special flags.	2013-06-03 07:14:42 +00: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
animdefs.txt	- merged menu branch back into trunk.	2010-09-14 17:28:18 +00:00
compatibility.txt	- added compatibility setting for stuff in Cheogsh2 MAP04's megasphere cage which is positioned too low.	2013-07-14 09:01:00 +02:00
confont.lmp
dbigfont.lmp
decaldef.txt	- Fixed one small copy-paste error in decaldef.txt for SnakeScorch22.	2012-09-11 01:42:01 +00:00
decorate.txt	- added FDARI*s damagetype fix	2012-04-07 15:29:47 +00: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
in_epi2.txt
in_epi3.txt
in_htc1.txt
in_htc2.txt
in_htc3.txt
indexfont
iwadinfo.txt	- Added Gez's BFG edition patch.	2012-11-01 02:42:14 +00:00
language.enu	- externalize labels for automap statistics display to the string table.	2013-07-28 16:18:57 +02:00
language.fr	- removed gamemode check for shareware message. It also uses LANGUAGE conditionals now.	2010-10-11 22:10:15 +00:00
language.ita	- added Italian translation to OB_VOODOO (thanks to Edward-san)	2012-04-22 07:37:38 +00:00
language.ptb	- Added a fallback for accented characters to use unaccented ones.	2013-05-17 02:35:35 +00:00
lockdefs.txt	- Fix mapcolor for Strife's passcard.	2011-10-03 00:38:20 +00:00
menudef.txt	- added custom automap overlay colors.	2013-08-09 11:00:24 +02: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
sbarinfo.txt
sbigfont.lmp
sndinfo.txt	- Added "misc/startupdone" sound to be played when the startup screen is closed and the game	2012-03-10 01:54:00 +00:00
sndseq.txt	- Fixed copy-paste fail for DoorCloseSmallWood.	2010-01-08 04:01:30 +00:00
spaldoom.lmp
spalhtic.lmp
teaminfo.txt
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
x11r6rgb.txt
xhairs.txt