Jonathan G Rennison 0310fb0cdc Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/lang/czech.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/order_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship.h
#	src/vehicle.cpp

2023-01-05 23:45:34 +00: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

2023-01-05 23:45:34 +00:00

grf.hpp

Fix #9804: Only apply sprite_zoom_min setting when sprites available (#9988)

2022-09-21 12:37:11 +02: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

Fix #9804: Only apply sprite_zoom_min setting when sprites available (#9988)

2022-09-21 12:37:11 +02:00