Jonathan G Rennison
|
ce34225b0e
|
Merge branch 'house_placing' into jgrpp
|
9 years ago |
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
|
9 years ago |
|
Jonathan G Rennison
|
675993805b
|
Merge branch 'tracerestrict-sx' into jgrpp
|
9 years ago |
|
Jonathan G Rennison
|
09f8ff420f
|
Merge branch 'tracerestrict' into tracerestrict-sx
Conflicts:
src/tracerestrict_gui.cpp
|
9 years ago |
|
Jonathan G Rennison
|
a0520b8937
|
Initial implementation of PBS entry signal condition variable.
TODO: see how the efficiency of this can be improved.
|
9 years ago |
|
Jonathan G Rennison
|
116bd41101
|
Initial support for multi-item instructions.
This involves various changes to instruction modification actions,
and the GUI code.
|
9 years ago |
|
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
|
9 years ago |
|
Jonathan G Rennison
|
1fbd4a9d1d
|
Timetable wait in depot: Add info to SLXI chunk.
|
9 years ago |
|
Jonathan G Rennison
|
a3b0057011
|
Merge branch 'save_ext' into wait_in_depot-sx
|
9 years ago |
|
Jonathan G Rennison
|
2f9ebebf02
|
Merge branch 'master' into wait_in_depot
|
9 years ago |
|
Jonathan G Rennison
|
4d1c4d18be
|
Timetable wait in depot: minor whitespace/style changes.
|
9 years ago |
|
patch-import
|
d8c5de188f
|
Import timetabling wait time in depots patch
http://www.tt-forums.net/viewtopic.php?f=33&t=70969
|
9 years ago |
|
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
|
9 years ago |
|
Jonathan G Rennison
|
bc8b2d9826
|
Merge branch 'save_ext' into tracerestrict-sx
|
9 years ago |
|
Jonathan G Rennison
|
77ec2aac58
|
Merge branch 'save_ext' into progsig-sx
|
9 years ago |
|
Jonathan G Rennison
|
8fe9a7430c
|
Merge branch 'save_ext' into departure-boards-sx
|
9 years ago |
|
Jonathan G Rennison
|
012ce322d5
|
Merge branch 'save_ext' into town_cargo_adj-sx
|
9 years ago |
|
Jonathan G Rennison
|
6ac6759b00
|
Merge branch 'save_ext' into signal_tunnels_bridges-sx
|
9 years ago |
|
Jonathan G Rennison
|
7cc71ce2a5
|
Merge branch 'save_ext' into adjacent_crossings-sx
|
9 years ago |
|
Jonathan G Rennison
|
eadeb51535
|
Merge branch 'master' into save_ext
|
9 years ago |
|
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
|
9 years ago |
|
Jonathan G Rennison
|
a8a726464c
|
Merge branch 'save_ext' into improved_breakdowns-sx
|
9 years ago |
|
Jonathan G Rennison
|
047395c663
|
Remove unnecessary and buggy field-packing in struct SlXvFeatureTest.
|
9 years ago |
|
Jonathan G Rennison
|
e91d0e49dc
|
Improved breakdowns: Update save/load code
|
9 years ago |
|
Jonathan G Rennison
|
d023d0863f
|
Merge branch 'save_ext' into improved_breakdowns-sx
Conflicts:
src/saveload/saveload.cpp
|
9 years ago |
|
Jonathan G Rennison
|
80d52eb20e
|
Improved breakdowns patch: fix various issues
* Whitespace/formatting
* Fix setting lang string
* Fix spelling of VRF_TO_HEAVY
|
9 years ago |
|
patch-import
|
9f5164b403
|
Import Improved Breakdowns patch
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=1146419#p1146419
|
9 years ago |
|
Jonathan G Rennison
|
b6a1866ded
|
Merge branch 'max_grfs' into jgrpp
|
9 years ago |
|
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
|
9 years ago |
|
Jonathan G Rennison
|
3c9c0acba1
|
Merge branch 'measurement_tool' into jgrpp
|
9 years ago |
|
patch-import
|
9dfdd8bce8
|
Import measurement patch
http://www.tt-forums.net/viewtopic.php?p=1086160#p1086160
|
9 years ago |
|
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
|
9 years ago |
translators
|
163c30570b
|
(svn r27358) -Update from WebTranslator v3.0:
catalan - 25 changes by juanjo
|
9 years ago |
|
Jonathan G Rennison
|
8271acadb7
|
Merge branch 'show_veh_tunnel' into jgrpp
|
9 years ago |
|
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
|
9 years ago |
|
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
|
9 years ago |
|
Jonathan G Rennison
|
6596ba216c
|
Merge branch 'zoning' into jgrpp
Conflicts:
src/table/sprites.h
|
9 years ago |
|
Jonathan G Rennison
|
0afc054bff
|
Merge branch 'adjacent_crossings-sx' into jgrpp
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
|
9 years ago |
|
Jonathan G Rennison
|
78b2e5babb
|
Merge branches 'upgrade_airport' and 'vehicle_group_info' into jgrpp
|
9 years ago |
|
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
|
9 years ago |
|
Jonathan G Rennison
|
de76316634
|
Merge branch 'tracerestrict-sx' into jgrpp
|
9 years ago |
|
Jonathan G Rennison
|
09be8afd8d
|
Adjacent crossings: add setting (in PATX), add info to SLXI chunk.
|
9 years ago |
|
Jonathan G Rennison
|
b8ef887cc1
|
Merge branch 'save_ext' into adjacent_crossings-sx
|
9 years ago |
|
patch-import
|
4117808b9d
|
Import adjacent crossings patch (v3.1)
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=836749#p836749
|
9 years ago |
|
Jonathan G Rennison
|
74bccb5d50
|
Zoning: Implement ownership checks, and station facility checks for industries.
|
9 years ago |
|
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.
|
9 years ago |
|
patch-import
|
6de087786c
|
Import and rebase zoning patch
Fix some of the whitespace issues
http://www.tt-forums.net/viewtopic.php?p=888801#p888801
|
9 years ago |
|
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
|
9 years ago |
|
Jonathan G Rennison
|
08dc95fea1
|
Add town cargo patch SLXI/PATX code.
Update setting string.
|
9 years ago |
|
patch-import
|
c72b29cfd0
|
Import upgrade airport patch
http://www.tt-forums.net/viewtopic.php?f=33&t=35867
|
9 years ago |