Rachael Alexanderson a52f79055d Merge https://github.com/coelckers/gzdoom ... # Conflicts: # src/menu/playerdisplay.cpp		2017-02-11 05:05:24 -05:00
..
filter	Fixed loading of Hexen and Strife	2016-12-08 12:07:12 +02:00
glstuff
graphics
maparrows
mapinfo	- Added Deejay's par times for Thy Flesh Consumed	2017-01-16 19:17:22 +01:00
sbarinfo
shaders	Merge https://github.com/coelckers/gzdoom	2017-02-01 21:57:37 -05:00
sounds
sprites
textures
xlat	- added new Stairs_BuildUpDoomCrush special from Eternity and used it to fix the bad implementation to make Doom's turbo stairs crush. This also removes the crushing from Generic_Stairs entirely, just like it was in Boom.	2017-01-08 01:15:45 +01:00
zscript	Merge https://github.com/coelckers/gzdoom	2017-02-11 05:05:24 -05:00
althudcf.txt
animdefs.txt
compatibility.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-12-22 11:29:44 +01:00
confont.lmp
dbigfont.lmp
decaldef.txt
defbinds.txt
dehsupp.txt	- moved the 'brainexplode' state to the rocket, which is the actor which actually uses it.	2016-11-14 15:02:44 +01:00
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	- Made WadSmoosh detection a lot stricter.	2017-01-04 20:48:52 +01:00
language.eng
language.enu	Merge remote-tracking branch 'gzdoom/master'	2017-02-05 16:07:48 -05:00
language.fr
language.ita
language.ptb
lockdefs.txt
menudef.txt	Merge https://github.com/coelckers/gzdoom	2017-01-28 17:39:55 -05:00
menudef.zz	- fixed: PalTonemap Exponent slider didn't have a proper decimal place.	2017-01-24 22:24:53 +01:00
netnotch.dat
notch.dat
reverbs.txt
sbarinfo.txt
sbigfont.lmp
sndinfo.txt
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
zscript.txt	- the first menu function has been scriptified.	2017-02-10 00:25:50 +01:00