Christoph Oelckers 1a8f11e01d Merge branch 'master' into powerslave ... # Conflicts: # source/build/src/sdlayer.cpp # source/common/menu/menu.cpp # source/sw/src/config.cpp # source/sw/src/game.cpp		2019-12-26 00:21:04 +01:00
..
formats	- SW sound WIP	2019-12-17 23:25:07 +01:00
bitmap.cpp	- fixed all compiler errors.	2019-10-18 19:06:57 +02:00
bitmap.h	- fixed all compiler errors.	2019-10-18 19:06:57 +02:00
buildtiles.cpp	Merge commit '40a533402e443a0de1673543642c892ab9c731fd' into powerslave	2019-12-25 19:24:55 +01:00
image.cpp	- cleaned out the remaining wrappers from cache1d.h and use the file system directly instead.	2019-12-07 10:49:23 +01:00
image.h	- Blood now also starts the first level without leaks.	2019-12-24 19:47:34 +01:00
imagehelpers.cpp	- update of new texture classes.	2019-10-14 23:11:01 +02:00
imagehelpers.h	- update of new texture classes.	2019-10-14 23:11:01 +02:00
imagetexture.cpp	- fixed all compiler errors.	2019-10-18 19:06:57 +02:00
skyboxtexture.cpp	- added stripped down versions of GZDoom's texture classes	2019-10-05 19:38:25 +02:00
skyboxtexture.h	- fixed all compiler errors.	2019-10-18 19:06:57 +02:00
texture.cpp	- added GZDoom's font code and some dependencies.	2019-10-24 01:20:58 +02:00
textureid.h	- added stripped down versions of GZDoom's texture classes	2019-10-05 19:38:25 +02:00
textures.h	Merge branch 'master' into powerslave	2019-12-13 20:43:23 +01:00