Jonathan G Rennison b8328ad21f Merge branch 'tracerestrict-sx' into jgrpp ...

# Conflicts:
#	src/command.cpp
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/extended_ver_sl.cpp
#	src/settings_gui.cpp
#	src/tracerestrict.cpp
#	src/tracerestrict.h
#	src/tracerestrict_gui.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
#	src/vehiclelist.cpp
#	src/window_type.h

2017-04-05 19:00:24 +01:00

..

afterload.cpp

Merge branch 'save_ext' into tracerestrict-sx

2017-03-20 19:18:34 +00:00

ai_sl.cpp

(svn r26493) -Codechange: use strecat to concatenate script settings instead of manually accounting for the amount of characters that has been written

2014-04-24 04:41:54 +00:00

airport_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

animated_tile_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

autoreplace_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

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

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

cargopacket_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

cheat_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

company_sl.cpp

Merge branch 'master' into save_ext

2017-03-19 12:12:52 +00:00

depot_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

economy_sl.cpp

Remove save-only autolength flag from economy chunk handlers

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

engine_sl.cpp

(svn r27243) -Fix (r26816) [FS#6285]: Duplicate frees due to pool item classes not having copy constructors.

2015-04-23 20:07:07 +00:00

extended_ver_sl.cpp

Merge branch 'tracerestrict-sx' into jgrpp

2017-04-05 19:00:24 +01:00

extended_ver_sl.h

Merge branch 'save_ext' into tracerestrict-sx

2017-03-20 19:18:34 +00:00

game_sl.cpp

(svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments

2014-10-12 18:41:53 +00:00

gamelog_sl.cpp

No longer truncate savegame version in gamelog.

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

goal_sl.cpp

(svn r26593) -Fix: Goals were saved/loaded with incorrect size.

2014-05-17 17:18:07 +00:00

group_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

industry_sl.cpp

(svn r27291) -Fix (r27278) [FS#6303]: Some savegame data was discarded again during loading.

2015-05-21 18:59:11 +00:00

labelmaps_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

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

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

oldloader_sl.cpp

(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.

2016-10-16 14:59:44 +00:00

oldloader.cpp

Fix file descriptor leak in LoadOldSaveGame

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

oldloader.h

…

order_sl.cpp

Merge branch 'cargo_type_order' into jgrpp

2016-09-08 00:12:48 +01:00

plans_sl.cpp

Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch

2015-08-05 21:24:30 +01:00

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 'save_ext' into jgrpp

2017-04-01 01:14:28 +01:00

saveload.h

Merge branch 'save_ext' into jgrpp

2017-04-01 01:14:28 +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

(svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR)

2017-03-05 17:06:14 +00:00

storage_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

story_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

strings_sl.cpp

(svn r27756) -Codechange: Add StringTab enum

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

subsidy_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00

tbtr_template_replacement_sl.cpp

Squashed commit of the following:

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

tbtr_template_veh_sl.cpp

TBTR: Handle leftover template vehicles without owners in old saves.

2017-01-21 01:40:26 +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 'vehicle_group_info' into jgrpp

2017-04-01 01:02:22 +01:00

waypoint_sl.cpp

(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values

2014-04-23 20:13:33 +00:00