Christoph Oelckers 5784e45f41 Merge commit 'aa6bd8ffcc11c0ae3de1dae1ab530a999dd510c9' into whaven ... # Conflicts: # source/core/gameinput.h		2021-04-25 12:18:39 +02:00
..
buildtiles.cpp	- tileimportfromtexture and copytile.	2021-04-20 20:04:44 +02:00
buildtiles.h	Merge commit 'e89761d2d526581e4599f564b26a6eb983fd92ec' into whaven	2021-04-17 14:59:12 +02:00
hightile.cpp	- I shouldn't have used WT's skies as reference - they got front and back faces swapped.	2021-04-08 13:54:58 +02:00
skytexture.cpp	- fix sky palette in Polymost mode.	2021-04-22 22:03:16 +02:00