You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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		2 months ago
..
compat	Revert #11993: new number format system does not and cannot work for CJK languages	3 months ago
CMakeLists.txt	Merge branch 'master' into jgrpp	3 months ago
afterload.cpp	Merge branch 'master' into jgrpp	2 months ago
ai_sl.cpp	Merge branch 'master' into jgrpp	3 months ago
airport_sl.cpp	…
animated_tile_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
autoreplace_sl.cpp	…
cargomonitor_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
cargopacket_sl.cpp	Codechange: Use iterators and/or range-for on cargo related loops.	7 months ago
cheat_sl.cpp	Merge branch 'master' into jgrpp	6 months ago
company_sl.cpp	Merge branch 'master' into jgrpp	3 months ago
depot_sl.cpp	…
economy_sl.cpp	…
engine_sl.cpp	Codechange: coding style fixes	5 months ago
game_sl.cpp	Merge branch 'master' into jgrpp	3 months ago
gamelog_sl.cpp	Use upstream/table format for game log chunk	3 months ago
goal_sl.cpp	…
group_sl.cpp	…
industry_sl.cpp	Split date types into calendar and economy dates	3 months ago
labelmaps_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
league_sl.cpp	…
linkgraph_sl.cpp	Change link graph join and compression times to use scaled tick counter	3 months ago
map_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
misc_sl.cpp	Split date types into calendar and economy dates	3 months ago
newgrf_sl.cpp	…
newgrf_sl.h	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
object_sl.cpp	…
order_sl.cpp	Adding of _t to (u)int types, and WChar to char32_t	4 months ago
randomizer_sl.cpp	Merge branch 'master' into jgrpp	3 months ago
saveload.cpp	Merge branch 'master' into jgrpp	3 months ago
saveload.h	Fix #12010: Use economy timer for vehicle stats minimum age, not calendar (#12142)	2 months ago
settings_sl.cpp	Merge branch 'master' into jgrpp	2 months ago
signs_sl.cpp	…
station_sl.cpp	Merge branch 'master' into jgrpp	2 months ago
storage_sl.cpp	…
story_sl.cpp	Use upstream save/load for various unchanged chunks	3 months ago
subsidy_sl.cpp	…
town_sl.cpp	Merge tag '14.0-beta2' into jgrpp	3 months ago
vehicle_sl.cpp	Merge branch 'master' into jgrpp	2 months ago
water_regions_sl.cpp	Merge branch 'master' into jgrpp	3 months ago