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
..
blood	- disable palette transparency for color 255 when running an animation.	2019-12-25 14:13:15 +01:00
build	Merge branch 'master' into powerslave	2019-12-26 00:21:04 +01:00
common	Merge branch 'master' into powerslave	2019-12-26 00:21:04 +01:00
duke3d	- fixed extended quote management.	2019-12-25 17:13:36 +01:00
exhumed	Merge branch 'master' into powerslave	2019-12-26 00:21:04 +01:00
glbackend	- disable palette transparency for color 255 when running an animation.	2019-12-25 14:13:15 +01:00
libsmackerdec	NBlood: Remove std::string from libsmackerdec to fix cutscene crashing with MinGW builds.	2019-12-25 09:02:18 +01:00
platform	- fixed extended quote management.	2019-12-25 17:13:36 +01:00
rr	Merge branch 'master' into powerslave	2019-12-26 00:21:04 +01:00
sw	Merge branch 'master' into powerslave	2019-12-26 00:21:04 +01:00
thirdparty	- added the GL framebuffer class.	2019-12-23 15:40:17 +01:00
CMakeLists.txt	Merge branch 'master' into powerslave	2019-12-26 00:21:04 +01:00
g_pch.h	- fixed most issues with newly added music files	2019-11-11 01:01:18 +01:00
gitinfo.cpp	- rewrote the screenshot code to use m_png as its backend.	2019-11-02 12:59:59 +01:00