Jonathan G Rennison 5404be172c Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/core/bitmath_func.cpp
#	src/core/bitmath_func.hpp
#	src/core/geometry_type.hpp
#	src/game/game_text.hpp
#	src/graph_gui.cpp
#	src/pathfinder/npf/npf.cpp
#	src/script/api/script_text.cpp
#	src/spritecache.cpp
#	src/track_func.h

2024-01-25 22:36:01 +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

2024-01-25 22:36:01 +00:00

grf.hpp

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00:00

sprite_file_type.hpp

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00: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

Adding of _t to (u)int types, and WChar to char32_t

2024-01-07 17:20:41 +00:00