nashmuhandes f45561b5e8 Merge branch 'master' of https://github.com/coelckers/gzdoom ... # Conflicts: # wadsrc_bm/static/filter/doom.doom1/gldefs.bm # wadsrc_bm/static/filter/heretic/gldefs.bm # wadsrc_bm/static/filter/hexen/gldefs.bm # wadsrc_bm/static/filter/strife/gldefs.bm # wadsrc_lights/static/filter/doom.doom1/gldefs.txt # wadsrc_lights/static/filter/heretic/gldefs.txt # wadsrc_lights/static/filter/hexen/gldefs.txt # wadsrc_lights/static/filter/strife/gldefs.txt		2017-01-04 14:32:15 +08:00
..
filter	Merge branch 'master' of https://github.com/coelckers/gzdoom	2016-12-23 00:51:30 +08: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 remote-tracking branch 'gzdoom/master' into ssao	2016-11-27 09:59:57 +01:00
sounds
sprites
textures
xlat	- update xlat/eternity.txt for reference.	2016-08-03 13:16:14 +02:00
zscript	- scriptified PowerBuddha and PowerFrightener.	2017-01-03 21:03:05 +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	- added identification for delaweare.wad to the list of supported IWADs.	2016-06-02 12:04:35 +02:00
language.eng	Merge branch 'master' of https://github.com/rheit/zdoom	2016-08-21 08:42:06 +02:00
language.enu	Merge remote-tracking branch 'gzdoom/master' into ssao	2016-11-27 09:59:57 +01:00
language.fr
language.ita
language.ptb
lockdefs.txt	Adds //%Title property to all locks to make parsing LOCKDEFS by map editors more feasible.	2016-07-12 23:52:04 +02:00
menudef.txt	Merge branch 'master' of https://github.com/coelckers/gzdoom	2016-11-19 08:00:49 +08:00
menudef.zz	Merge branch 'ssao' of https://github.com/dpjudas/dpDoom	2016-12-22 12:40:57 +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	Merge branch 'master' of https://github.com/rheit/zdoom	2016-12-25 22:56:35 +01:00