1838 Commits

Author	SHA1	Message	Date
Jonathan G Rennison	9565e5b9b1	Merge branch 'day_length-sx' into jgrpp ... Conflicts: src/lang/english.txt src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/timetable_cmd.cpp	2015-08-09 13:51:36 +01:00
Jonathan G Rennison	41062cf78e	Save/load changes for variable day length patch.	2015-08-09 13:50:06 +01:00
Jonathan G Rennison	454b3c61b0	Merge branch 'save_ext' into day_length-sx ... Conflicts: src/saveload/saveload.cpp	2015-08-09 12:10:05 +01:00
Jonathan G Rennison	d70dbda351	Merge branch 'master' into day_length	2015-08-09 12:04:23 +01:00
patch-import	d86a56cbef	Import day length patch ... Minor whitespace fixes. http://www.tt-forums.net/viewtopic.php?p=1148227#p1148227	2015-08-09 11:23:15 +01:00
Jonathan G Rennison	135d159fc1	Merge branch 'infrastructure_sharing-sx' into jgrpp	2015-08-07 22:02:59 +01:00
Jonathan G Rennison	e1defe24c7	Merge branch 'infrastructure_sharing' into infrastructure_sharing-sx ... Conflicts: src/table/settings.ini	2015-08-07 22:02:38 +01:00
Jonathan G Rennison	65b1586f98	Infra sharing: Fix sharing fee settings not being shown as currency. ... Settings were shown as (invalid string). Fix water/dock sharing fee setting using wrong string.	2015-08-07 22:01:16 +01:00
Jonathan G Rennison	4c6dc11c16	Merge branch 'infrastructure_sharing-sx' into jgrpp ... Conflicts: src/lang/english.txt src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/signal.cpp src/table/settings.ini src/vehicle.cpp	2015-08-06 23:11:49 +01:00
Jonathan G Rennison	b3ebb1f729	Infrastructure sharing patch: save/load changes.	2015-08-06 23:02:47 +01:00
Jonathan G Rennison	037cce3b38	Merge branch 'save_ext' into infrastructure_sharing-sx ... Conflicts: src/saveload/saveload.cpp	2015-08-06 23:01:01 +01:00
Jonathan G Rennison	a4ad4130a6	Merge branch 'master' into infrastructure_sharing ... Conflicts: src/aircraft_cmd.cpp src/economy.cpp src/lang/english.txt src/order_gui.cpp src/roadveh_cmd.cpp src/saveload/saveload.cpp src/settings.cpp src/settings_gui.cpp src/train_cmd.cpp	2015-08-06 22:55:09 +01:00
patch-import	ee791055f9	Import infrastructure sharing patch ... Strip trailing whitespace Remove a leftover line form settings.ini http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843	2015-08-06 22:24:28 +01:00
Jonathan G Rennison	7ed93f9211	Merge branch 'enhanced_viewport_overlay-sx' into jgrpp ... town_gui.cpp updated due to struct CommandContainer change. Conflicts: src/command.cpp src/command_type.h src/gfxinit.cpp src/openttd.cpp src/pbs.cpp src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/saveload/saveload.cpp src/stdafx.h src/train_cmd.cpp src/viewport_type.h src/window_type.h	2015-08-05 21:54:11 +01:00
Jonathan G Rennison	174779e371	Merge branch 'save_ext' into enhanced_viewport_overlay-sx ... Conflicts: src/saveload/saveload.cpp	2015-08-05 21:31:57 +01:00
Jonathan G Rennison	e24839ed65	Merge branch 'master' into enhanced_viewport_overlay ... Notes on conflict resolution: * MarkTileDirtyByTile gained an extra param on both sides of the merge Move bridge level offset to be after zoom level param, as it's used less. * Add zoom level params to MarkBridgeDirty functions * Fix undefined behaviour in colour_index cycling in ViewportMapDraw Conflicts: src/clear_cmd.cpp src/pbs.cpp src/rail_cmd.cpp src/toolbar_gui.cpp src/train_cmd.cpp src/vehicle.cpp src/viewport.cpp src/viewport_func.h	2015-08-05 21:25:13 +01:00
patch-import	536a95dfd0	Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch ... https://www.tt-forums.net/viewtopic.php?f=33&t=53394	2015-08-05 21:24:30 +01:00
Jonathan G Rennison	20e2f363f1	Merge branch 'vehicle_repair_costs-sx' into jgrpp ... Conflicts: src/lang/english.txt src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/settings_type.h	2015-08-04 23:59:12 +01:00
Jonathan G Rennison	6bb8d5087d	Vehicle repair costs patch: implement save/load changes.	2015-08-04 23:56:37 +01:00
Jonathan G Rennison	0a7441e56c	Merge branch 'save_ext' into vehicle_repair_costs-sx ... Conflicts: src/saveload/saveload.cpp src/settings_gui.cpp	2015-08-04 23:56:05 +01:00
patch-import	7537ae2a7e	Import vehicle repair costs patch ... Strip trailing whitespace http://www.tt-forums.net/viewtopic.php?p=1093268#p1093268	2015-08-04 23:38:35 +01:00
Jonathan G Rennison	ba4e5dd62f	Merge branch 'auto_timetables-sx' into jgrpp ... Conflicts: src/lang/english.txt src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/settings_gui.cpp src/vehicle.cpp	2015-08-04 22:08:59 +01:00
Jonathan G Rennison	2e45dac18a	Auto timetables patch: save/load changes, document rationale for ... moving addition to VehicleFlags	2015-08-04 22:07:02 +01:00
Jonathan G Rennison	33854a138f	Merge branch 'save_ext' into auto_timetables-sx	2015-08-04 21:30:30 +01:00
patch-import	80deb3c01d	Import auto timetable separation patch ... http://www.tt-forums.net/viewtopic.php?p=1140899#p1140899	2015-08-04 21:27:23 +01:00
Jonathan G Rennison	a8c2c394a5	Merge branch 'improved_breakdowns-sx' into jgrpp ... Conflicts: src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/settings_type.h	2015-08-02 23:43:19 +01:00
Jonathan G Rennison	e91d0e49dc	Improved breakdowns: Update save/load code	2015-08-02 23:16:33 +01:00
Jonathan G Rennison	d023d0863f	Merge branch 'save_ext' into improved_breakdowns-sx ... Conflicts: src/saveload/saveload.cpp	2015-08-02 23:01:56 +01:00
patch-import	9f5164b403	Import Improved Breakdowns patch ... Fix trailing whitespace http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419	2015-08-02 22:58:52 +01:00
Jonathan G Rennison	27c70542da	Merge branch 'signal_tunnels_bridges-sx' into jgrpp ... Conflicts: src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/settings_type.h src/signal.cpp	2015-08-02 18:45:32 +01:00
Jonathan G Rennison	8271acadb7	Merge branch 'show_veh_tunnel' into jgrpp	2015-08-02 18:25:08 +01:00
Jonathan G Rennison	9b4b170b2d	Merge branch 'town_cargo_adj-sx' into jgrpp ... Conflicts: src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h	2015-08-02 18:24:45 +01:00
Jonathan G Rennison	6452b0fe02	Merge branch 'departure-boards-sx' into jgrpp ... Conflicts: src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/window_type.h	2015-08-02 18:23:25 +01:00
Jonathan G Rennison	6596ba216c	Merge branch 'zoning' into jgrpp ... Conflicts: src/table/sprites.h	2015-08-02 18:20:23 +01:00
Jonathan G Rennison	0afc054bff	Merge branch 'adjacent_crossings-sx' into jgrpp ... Conflicts: src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h	2015-08-02 18:18:41 +01:00
Jonathan G Rennison	09be8afd8d	Adjacent crossings: add setting (in PATX), add info to SLXI chunk.	2015-08-02 17:49:25 +01:00
Jonathan G Rennison	03373c7ef4	Zoning: Remove unimplemented modes, fix some whitespace and style issues, ... add missing licence headers, move/rename some declarations, fix sprite ID allocation, update to build on trunk.	2015-08-02 13:17:42 +01:00
patch-import	6de087786c	Import and rebase zoning patch ... Fix some of the whitespace issues http://www.tt-forums.net/viewtopic.php?p=888801#p888801	2015-08-02 13:17:42 +01:00
Jonathan G Rennison	08dc95fea1	Add town cargo patch SLXI/PATX code. ... Update setting string.	2015-08-02 00:59:40 +01:00
Jonathan G Rennison	9905e478d4	Merge branch 'save_ext' into town_cargo_adj-sx	2015-08-02 00:05:01 +01:00
Jonathan G Rennison	60377f2262	Merge branch 'master' into town_cargo_adj ... Conflicts: src/settings_gui.cpp	2015-08-02 00:04:04 +01:00
patch-import	1c9801e6b6	Import town cargo generation factor patch ... Adjust whitespace http://www.tt-forums.net/viewtopic.php?f=33&t=46399&start=200#p1086221	2015-08-01 23:56:58 +01:00
Jonathan G Rennison	09aa29de8b	Add signals on bridges/tunnels SLXI info, move setting to PATX.	2015-08-01 21:41:44 +01:00
Jonathan G Rennison	00f9f75d34	Merge branch 'save_ext' into departure-boards-sx	2015-08-01 20:40:49 +01:00
Jonathan G Rennison	526cb42608	Merge branch 'master' into depature-boards ... Conflicts: src/table/strgen_tables.h	2015-08-01 20:39:16 +01:00
Jonathan G Rennison	9f79c555da	Merge branch 'save_ext' into signal_tunnels_bridges-sx	2015-08-01 20:27:19 +01:00
patch-import	59b0b18aa2	Import signals on tunnels and bridges patch ... http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215	2015-08-01 20:25:59 +01:00
patch-import	79138de1b9	Import departure boards patch	2015-08-01 19:48:19 +01:00
Jonathan G Rennison	de14c210db	Add progsigs info to SLXI chunk, move setting to PATX chunk.	2015-08-01 18:21:34 +01:00
Jonathan G Rennison	b1d8bcfe35	Merge branch 'save_ext' into progsig-sx ... Conflicts: source.list src/saveload/saveload.cpp	2015-08-01 17:21:38 +01:00