gzdoom-gles/wadsrc/static
Christoph Oelckers a96d6ab072 Merge remote-tracking branch 'remotes/zdoom/master'
# Conflicts:
#	src/g_level.cpp
#	src/p_3dfloors.cpp
#	src/p_lnspec.cpp
#	src/p_saveg.cpp
#	src/p_spec.cpp
#	src/r_bsp.cpp
#	src/r_data/r_interpolate.cpp
#	src/r_data/r_translate.cpp
#	src/r_data/sprites.cpp
#	src/r_defs.h
#	src/r_sky.h
#	src/stats.h
#	src/textures/texturemanager.cpp
#	src/textures/textures.h
#	src/version.h
#	src/win32/fb_d3d9.cpp
#	src/win32/hardware.cpp
#	src/win32/i_system.cpp
#	wadsrc/static/actors/doom/doomarmor.txt
#	wadsrc/static/compatibility.txt
#	wadsrc/static/language.enu
#	wadsrc/static/mapinfo/common.txt
#	wadsrc/static/menudef.txt
#	wadsrc/static/xlat/eternity.txt
2016-03-01 18:50:45 +01:00
..
actors Merge remote-tracking branch 'remotes/zdoom/master' 2016-03-01 18:50:45 +01:00
filter Normalize line endings 2016-03-01 09:47:10 -06:00
glstuff - removed texture based dynamic lighting. For GL 3.x the shader approach is always better. 2014-07-15 20:49:21 +02:00
graphics Move extra font characters into filter directories 2016-02-04 13:23:36 -06:00
maparrows Normalize line endings 2016-03-01 09:47:10 -06:00
mapinfo Merge remote-tracking branch 'remotes/zdoom/master' 2016-03-01 18:50:45 +01:00
sbarinfo Normalize line endings 2016-03-01 09:47:10 -06:00
shaders Merge remote-tracking branch 'remotes/zdoom/master' 2016-03-01 18:50:45 +01:00
sounds - Reprocess all sounds with flac 1.2.1. 2009-09-15 01:55:36 +00:00
sprites - added pickup sprite for Chex Quest's Mini Zorcher (i.e. pistol replacement.) 2015-04-27 10:24:49 +02:00
textures About a week's worth of changes here. As a heads-up, I wouldn't be 2008-07-23 04:57:26 +00:00
xlat Merge remote-tracking branch 'remotes/zdoom/master' 2016-03-01 18:50:45 +01:00
althudcf.txt Normalize line endings 2016-03-01 09:47:10 -06:00
animated.lmp About a week's worth of changes here. As a heads-up, I wouldn't be 2008-07-23 04:57:26 +00:00
animdefs.txt Normalize line endings 2016-03-01 09:47:10 -06:00
compatibility.txt Merge remote-tracking branch 'remotes/zdoom/master' 2016-03-01 18:50:45 +01:00
confont.lmp Updated console font by GFD. 2016-02-14 09:27:20 +01:00
dbigfont.lmp About a week's worth of changes here. As a heads-up, I wouldn't be 2008-07-23 04:57:26 +00:00
decaldef.txt Normalize line endings 2016-03-01 09:47:10 -06:00
decorate.txt Normalize line endings 2016-03-01 09:47:10 -06:00
decorate.z - add dynamic lights to editor number table and remove them from DECORATE definitions. 2015-04-04 10:42:44 +02:00
defbinds.txt Externalized default key bindings 2015-04-05 21:40:53 -05:00
dehsupp.txt Normalize line endings 2016-03-01 09:47:10 -06:00
etc.h.txt Normalize line endings 2016-03-01 09:47:10 -06:00
fontdefs.txt Normalize line endings 2016-03-01 09:47:10 -06:00
in_epi1.txt Normalize line endings 2016-03-01 09:47:10 -06:00
in_epi2.txt Normalize line endings 2016-03-01 09:47:10 -06:00
in_epi3.txt Normalize line endings 2016-03-01 09:47:10 -06:00
in_htc1.txt Normalize line endings 2016-03-01 09:47:10 -06:00
in_htc2.txt Normalize line endings 2016-03-01 09:47:10 -06:00
in_htc3.txt Normalize line endings 2016-03-01 09:47:10 -06:00
indexfont - fixed some incorrect file names in the new WADSRC directory and deleted obsolete makefiles. 2008-07-23 15:32:18 +00:00
iwadinfo.txt Normalize line endings 2016-03-01 09:47:10 -06:00
language.eng Converted all of the strings in menudef into language strings. 2016-02-20 20:04:29 +01:00
language.enu Merge remote-tracking branch 'remotes/zdoom/master' 2016-03-01 18:50:45 +01:00
language.fr Normalize line endings 2016-03-01 09:47:10 -06:00
language.ita Normalize line endings 2016-03-01 09:47:10 -06:00
language.ptb Normalize line endings 2016-03-01 09:47:10 -06:00
lockdefs.txt Normalize line endings 2016-03-01 09:47:10 -06:00
menudef.txt Merge remote-tracking branch 'remotes/zdoom/master' 2016-03-01 18:50:45 +01:00
menudef.z Merge branch 'master' of https://github.com/coelckers/gzdoom into stereo3d 2015-12-30 17:41:49 -05: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 Normalize line endings 2016-03-01 09:47:10 -06:00
sbarinfo.txt Normalize line endings 2016-03-01 09:47:10 -06:00
sbigfont.lmp About a week's worth of changes here. As a heads-up, I wouldn't be 2008-07-23 04:57:26 +00:00
sndinfo.txt Normalize line endings 2016-03-01 09:47:10 -06:00
sndseq.txt Normalize line endings 2016-03-01 09:47:10 -06:00
spaldoom.lmp About a week's worth of changes here. As a heads-up, I wouldn't be 2008-07-23 04:57:26 +00:00
spalhtic.lmp About a week's worth of changes here. As a heads-up, I wouldn't be 2008-07-23 04:57:26 +00:00
teaminfo.txt Normalize line endings 2016-03-01 09:47:10 -06:00
terrain.txt Normalize line endings 2016-03-01 09:47:10 -06:00
textcolors.txt Normalize line endings 2016-03-01 09:47:10 -06:00
textures.txt Normalize line endings 2016-03-01 09:47:10 -06:00
things.h.txt Normalize line endings 2016-03-01 09:47:10 -06:00
vga-rom-font.16 About a week's worth of changes here. As a heads-up, I wouldn't be 2008-07-23 04:57:26 +00:00
x11r6rgb.txt Normalize line endings 2016-03-01 09:47:10 -06:00
xhairs.txt Normalize line endings 2016-03-01 09:47:10 -06:00