Jonathan G Rennison
44d3c84a11
Save/load changes for enhanced viewport patch: plans.
2015-08-05 21:33:47 +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
03b6c41c67
Add shorthand flag in SlxiSubChunkFlags for XSCF_IGNORABLE_UNKNOWN | XSCF_IGNORABLE_VERSION.
2015-08-05 21:31:17 +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
Jonathan G Rennison
938babfe7b
Vehicle repair costs patch: whitespace fixes.
2015-08-04 23:39:02 +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
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
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
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
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
6ac6759b00
Merge branch 'save_ext' into signal_tunnels_bridges-sx
2015-08-03 00:11:54 +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
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
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
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
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
09aa29de8b
Add signals on bridges/tunnels SLXI info, move setting to PATX.
2015-08-01 21:41:44 +01:00
Jonathan G Rennison
6c81f8f35b
Add departure boards and timetable tick status to SLXI info.
...
Implementing converting timetable start date to/from ticks/days in
afterload code.
2015-08-01 21:07:14 +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
3a3280e536
Merge branch 'save_ext' into progsig-sx
2015-08-01 18:17:30 +01:00
Jonathan G Rennison
5d680d9154
Implement version setting in SlXvSetCurrentState
...
Call in ClearSaveLoadState
2015-08-01 18:03:07 +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
patch-import
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.
2015-08-01 17:06:43 +01:00
Jonathan G Rennison
d99ebb4976
Add tracerestrict SLXI version info and special case loading from
...
tracerestrict branch without SLXI.
2015-08-01 13:04:53 +01:00
Jonathan G Rennison
bda3343107
Merge branch 'save_ext' into tracerestrict-sx
...
Conflicts:
src/saveload/saveload.cpp
2015-08-01 13:03:01 +01:00
Jonathan G Rennison
bde094fe01
Initial implementation of SLXI chunk save/load
2015-08-01 12:58:53 +01:00
