3447 Commits

Author	SHA1	Message	Date
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	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	33854a138f	Merge branch 'save_ext' into auto_timetables-sx	2015-08-04 21:30:30 +01:00
Jonathan G Rennison	0ebf8b6b0b	Fixes to auto timetable patch: move new VehicleFlags to end, ... whitespace & style, fix lang strings.	2015-08-04 21:29:19 +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	163423e7b5	Merge branch 'tracerestrict-sx' into jgrpp ... Conflicts: src/saveload/extended_ver_sl.cpp	2015-08-04 19:16:37 +01:00
Jonathan G Rennison	c4565f6bb0	Merge branch 'tracerestrict' into tracerestrict-sx	2015-08-04 19:14:57 +01:00
Jonathan G Rennison	76707fb72a	Change pf penalty restriction value button to preset values and a custom option. ... Preset values are 'small', 'medium' and 'large'. Change default to 'small' preset.	2015-08-04 19:09:40 +01:00
Jonathan G Rennison	c7f4b3fe6f	Merge branch 'smallmap-screenshot' into jgrpp	2015-08-04 02:03:31 +01:00
Jonathan G Rennison	948b4e1d5e	Implement taking smallmap screenshots. ... This is largely based on this patch: http://www.tt-forums.net/viewtopic.php?p=849533#p849533 with the following changes: * this uses a button in the smallmap window instead of a console command * screenshot now uses zoom level and mode of smallmap window	2015-08-04 01:26:32 +01:00
Jonathan G Rennison	ce34225b0e	Merge branch 'house_placing' into jgrpp	2015-08-03 21:29:22 +01:00
patch-import	19dcbb1cb9	Import Picking and placing single houses in scenario editor patch ... Minor whitespace fixes http://www.tt-forums.net/viewtopic.php?f=33&t=68894&view=unread#p1099696	2015-08-03 21:29:13 +01:00
Jonathan G Rennison	675993805b	Merge branch 'tracerestrict-sx' into jgrpp	2015-08-03 20:41:00 +01:00
Jonathan G Rennison	09f8ff420f	Merge branch 'tracerestrict' into tracerestrict-sx ... Conflicts: src/tracerestrict_gui.cpp	2015-08-03 20:40:42 +01:00
Jonathan G Rennison	a0520b8937	Initial implementation of PBS entry signal condition variable. ... TODO: see how the efficiency of this can be improved.	2015-08-03 20:28:42 +01:00
Jonathan G Rennison	a2eac188de	Merge branches 'save_ext', 'tracerestrict-sx', 'departure-boards-sx', 'town_cargo_adj-sx', 'signal_tunnels_bridges-sx', 'adjacent_crossings-sx' and 'progsig-sx' into jgrpp	2015-08-03 00:39:01 +01:00
Jonathan G Rennison	bc8b2d9826	Merge branch 'save_ext' into tracerestrict-sx	2015-08-03 00:14:51 +01:00
Jonathan G Rennison	77ec2aac58	Merge branch 'save_ext' into progsig-sx	2015-08-03 00:14:12 +01:00
Jonathan G Rennison	8fe9a7430c	Merge branch 'save_ext' into departure-boards-sx	2015-08-03 00:12:38 +01:00
Jonathan G Rennison	012ce322d5	Merge branch 'save_ext' into town_cargo_adj-sx	2015-08-03 00:12:21 +01:00
Jonathan G Rennison	6ac6759b00	Merge branch 'save_ext' into signal_tunnels_bridges-sx	2015-08-03 00:11:54 +01:00
Jonathan G Rennison	7cc71ce2a5	Merge branch 'save_ext' into adjacent_crossings-sx	2015-08-03 00:10:32 +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	d023d0863f	Merge branch 'save_ext' into improved_breakdowns-sx ... Conflicts: src/saveload/saveload.cpp	2015-08-02 23:01:56 +01:00
Jonathan G Rennison	80d52eb20e	Improved breakdowns patch: fix various issues ... * Whitespace/formatting * Fix setting lang string * Fix spelling of VRF_TO_HEAVY	2015-08-02 23:00:39 +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	3c9c0acba1	Merge branch 'measurement_tool' into jgrpp	2015-08-02 21:06:39 +01:00
patch-import	9dfdd8bce8	Import measurement patch ... http://www.tt-forums.net/viewtopic.php?p=1086160#p1086160	2015-08-02 21:04:46 +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
translators	163c30570b	(svn r27358) -Update from WebTranslator v3.0: ... catalan - 25 changes by juanjo	2015-08-02 17:45:14 +00: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	78b2e5babb	Merge branches 'upgrade_airport' and 'vehicle_group_info' into jgrpp	2015-08-02 18:17:44 +01:00
Jonathan G Rennison	2bcbeea011	Merge branch 'progsig-sx' into jgrpp ... Conflicts: src/command.cpp src/command_type.h src/lang/english.txt src/rail_cmd.cpp src/rail_gui.cpp src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/saveload/saveload.cpp src/widgets/rail_widget.h src/window_type.h	2015-08-02 18:15:18 +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
patch-import	45b5145396	Add group info patch ... Fix whitespace, add NOSAVE comment in vehicle struct http://www.tt-forums.net/viewtopic.php?f=33&t=72855	2015-08-02 12:35:18 +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	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	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