Christoph Oelckers 671d200aa7 Merge branch 'master' into whaven ... # Conflicts: # source/build/include/buildtypes.h # source/core/console/c_notifybuffer.cpp # source/core/d_protocol.h # source/core/version.h # wadsrc/static/zscript.txt		2021-05-16 13:03:17 +02:00
..
buildtiles.cpp	- fixed the remaining warnings.	2021-05-12 21:50:01 +02:00
buildtiles.h	Merge commit 'e89761d2d526581e4599f564b26a6eb983fd92ec' into whaven	2021-04-17 14:59:12 +02:00
hightile.cpp	- fixed the remaining warnings.	2021-05-12 21:50:01 +02:00
skytexture.cpp	- fix sky palette in Polymost mode.	2021-04-22 22:03:16 +02:00