Jonathan G Rennison 15f4e62936 Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/network/network.cpp
#	src/pathfinder/yapf/yapf.h
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/station_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp

2024-07-06 18:24:53 +01:00

..

emscripten

Codechange: upgrade Emscripten to 3.1.57 (#12526)

2024-04-18 19:37:33 +02:00

linux

Fix: [CI] patch in SHF_COMPRESSED symbol for our Linux Generic binaries (#11651)

2023-12-30 14:40:09 +01:00

macosx

Merge branch 'master' into jgrpp

2023-09-12 20:06:47 +01:00

steam

Add: [Actions] Automatically upload releases to Steam (#8644)

2021-02-05 20:58:15 +01:00

windows

Merge branch 'master' into jgrpp

2024-05-28 20:33:35 +01:00