openttd

Files

Jonathan G Rennison 7f6b1d6b94 Merge branch 'master' into jgrpp

# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini

2024-01-05 13:37:52 +00:00

array.hpp

Merge branch 'master' into jgrpp

2024-01-05 13:37:52 +00:00

binaryheap.hpp

Fix: Globally apply preprocessor directive coding style

2020-07-03 09:08:46 +02:00

CMakeLists.txt

Change: [Network] Transfer command data as serialized byte stream without fixed structure.

2021-12-16 22:28:32 +01:00

countedobj.cpp

Codechange: automatic adding of _t to (u)int types, and WChar to char32_t