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 |
|
Patric Stout
|
04a3bf76e8
|
Codechange: upgrade Emscripten to 3.1.57 (#12526)
This also upgrades liblzma to 5.4.6, and uses the new ports.contrib
system Emscripten 3.1.56 introduced.
|
2024-04-18 19:37:33 +02:00 |
|
Jonathan G Rennison
|
fe730bce31
|
Merge branch 'master' into jgrpp
# Conflicts:
# .github/workflows/ci-build.yml
# .github/workflows/codeql.yml
# .github/workflows/release-linux.yml
# .github/workflows/release-macos.yml
# .github/workflows/release-windows.yml
# src/map.cpp
# src/music/midifile.hpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/pbs.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.h
# src/saveload/vehicle_sl.cpp
# src/script/api/script_text.cpp
# src/ship_cmd.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_func.h
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/viewport.cpp
# src/waypoint_cmd.cpp
|
2024-03-12 17:44:28 +00:00 |
|
Patric Stout
|
ee22fa34d7
|
Codechange: [CI] Split the ci-build into smaller components
|
2024-03-11 15:44:30 +01:00 |
|