Rachael Alexanderson fa66ca214e Merge https://github.com/coelckers/gzdoom ... # Conflicts: # src/win32/zdoom.rc		2016-12-22 06:24:47 -05:00
..
filter	Fixed loading of Hexen and Strife	2016-12-08 12:07:12 +02:00
glstuff
graphics
maparrows
mapinfo	- 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
sbarinfo
shaders	Merge http://github.com/coelckers/gzdoom	2016-10-24 21:02:09 -04:00
sounds
sprites
textures
xlat
zscript	Merge branch 'master' of https://github.com/rheit/zdoom	2016-12-22 11:29:44 +01: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
language.eng
language.enu	Add poly renderer to the menus	2016-11-21 15:19:24 +01:00
language.fr
language.ita
language.ptb
lockdefs.txt
menudef.txt	Add poly renderer to the menus	2016-11-21 15:19:24 +01:00
menudef.zz	Merge https://github.com/coelckers/gzdoom	2016-12-22 06:24:47 -05: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	Merge branch 'zscript' of https://github.com/rheit/zdoom into gz-zscript	2016-12-03 18:51:10 +01:00