Christoph Oelckers 56eda9928c Merge commit 'ba90f444ddc85aaafab595915353362f6e181855' into whaven ... # Conflicts: # source/core/gameinput.h		2021-04-05 14:12:44 +02:00
..
buildtiles.cpp	- fixed tileImportFromTexture.	2021-04-04 21:00:41 +02:00
buildtiles.h	Merge branch 'master' into witchaven2	2021-01-01 17:32:32 +11:00
hightile.cpp	- use real fog, even in palette emulation mode.	2021-02-27 13:30:52 +01:00
skytexture.cpp	- fixed cases of small textures being used for the sky.	2021-03-29 23:25:43 +02:00