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

# Conflicts:
#	src/debug.cpp
#	src/saveload/afterload.cpp
#	src/saveload/saveload.cpp
#	src/settings_type.h
#	src/town_cmd.cpp
#	src/window.cpp

2018-05-03 23:54:51 +01:00

..

afterload.cpp

Merge branch 'master' into jgrpp

2018-05-03 23:54:51 +01:00

ai_sl.cpp

…

airport_sl.cpp

…

animated_tile_sl.cpp

Codechange: Use a SmallVec for the animated tile list instead of replicating most of the logic.

2018-04-15 20:49:29 +02:00

autoreplace_sl.cpp

…

bridge_signal_sl.cpp

Extend bridge signal simulation to support an unlimited no. of signals.

2016-09-18 20:06:59 +01:00

cargomonitor_sl.cpp

…

cargopacket_sl.cpp

Pay all cargo payment incomes when cargo finally delivered

2018-01-26 18:28:57 +00:00

cheat_sl.cpp

…

company_sl.cpp

Merge branch 'save_ext' into infrastructure_sharing

2018-01-26 18:18:46 +00:00

depot_sl.cpp

Add support for loading SpringPP v2.3, v2.4 savegames

2017-06-14 00:26:52 +01:00

economy_sl.cpp

Remove save-only autolength flag from economy chunk handlers

2016-09-07 18:47:32 +01:00

engine_sl.cpp

…

extended_ver_sl.cpp

First implementation of conditional order checking slot occupancy

2018-04-22 15:03:16 +01:00

extended_ver_sl.h

First implementation of conditional order checking slot occupancy

2018-04-22 15:03:16 +01:00

game_sl.cpp

…

gamelog_sl.cpp

No longer truncate savegame version in gamelog.

2016-09-08 21:22:39 +01:00

goal_sl.cpp

…

group_sl.cpp

…

industry_sl.cpp

(svn r27929) -Cleanup: Remove unused Industry::random_triggers

2017-10-25 15:38:19 +00:00

labelmaps_sl.cpp

…

linkgraph_sl.cpp

Add setting for linkgraph times to be in non daylength scaled days.

2016-01-29 00:26:47 +00:00

map_sl.cpp

Show error message instead of aborting when loading an invalid map size.

2015-09-12 13:33:35 +01:00

misc_sl.cpp

Merge branch 'day_length' into jgrpp

2016-10-11 00:45:01 +01:00

newgrf_sl.cpp

(svn r27772) -Fix [FS#5819]: If the intro game had a savegame version which contains a NewGRF configuration, then townname NewGRFs would not be activated in the game options.

2017-03-07 20:18:54 +00:00

newgrf_sl.h

…

object_sl.cpp

…

oldloader_sl.cpp

Merge branches 'crashlog_improvements', 'save_ext', 'version_utils' into jgrpp

2018-04-27 02:42:20 +01:00

oldloader.cpp

Fix file descriptor leak in LoadOldSaveGame

2016-09-07 19:15:04 +01:00

oldloader.h

…

order_sl.cpp

Add extra data fields to Order extended data

2018-04-22 12:58:50 +01:00

plans_sl.cpp

…

saveload_filter.h

…

saveload_internal.h

Merge branch 'template_train_replacement-sx' into jgrpp

2016-02-16 21:08:21 +00:00

saveload.cpp

Merge branch 'master' into jgrpp

2018-05-03 23:54:51 +01:00

saveload.h

Allow building multiple docks per station.

2017-09-20 19:11:48 +01:00

signal_sl.cpp

Progsig: Fix some benign compiler warnings and whitespace issues.

2015-08-16 16:57:24 +01:00

signs_sl.cpp

(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.

2016-09-04 12:57:43 +00:00

station_sl.cpp

Update multiple docks to use savegame framework, fix merge conflicts

2017-09-20 19:50:53 +01:00

storage_sl.cpp

…

story_sl.cpp

…

strings_sl.cpp

(svn r27756) -Codechange: Add StringTab enum

2017-02-26 19:40:53 +00:00

subsidy_sl.cpp

…

tbtr_template_replacement_sl.cpp

Squashed commit of the following:

2016-02-13 19:26:47 +00:00

tbtr_template_veh_sl.cpp

TBTR: Whitespace fix

2018-01-19 19:12:11 +00:00

town_sl.cpp

Merge branch 'master' into jgrpp

2017-02-28 00:15:45 +00:00

tracerestrict_sl.cpp

Initial implementation of trace restrict slots

2017-03-30 21:14:14 +01:00

tunnel_sl.cpp

Chunnel: Use hash table for tunnel search, change tunnel fields and savegame format.

2017-03-05 14:39:10 +00:00

vehicle_sl.cpp

Merge branch 'master' into jgrpp

2018-05-03 23:54:51 +01:00

waypoint_sl.cpp

…