Jonathan G Rennison cfebbfac8c Merge branch 'master' into jgrpp ...

# Conflicts:
#	src/autoreplace_cmd.cpp
#	src/company_base.h
#	src/company_gui.cpp
#	src/cpu.cpp
#	src/debug.h
#	src/group.h
#	src/group_cmd.cpp
#	src/house.h
#	src/industry.h
#	src/newgrf_house.cpp
#	src/news_type.h
#	src/openttd.cpp
#	src/saveload/company_sl.cpp
#	src/settings_type.h
#	src/sl/oldloader_sl.cpp
#	src/story.cpp
#	src/table/town_land.h
#	src/viewport.cpp

2024-02-09 18:50:49 +00:00

..

compat

Fix b0e73277: save/load next_station for CargoPacket again

2023-10-01 23:50:23 +01:00

afterload.cpp

Merge branch 'master' into jgrpp

2024-02-09 18:50:49 +00:00

ai_sl.cpp

Merge branch 'master' into jgrpp

2023-07-01 02:42:51 +01:00

airport_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

animated_tile_sl.cpp

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

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

autoreplace_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

cargomonitor_sl.cpp

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

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

cargopacket_sl.cpp

Codechange: Use iterators and/or range-for on cargo related loops.

2023-10-19 17:03:25 +01:00

cheat_sl.cpp

Merge branch 'master' into jgrpp

2023-11-25 14:14:00 +00:00

CMakeLists.txt

Merge branch 'master' into jgrpp

2024-01-09 18:36:47 +00:00

company_sl.cpp

Merge branch 'master' into jgrpp

2024-02-09 18:50:49 +00:00

depot_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

economy_sl.cpp

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

2023-07-19 19:30:14 +02:00

engine_sl.cpp

Codechange: coding style fixes

2024-01-04 16:23:54 +01:00

game_sl.cpp

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

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

gamelog_sl.cpp

Codechange: do not make a string valid in place, to then copy it

2023-07-06 19:59:50 +02:00

goal_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

group_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

industry_sl.cpp

Merge branch 'master' into jgrpp

2023-11-19 13:00:21 +00:00

labelmaps_sl.cpp

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

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

league_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

linkgraph_sl.cpp

Increase DateTicks to 64 bits, fix overflow after year 79455

2024-01-09 00:13:28 +00:00

map_sl.cpp

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

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

misc_sl.cpp

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

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

newgrf_sl.cpp

Change gamelog to use std::vector

2023-07-03 22:42:59 +01:00

newgrf_sl.h

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

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

object_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

order_sl.cpp

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

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

saveload.cpp

Merge branch 'master' into jgrpp

2024-01-09 18:36:47 +00:00

saveload.h

Merge branch 'master' into jgrpp

2024-01-25 18:37:23 +00:00

settings_sl.cpp

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

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

signs_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

station_sl.cpp

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

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

storage_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

story_sl.cpp

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

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

subsidy_sl.cpp

Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/

2023-06-08 00:01:40 +01:00

town_sl.cpp

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

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

vehicle_sl.cpp

Use DateTicksScaled for Vehicle::last_loading_tick

2024-01-27 16:38:27 +00:00

water_regions_sl.cpp

Merge branch 'master' into jgrpp

2024-02-09 18:50:49 +00:00