Christoph Oelckers 6bfbe30b99 Merge branch 'master' of https://github.com/rheit/zdoom ... # Conflicts: # src/CMakeLists.txt # src/g_level.cpp # src/p_saveg.cpp # src/r_defs.h # src/version.h (note that this commit will not compile!)		2016-09-24 00:40:15 +02:00
..
actors	Merge branch 'master' of https://github.com/rheit/zdoom	2016-09-24 00:40:15 +02:00
filter	- fixed: Checking for quest item 0 should not print an error message but silently fail.	2016-07-03 13:32:40 +02:00
glstuff	- cleaned up the clip plane management for portals.	2016-04-27 00:41:00 +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	Quick fix: prevents negative values being passed to pow.	2016-09-22 09:23:26 +02:00
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	- update xlat/eternity.txt for reference.	2016-08-03 13:16:14 +02:00
althudcf.txt	Normalize line endings	2016-03-01 09:47:10 -06:00
animated.lmp
animdefs.txt	Normalize line endings	2016-03-01 09:47:10 -06:00
compatibility.txt	Merge branch 'master' of https://github.com/rheit/zdoom	2016-08-09 20:15:35 +02:00
confont.lmp	Updated console font by GFD.	2016-02-14 09:27:20 +01:00
dbigfont.lmp
decaldef.txt	Normalize line endings	2016-03-01 09:47:10 -06:00
decorate.txt	- integrated dynamic light definitions into regular DECORATE as another include.	2016-09-22 09:32:04 +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
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	Implement wide side-by-side mode, using adjusted aspect ratio in projection matrix.	2016-09-22 09:25:46 +02: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	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/rheit/zdoom	2016-09-22 09:06:34 +02:00
menudef.zz	- integrated dynamic light definitions into regular DECORATE as another include.	2016-09-22 09:32:04 +02:00
netnotch.dat
notch.dat
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
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
spalhtic.lmp
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
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