78838ee2a2
Add freight train load/unload mode: through load
6 years ago
09ca051ff8
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train.h
6 years ago
def3a3933b
Move dual-use of load_unload_ticks for bridge/tun signals to new field
6 years ago
10db379202
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
38cb80872b
Gradually slow down for red signals on bridges/tunnels
...
Instead of coming to a sudden halt immediately before the signal
6 years ago
8a4d462d44
Merge branch 'chunnel' into jgrpp
6 years ago
d5a316e365
Use flag GVF_CHUNNEL_BIT properly
6 years ago
ec661d7ae9
Merge branch 'template_train_replacement' into jgrpp
7 years ago
4a9df57665
TBTR: Enable autorenew when template replacement active
7 years ago
06a2457efc
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
7 years ago
233b0f8e9e
TBTR: Add sanity check assertions
7 years ago
bb6b8d8cd6
Increase verbosity of some assertion failure messages
7 years ago
d730cfd51d
Cache sprite sequence bounds for vehicles
7 years ago
dda20d08c1
Merge branch 'improved_breakdowns' into jgrpp
...
Update German and Korean language strings
# Conflicts:
# src/saveload/extended_ver_sl.cpp
7 years ago
beda7ebb39
Set minimum speed for train critical breakdown reduction.
7 years ago
4b392b66db
Fix DeleteVisibleTrain being called on virtual trains
...
Add assertion to check for this case
7 years ago
1c04653518
Add scope info logging to DeleteVisibleTrain
7 years ago
9559ad4946
Merge branch 'template_train_replacement' into jgrpp
7 years ago
40c99956ed
TBTR: Fix attempting to get sprite for new virtual engine before marking as virtual
7 years ago
ba33754993
Merge branch 'save_ext' into tracerestrict-sx
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
f34833f111
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/vehiclelist.cpp
7 years ago
2d66f25f6c
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/vehicle.cpp
7 years ago
b4b98e5165
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
a47fb85cd8
(svn r27893) -Codechange: Use fallthrough attribute. (LordAro)
7 years ago
b76d594654
Merge branch 'adjacent_crossings' into jgrpp
...
# Conflicts:
# src/road_func.h
7 years ago
3e85e9fc53
Fix MaybeBarCrossingWithSound setting crossing reservation
...
Improve efficiency of adjacent crossings checks
7 years ago
bbd2e6f2f5
Merge branch 'improved_breakdowns' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
7 years ago
350c2bb24f
Make trains break down after collision with road vehicle.
7 years ago
44fa555c6d
Merge branch 'save_ext' into improved_breakdowns
7 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
7 years ago
4979309094
TBTR: Fix build and refit of template trains.
7 years ago
b8328ad21f
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/command.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/tracerestrict.cpp
# src/tracerestrict.h
# src/tracerestrict_gui.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/vehiclelist.cpp
# src/window_type.h
7 years ago
4d21d6f81c
Merge branch 'chunnel' into jgrpp
7 years ago
40eff50c98
Clear waiting due to tracerestrict flag when no longer required.
7 years ago
85c7c4b307
Merge branch 'signal_tunnels_bridges' into jgrpp
7 years ago
ab595bf67c
Fix bridge/tunnel exit PBS signals never being set to green.
7 years ago
f4b5efd67d
Merge branch 'template_train_replacement' into jgrpp
7 years ago
753fc2ab67
TBTR: Fix virtual rail engines not havign build year set.
7 years ago
0772236986
Add a release slot at front of train slot action.
...
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
7 years ago
6417fb16c3
Initial implementation of trace restrict slots
7 years ago
5a2d482c28
Tracerestrict: Add wait at PBS signal action.
7 years ago
c882082467
Chunnel: Fix swap of vehicle chunnel flag when reversing consist.
7 years ago
efe30c4299
Merge branch 'tracerestrict-sx' into jgrpp
7 years ago
2af2a49887
Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation"
...
This reverts commit 166e504c13
7 years ago
f9f2d37a8e
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/saveload/saveload.cpp
7 years ago
fc60857b66
Merge branches 'adjacent_crossings' and 'zoning' into jgrpp
7 years ago
0c42b384bc
Merge branch 'save_ext' into adjacent_crossings
...
# Conflicts:
# src/train_cmd.cpp
7 years ago
166e504c13
(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation
...
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
7 years ago
5951d2406e
(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation
...
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
7 years ago
040df26e9e
(svn r27809) -Codechange: Improve check in UpdateLevelCrossing
...
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
7 years ago
67ab0450dd
(svn r27809) -Codechange: Improve check in UpdateLevelCrossing
...
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
7 years ago
ec9f0371e8
Chunnel: Adjust z position of vehicles in chunnels to go "under" the water.
7 years ago
f3bea35fcc
Merge branches 'template_train_replacement' and 'infrastructure_sharing' into jgrpp
8 years ago
11e4bcee40
Slightly decrease proximity required for trains to crash.
...
This is to fix trains of different companies being able to crash when
two stations or line-ends are directly against each other.
8 years ago
f5e4d8e73a
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
8 years ago
dcbde21f18
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/train_cmd.cpp
8 years ago
074555e41d
Merge branch 'save_ext' into signal_tunnels_bridges
8 years ago
66751457ad
Fix train crash on bridge/tunnel with signals leaving red signals.
...
Update signals on far end of bridge/tunnel.
If clearing the crash results in a clear bridge/tunnel, set all
bridge/tunnel signals green.
8 years ago
7f10d83a4a
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/linkgraph/linkgraphjob.cpp
# src/saveload/extended_ver_sl.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
8 years ago
92254acf8d
TBTR: Savegame and API changes to support multiple sprites per vehicle.
8 years ago
d204062300
Merge branch 'master' into template_train_replacement
8 years ago
a37bb32fd6
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
8 years ago
c175067ed9
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
8 years ago
f36539837e
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
d2393b4f6c
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
2a1e955fee
(svn r27663) -Codechange: Deduplicate code when rotating crashed vehicles.
8 years ago
a6d1d128da
(svn r27663) -Codechange: Deduplicate code when rotating crashed vehicles.
8 years ago
f82feb160f
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# projects/openttd_vs100.vcxproj
# projects/openttd_vs100.vcxproj.filters
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs80.vcproj
# projects/openttd_vs90.vcproj
# source.list
# src/misc.cpp
# src/openttd.cpp
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/saveload.cpp
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnelbridge_map.h
8 years ago
556594f2f0
Extend bridge signal simulation to support an unlimited no. of signals.
...
This is instead of the previous limit of 16, all stored in M2.
8 years ago
61500b596e
Fix tunnel/bridge entrance signal not being refreshed.
...
When a train left a tunnel or a bridge with no intermediary signals,
when setting the entrance signal to green, the display was not refreshed
with show track reservations was enabled.
8 years ago
0d2e9f91bf
Adjust signal on bridge/tunnel map bits, rename accessors, add docs.
...
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
8 years ago
888cd1be07
Merge branch 'cpp-11' into signal_tunnels_bridges
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
9ea018abc5
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/order_base.h
# src/order_gui.cpp
# src/order_type.h
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/vehicle_base.h
8 years ago
3507b51d9e
Initial LinkRefresher support for cargo-specific links.
8 years ago
23a1c07378
Merge branch 'master' into template_train_replacement
...
Fix Template creation window vehicle drag cursor.
8 years ago
3ac94e97c8
Cache the result of GetImage() in Vehicle::UpdateViewport() where possible.
...
Sprite number is not cached if callback is made, or a variable access
outside a whitelist occurs.
Invalidate cached sprite number when direction or cargo changes,
or vehicle is marked dirty.
8 years ago
cf26d48c9b
Add a "SoftClamp" function which tolerates min > max, use for DrawTrainEngine.
8 years ago
e95a24a4e9
Merge branch 'template_train_replacement-sx' into jgrpp
8 years ago
b7aac40da8
Fix deleting an in-use template vehicle, only updating the first group.
8 years ago
09291a3b74
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle_base.h
8 years ago
c9f68ede59
(svn r27580) -Fix [FS#6395]: Set date of last service on construction also for wagons and articulated parts.
8 years ago
d188d02384
(svn r27580) -Fix [FS#6395]: Set date of last service on construction also for wagons and articulated parts.
8 years ago
4c5173b6bf
Merge branch 'auto_timetables-sx' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/table/company_settings.ini
# src/vehicle.cpp
8 years ago
d59252d15b
Timetable auto separation is now per vehicle, with a company default.
...
Remove global on-off setting.
Add button to timetable GUI.
Add company setting to control default for new vehicles.
Fix automate, start date, change time and autofill buttons
being shown enabled for other companies' vehicles.
8 years ago
efcdd6c36f
Remove global automated timetable setting.
8 years ago
cf59b4fcab
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
8 years ago
17f74e4c51
Fix signalled bridge/tunnel not always being redrawn on (un)reservation.
8 years ago
5d42d07988
Merge branch 'tracerestrict-sx' into jgrpp
8 years ago
df2a1b1bcd
Merge branch 'tracerestrict' into tracerestrict-sx
8 years ago
1bb3024534
Fix unreserving through a green PBS signal not setting the state to red.
...
This also had the side effect of failed reservation attempts through
a reserve-through signal leaving the signal erroneously set to green.
8 years ago
7bc407e2f8
Merge branch 'infrastructure_sharing-sx' into jgrpp
...
# Conflicts:
# src/settings_type.h
# src/table/settings.ini
8 years ago
1818a83e63
Add setting to control whether trains can crash with other companies'.
8 years ago
d08b162119
Merge branch 'signal_tunnels_bridges-sx' into jgrpp
...
# Conflicts:
# src/saveload/afterload.cpp
# src/saveload/extended_ver_sl.cpp
# src/signal.cpp
# src/train_cmd.cpp
8 years ago
891fd08e9d
Handle case where a non-PBS tun/bridge exit is followed by a PBS signal.
...
Prevent the entrance being reserved if an attempt is made to reverse
on the exit tile.
8 years ago
7e4898ad42
Fix PBS reservation from bridge/tunnel exit when next tile not a junction.
8 years ago
35b93a42ac
Enable bridge/tunnel exit signals to be one-way PBS.
...
Add signal conversion support.
8 years ago
a25ac7a161
Enable signals on bridges/tunnels to work with PBS.
8 years ago
199c04fb44
Enable build and refit for template virtual trains.
9 years ago
0779c7b7a9
Merge branch 'template_train_replacement-sx' into jgrpp
...
# Conflicts:
# src/build_vehicle_gui.cpp
# src/saveload/afterload.cpp
9 years ago
5850bcf699
TBTR: Fix crash and issues when using a no longer available engine type.
...
Show error messages when cloning a vehicle to a template
or virtual vehicle fails.
Handle failed clones gracefully.
Bypass engine availability check when doing a template edit action.
Show correct error message if template replacement fails for
a non-money reason.
9 years ago
Jonathan G Rennison
HackaLittleBit
frosch
peter1138