3c9c0acba1
Merge branch 'measurement_tool' into jgrpp
9 years ago
9dfdd8bce8
Import measurement patch
...
http://www.tt-forums.net/viewtopic.php?p=1086160#p1086160
9 years ago
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
163c30570b
(svn r27358) -Update from WebTranslator v3.0:
...
catalan - 25 changes by juanjo
9 years ago
8271acadb7
Merge branch 'show_veh_tunnel' into jgrpp
9 years ago
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
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
6596ba216c
Merge branch 'zoning' into jgrpp
...
Conflicts:
src/table/sprites.h
9 years ago
0afc054bff
Merge branch 'adjacent_crossings-sx' into jgrpp
...
Conflicts:
src/saveload/extended_ver_sl.cpp
src/saveload/extended_ver_sl.h
9 years ago
78b2e5babb
Merge branches 'upgrade_airport' and 'vehicle_group_info' into jgrpp
9 years ago
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
de76316634
Merge branch 'tracerestrict-sx' into jgrpp
9 years ago
09be8afd8d
Adjacent crossings: add setting (in PATX), add info to SLXI chunk.
9 years ago
b8ef887cc1
Merge branch 'save_ext' into adjacent_crossings-sx
9 years ago
4117808b9d
Import adjacent crossings patch (v3.1)
...
Fix trailing whitespace
http://www.tt-forums.net/viewtopic.php?p=836749#p836749
9 years ago
74bccb5d50
Zoning: Implement ownership checks, and station facility checks for industries.
9 years ago
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
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
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
08dc95fea1
Add town cargo patch SLXI/PATX code.
...
Update setting string.
9 years ago
c72b29cfd0
Import upgrade airport patch
...
http://www.tt-forums.net/viewtopic.php?f=33&t=35867
9 years ago
9905e478d4
Merge branch 'save_ext' into town_cargo_adj-sx
9 years ago
60377f2262
Merge branch 'master' into town_cargo_adj
...
Conflicts:
src/settings_gui.cpp
9 years ago
1c9801e6b6
Import town cargo generation factor patch
...
Adjust whitespace
http://www.tt-forums.net/viewtopic.php?f=33&t=46399&start=200#p1086221
9 years ago
09aa29de8b
Add signals on bridges/tunnels SLXI info, move setting to PATX.
9 years ago
6c81f8f35b
Add departure boards and timetable tick status to SLXI info.
...
Implementing converting timetable start date to/from ticks/days in
afterload code.
9 years ago
00f9f75d34
Merge branch 'save_ext' into departure-boards-sx
9 years ago
526cb42608
Merge branch 'master' into depature-boards
...
Conflicts:
src/table/strgen_tables.h
9 years ago
9f79c555da
Merge branch 'save_ext' into signal_tunnels_bridges-sx
9 years ago
22a5c6d459
Minor fixes in CmdRemoveSingleSignal
...
Whitespace fixes
9 years ago
59b0b18aa2
Import signals on tunnels and bridges patch
...
http://www.tt-forums.net/viewtopic.php?p=1140215#p1140215
9 years ago
79138de1b9
Import departure boards patch
9 years ago
e6782df9ba
(svn r27357) -Update from WebTranslator v3.0:
...
catalan - 181 changes by juanjo
9 years ago
de14c210db
Add progsigs info to SLXI chunk, move setting to PATX chunk.
9 years ago
3a3280e536
Merge branch 'save_ext' into progsig-sx
9 years ago
b3e102fe52
Fix length mismatch in PATX loader.
9 years ago
5d680d9154
Implement version setting in SlXvSetCurrentState
...
Call in ClearSaveLoadState
9 years ago
36d5b874da
Update project files
9 years ago
b1d8bcfe35
Merge branch 'save_ext' into progsig-sx
...
Conflicts:
source.list
src/saveload/saveload.cpp
9 years ago
c562e7c6fb
Merge branch 'tracerestrict' into tracerestrict-sx
9 years ago
804cfad053
Add override keywords for tracerestrict GUI code
9 years ago
d8a8e75bbf
Merge branch 'override-keyword' into tracerestrict
9 years ago
fc0efe599e
Port of the programmable signals patch to recent trunk
...
Also add some additional changes from the SpringPP patch,
and make some other minor changes/fixes.
9 years ago
0b09a7ac61
Add a conditional define for the override keyword.
...
Use of the override keyword can prevent various types of problems when
the base method signature is changed, but derived overriding methods are
not. This is conditional to maintain compatibility with legacy compilers.
9 years ago
d99ebb4976
Add tracerestrict SLXI version info and special case loading from
...
tracerestrict branch without SLXI.
9 years ago
bda3343107
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/saveload/saveload.cpp
9 years ago
c57ffc64bc
Settings update: add PATX chunk to store additional settings
...
in an unordered format which is tolerant of extra, missing or reordered
settings.
9 years ago
bde094fe01
Initial implementation of SLXI chunk save/load
9 years ago
a3980dc6ba
Move SlRead/SlWrite functions to saveload.h
...
Add SlGetBytesRead and SlGetBytesWritten functions.
9 years ago
4508cfbf93
Add format-style versions of SlError and SlErrorCorrupt.
9 years ago
Jonathan G Rennison
patch-import
translators