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
a38c98d10a
Bump SLXI tracerestrict version due to PBS entry and PF penalty new features.
2015-08-04 19:15:54 +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
116bd41101
Initial support for multi-item instructions.
...
This involves various changes to instruction modification actions,
and the GUI code.
2015-08-03 20:03:42 +01:00
Jonathan G Rennison
e4ccea350b
Merge branch 'wait_in_depot-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
2015-08-03 01:12:16 +01:00
Jonathan G Rennison
1fbd4a9d1d
Timetable wait in depot: Add info to SLXI chunk.
2015-08-03 01:10:22 +01:00
Jonathan G Rennison
a3b0057011
Merge branch 'save_ext' into wait_in_depot-sx
2015-08-03 01:07:51 +01:00
Jonathan G Rennison
2f9ebebf02
Merge branch 'master' into wait_in_depot
2015-08-03 01:06:55 +01:00
Jonathan G Rennison
4d1c4d18be
Timetable wait in depot: minor whitespace/style changes.
2015-08-03 01:06:42 +01:00
patch-import
d8c5de188f
Import timetabling wait time in depots patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
2015-08-03 01:06:12 +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
eadeb51535
Merge branch 'master' into save_ext
2015-08-03 00:09:59 +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
a8a726464c
Merge branch 'save_ext' into improved_breakdowns-sx
2015-08-02 23:37:54 +01:00
Jonathan G Rennison
047395c663
Remove unnecessary and buggy field-packing in struct SlXvFeatureTest.
2015-08-02 23:37:34 +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
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
b6a1866ded
Merge branch 'max_grfs' into jgrpp
2015-08-02 22:17:45 +01:00
patch-import
8f5ef2ae01
Import and rebase Max NewGRFs patch
...
Fix trailing whitespace, clean up code a bit
http://www.tt-forums.net/viewtopic.php?p=894743#p894743
2015-08-02 22:17:35 +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
de76316634
Merge branch 'tracerestrict-sx' into jgrpp
2015-08-02 17:59:10 +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
b8ef887cc1
Merge branch 'save_ext' into adjacent_crossings-sx
2015-08-02 17:12:28 +01:00
patch-import
4117808b9d
Import adjacent crossings patch (v3.1)
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=836749#p836749
2015-08-02 17:12:15 +01:00
