Jonathan G Rennison 8581808952 Merge tag '14.0-beta2' into jgrpp ...

# Conflicts:
#	CMakeLists.txt
#	src/cargotype.cpp
#	src/console_cmds.cpp
#	src/graph_gui.cpp
#	src/industry_cmd.cpp
#	src/industrytype.h
#	src/misc_gui.cpp
#	src/network/network_client.cpp
#	src/newgrf.cpp
#	src/newgrf_town.cpp
#	src/object_cmd.cpp
#	src/openttd.cpp
#	src/pathfinder/water_regions.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/table/build_industry.h
#	src/table/engines.h
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/vehicle_gui.cpp

2024-02-19 03:23:19 +00:00

..

compat

Merge tag '14.0-beta1' into jgrpp

2024-02-18 22:22:29 +00:00

afterload.cpp

Fix order flags collision in OT_GOTO_DEPOT

2024-02-19 00:41:05 +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-17 11:53:35 +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

Use upstream/table format for game log chunk

2024-02-11 16:34:03 +00: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

Split date types into calendar and economy dates

2024-02-13 21:34:09 +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

Change link graph join and compression times to use scaled tick counter

2024-02-15 02:05:27 +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

Split date types into calendar and economy dates

2024-02-13 21:34:09 +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 tag '14.0-beta1' into jgrpp

2024-02-18 22:22:29 +00:00

saveload.h

Codechange: use std::shared_ptr to manage saveload filters instead of manually trying to avoid double frees

2024-02-03 21:38:33 +01: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

Merge tag '14.0-beta2' into jgrpp

2024-02-19 03:23:19 +00:00

vehicle_sl.cpp

Merge tag '14.0-beta1' into jgrpp

2024-02-18 22:22:29 +00:00

water_regions_sl.cpp

Merge branch 'master' into jgrpp

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