649118c928
Fix assertion failure when deleting train from signalled tunnel/bridge
6 years ago
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
035f5622b9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_cmds.cpp
# src/landscape.cpp
# src/linkgraph/linkgraphschedule.cpp
# src/openttd.cpp
# src/roadveh_cmd.cpp
# src/toolbar_gui.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/viewport.cpp
# src/window_type.h
6 years ago
2a868b9f3b
Feature: Framerate display window ( #6822 )
...
Frame rate and various game loop/graphics timing measurements and graphs. Accessible via the Help menu, and can print some stats in the console via the fps command.
6 years ago
e67cd04596
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
6ca0fcbae2
Use head tile track pieces in Train::GetVehicleTrackdir for trains in wormhole
6 years ago
a7e767d766
Fix 90° turns being wrongly detected across bridges of non-zero length
...
This prevented reservations
6 years ago
6740a9a470
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# docs/landscape.html
# src/bridge_map.h
# src/pbs.cpp
# src/saveload/company_sl.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_type.h
# src/signal.cpp
# src/train_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
# src/tunnelbridge_map.h
# src/vehicle.cpp
# src/viewport.cpp
6 years ago
77362b829a
Initial support for rail custom bridge heads
6 years ago
4d1bd8e4b4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/genworld_gui.cpp
# src/gfx.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/linkgraph_gui.h
# src/music.cpp
# src/table/settings.ini
# src/town_cmd.cpp
# src/train_cmd.cpp
6 years ago
2586096ef6
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
6 years ago
e9f5d80440
Trace restrict slots: Add support for slot operations at PBS end signal
6 years ago
e82ccad052
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/signal.cpp
# src/table/settings.ini
# src/train_cmd.cpp
# src/tunnelbridge.h
6 years ago
814f9f7e0f
Implement bidirectional mode for signals on bridges/tunnels
6 years ago
d03139b241
Use separate bits for signals on bridge/tunnel entrance/exit red/green states
6 years ago
c2a7728084
Fix: Prevent ships moving into docks after finishing (un)loading. ( #6791 )
6 years ago
cecbf257bc
Merge branch 'save_ext' into template_train_replacement
...
# Conflicts:
# src/saveload/saveload.cpp
# src/vehicle_gui.cpp
6 years ago
56be293107
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/blitter/32bpp_anim.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_anim_sse2.cpp
# src/blitter/32bpp_base.cpp
# src/blitter/32bpp_base.hpp
# src/ground_vehicle.cpp
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/newgrf_house.cpp
# src/newgrf_house.h
# src/town_cmd.cpp
# src/vehicle_base.h
# src/viewport_gui.cppp
6 years ago
a07394a63a
Change: Remove direction parameter from Vehicle::UpdateDeltaXY. ( #6792 )
...
The value is either unused or always the same as this->direction.
6 years ago
a60eff174d
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
5877cd0f9b
TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes
...
Slight code, GUI layout, and savegame format tidying
6 years ago
e0126a1fbc
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
7 years ago
0dd3ff23de
Fix signalled tunnel/bridge entrance not being marked dirty when reservation cleared
7 years ago
c2678b896e
Fix clearing of train reservations in tunnels and on bridges.
...
(cherry picked from commit e2c4fb517d1064b163d8f2b0627506d785ffb3ed)
See: #46
7 years ago
2821599f6b
Better handle out of track and depot through load cases
...
Add advice messages for when loading is aborted due to out of track/depot
Handle non-aligned use of platform
Fix full-load behaviour
Fix speed limiting whilst advancing
7 years ago
c779915ccb
Fix train through load always advancing last section to far end of platform
7 years ago
f012d45491
Merge branch 'signal_tunnels_bridges' into jgrpp
7 years ago
df72bc6e09
Fix signal on tun/bridge gradual decel end tile detection
7 years ago
78838ee2a2
Add freight train load/unload mode: through load
7 years ago
09ca051ff8
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
# src/train.h
7 years ago
def3a3933b
Move dual-use of load_unload_ticks for bridge/tun signals to new field
7 years ago
10db379202
Merge branch 'signal_tunnels_bridges' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
7 years ago
38cb80872b
Gradually slow down for red signals on bridges/tunnels
...
Instead of coming to a sudden halt immediately before the signal
7 years ago
8a4d462d44
Merge branch 'chunnel' into jgrpp
7 years ago
d5a316e365
Use flag GVF_CHUNNEL_BIT properly
7 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.
8 years ago
4979309094
TBTR: Fix build and refit of template trains.
8 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
8 years ago
4d21d6f81c
Merge branch 'chunnel' into jgrpp
8 years ago
40eff50c98
Clear waiting due to tracerestrict flag when no longer required.
8 years ago
85c7c4b307
Merge branch 'signal_tunnels_bridges' into jgrpp
8 years ago
ab595bf67c
Fix bridge/tunnel exit PBS signals never being set to green.
8 years ago
f4b5efd67d
Merge branch 'template_train_replacement' into jgrpp
8 years ago
753fc2ab67
TBTR: Fix virtual rail engines not havign build year set.
8 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.
8 years ago
6417fb16c3
Initial implementation of trace restrict slots
8 years ago
5a2d482c28
Tracerestrict: Add wait at PBS signal action.
8 years ago
c882082467
Chunnel: Fix swap of vehicle chunnel flag when reversing consist.
8 years ago
efe30c4299
Merge branch 'tracerestrict-sx' into jgrpp
8 years ago
2af2a49887
Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation"
...
This reverts commit 166e504c13
8 years ago
f9f2d37a8e
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/saveload/saveload.cpp
8 years ago
fc60857b66
Merge branches 'adjacent_crossings' and 'zoning' into jgrpp
8 years ago
0c42b384bc
Merge branch 'save_ext' into adjacent_crossings
...
# Conflicts:
# src/train_cmd.cpp
8 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)
8 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)
8 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)
8 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)
8 years ago
ec9f0371e8
Chunnel: Adjust z position of vehicles in chunnels to go "under" the water.
8 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
Jonathan G Rennison
Niels Martin Hansen
PeterN
keldorkatarn
HackaLittleBit
frosch
peter1138