Jonathan G Rennison da282c3ecc Merge branch 'master' into jgrpp-beta ...

# Conflicts:
#	.github/workflows/ci-build.yml
#	CMakeLists.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/misc_gui.cpp
#	src/newgrf.cpp

2021-10-28 23:51:24 +01:00

..

CMakeLists.txt

Codechange: introduce SpriteFile to be used by the sprite loader instead of the global FIO slot functionality

2021-05-30 22:02:14 +01:00

grf.cpp

Merge branch 'master' into jgrpp-beta

2021-10-28 23:51:24 +01:00

grf.hpp

Avoid reading non-32bpp sprites twice where possible

2021-05-30 22:02:14 +01:00

sprite_file_type.hpp

Implement custom sprite detection with new sprite mechanism

2021-05-30 22:02:14 +01:00

sprite_file.cpp

Codechange: introduce SpriteFile to be used by the sprite loader instead of the global FIO slot functionality

2021-05-30 22:02:14 +01:00

spriteloader.hpp

Avoid reading non-32bpp sprites twice where possible

2021-05-30 22:02:14 +01:00