Christoph Oelckers 7ba577e1b0 Merge branch 'master' into scripting ... Conflicts: src/g_heretic/a_hereticweaps.cpp src/thingdef/thingdef_codeptr.cpp		2015-06-07 09:43:54 +02:00
..
actors	Merge branch 'master' into scripting	2015-05-02 22:44:31 +02:00
filter	Fixed: missing '=' in conversation ID defs	2015-04-14 19:13:25 +03:00
graphics	Multi-intermission waits for all players + changes	2014-06-17 19:46:10 +12:00
maparrows
mapinfo	- fixed: The ending flat for No Rest For The Living was wrong.	2015-05-26 09:03:53 +02:00
sbarinfo	- Fixed: Hexen's status bar top graphic was drawn 1 pixel too low.	2015-05-20 13:10:08 -04:00
shaders/d3d
sounds
sprites	- added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.)	2015-04-27 10:24:49 +02:00
textures
xlat	- fixed bad edit in linedef translation.	2014-08-21 13:38:47 +02:00
althudcf.txt
animated.lmp
animdefs.txt
compatibility.txt	Added Archvile ghosts compatibility flags for some more maps	2015-03-26 22:02:10 -05:00
confont.lmp
dbigfont.lmp
decaldef.txt
decorate.txt	Add flies (doomed #112) from the Hexen retail beta	2015-04-02 17:52:54 -05:00
defbinds.txt	Externalized default key bindings	2015-04-05 21:40:53 -05:00
dehsupp.txt
etc.h.txt
fontdefs.txt
in_epi1.txt
in_epi2.txt
in_epi3.txt
in_htc1.txt
in_htc2.txt
in_htc3.txt
indexfont
iwadinfo.txt	- fixed: We must not allow the engine to start without a default MAPINFO definition.	2015-04-07 14:09:55 +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
language.ptb	- specte typo in language.ptb.	2013-08-10 21:15:06 +02:00
lockdefs.txt
menudef.txt	- cleanup of sound system startup and menu handling:	2015-04-26 12:13:21 +02:00
netnotch.dat
notch.dat
reverbs.txt
sbarinfo.txt
sbigfont.lmp
sndinfo.txt	Split sndinfo.txt up into multiple files using filter directories.	2015-04-03 22:58:58 -05:00
sndseq.txt
spaldoom.lmp
spalhtic.lmp
teaminfo.txt
terrain.txt
textcolors.txt
textures.txt
things.h.txt
vga-rom-font.16
x11r6rgb.txt
xhairs.txt