You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/src/spriteloader
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
3 years ago
..
CMakeLists.txt Codechange: introduce SpriteFile to be used by the sprite loader instead of the global FIO slot functionality 3 years ago
grf.cpp Merge branch 'master' into jgrpp-beta 3 years ago
grf.hpp Avoid reading non-32bpp sprites twice where possible 3 years ago
sprite_file.cpp Codechange: introduce SpriteFile to be used by the sprite loader instead of the global FIO slot functionality 3 years ago
sprite_file_type.hpp Implement custom sprite detection with new sprite mechanism 3 years ago
spriteloader.hpp Avoid reading non-32bpp sprites twice where possible 3 years ago