4042480806
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/table/company_settings.ini
# src/table/currency_settings.ini
# src/table/gameopt_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/table/win32_settings.ini
# src/table/window_settings.ini
3 years ago
2e022d5194
Move game events to new event_logs header/cpp files
3 years ago
fd605e3cf3
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# .github/workflows/commit-checker.yml
# src/company_cmd.cpp
# src/console_cmds.cpp
# src/crashlog.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/indonesian.txt
# src/lang/japanese.txt
# src/lang/korean.txt
# src/lang/swedish.txt
# src/linkgraph/linkgraphjob.cpp
# src/linkgraph/mcf.cpp
# src/network/core/tcp.cpp
# src/network/core/tcp.h
# src/network/core/tcp_game.h
# src/network/core/udp.h
# src/network/network.cpp
# src/network/network_admin.cpp
# src/network/network_admin.h
# src/network/network_chat_gui.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_func.h
# src/network/network_internal.h
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf.cpp
# src/newgrf_station.cpp
# src/order_gui.cpp
# src/rail_cmd.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/settings_internal.h
# src/settings_type.h
# src/station_cmd.cpp
# src/stdafx.h
# src/table/currency_settings.ini
# src/table/misc_settings.ini
# src/table/settings.h.preamble
# src/table/settings.ini
# src/terraform_cmd.cpp
# src/timetable_gui.cpp
# src/train_cmd.cpp
# src/tree_cmd.cpp
# src/water_cmd.cpp
3 years ago
7acdaaaf2f
Fix: Prevent train reversing when wholly inside a train depot ( #9557 )
...
Co-authored-by: Jonathan G Rennison <j.g.rennison@gmail.com>
3 years ago
aff4dc74d0
Avoid premature reservations with reverse at waypoint orders with wait time
3 years ago
3c55250cd6
Fix last station visited not being set when reservation ends at target
...
Long reserve and subsequent routing restrictions immediately beyond
the reservation were evaluated without the last station visited being
updated to reflect that the target station was already reached.
3 years ago
964ea7b910
Debug: Show realistic braking approach speeds in debug window
3 years ago
5d351a14d2
Add new signal type: no-entry signal
...
This is only passable in one direction, but does not have a signal
or show an aspect in the opposite direction
Add a setting for whether this is shown in the signal UI.
Off by default.
3 years ago
f8e30e807d
Fix ProcessOrders not always being called after leaving a waiting order
...
Fixes conditional order loop on leaving a depot
3 years ago
b08cc3cf38
Reduce screen re-draw area for tunnel/bridge end signal updates
3 years ago
f6c2a81f72
Reduce screen re-draw area for bridge middle signal updates
3 years ago
fea967bbbf
Prevent train reversing when wholly inside a train depot
...
See: #316 , https://github.com/OpenTTD/OpenTTD/issues/9520
3 years ago
b2ef6c0de8
Add implementation of multi-aspect signalling and GRF support
...
Requires realistic braking
See: #247
3 years ago
6546f6deba
Fix tunnel exit signal not being set to red when train exited
3 years ago
dc4b7e0558
Add helper function to set tunnel/bridge entrance signal green
3 years ago
55c4fe7d45
Add helper functions to get tunnel/bridge entrance/exit trackdirs
3 years ago
2283ce3a2b
ATC: Reduce lower limit of nominal look-ahead distance for speed timers
...
See: #310
3 years ago
b8d5113c5a
Tracerestrict: Add slot action mode, try to acquire (only on reserve)
3 years ago
ee333a9549
Fix 2183fd4d: [NewGRF] Use divide instead of right shift for signed numbers. ( #9480 )
...
"For negative a, the value of a >> b is implementation-defined (in most implementations, this performs arithmetic right shift, so that the result remains negative)."
3 years ago
2183fd4dab
Feature: [NewGRF] Maximum curve speed modifier for rail vehicles ( #9346 )
3 years ago
9003ef7d11
When reversing train, ensure that loading is aborted if necessary
3 years ago
2135aa2ae8
Fix false positive desync log message for powered free wagon chains
3 years ago
6a009686c9
Fix #299 : Add estimated max speed (full) to template windows
3 years ago
502af119e5
Rename and move train max speed estimation functions
3 years ago
49b66ea504
Codechange: Remove FOR_EACH_SET_TRACK
3 years ago
fb4e10626e
Make look ahead distance vaiable with speed, within a reasonable range
3 years ago
11e49ef99e
Only apply signal speed restrictions from the front direction
3 years ago
5fb3eb0bb9
Adjust signal speed restriction timeouts when date or day length changed
3 years ago
e16c29ef7d
Use already found iterator for erasing from hash map
3 years ago
62075c88de
Apply ATC speed restriction as advisory to prevent instant braking
...
Remove redundant function
3 years ago
93be763301
Update ticks per tile constant
3 years ago
ee2d77ecab
Move train speed adaptation structs to separate header file
3 years ago
3bba9ef37a
Fix setting name
3 years ago
e15acd3af8
Avoid train speed adaption overhead when setting not enabled
3 years ago
28e39c9045
Fix trailing whitespace
3 years ago
669770f209
Fix a few issues and reset everything on start of new game
3 years ago
86cfefba08
Fix signed unsigned overflow
3 years ago
c1bf236a26
Rewrite the ATC logic
...
Now signals store speed information with a timeout for this data's validity
3 years ago
61669868bf
Removed change and updated signal count
3 years ago
5d20b9397c
Revert "Try something"
...
This reverts commit 475a097f36a70383d50ee68dac38b5ce087a1eb1.
3 years ago
02278f7a6f
Try something
...
This doesn't work but hey... it's broken already in combination with realistic breaking
3 years ago
debc504e59
Add a setting for train speed adaptation
...
Prior to this change, without realistic breaking, trains would continuously run into the train in front of them. This makes them adjust their speed based on trains in front of them
3 years ago
1002c6d9d2
Fix various compiler warnings
...
See: #267
3 years ago
5799402f7a
Codechange: Rename window related DeleteXXX to match new behaviour
3 years ago
2e136285e1
Codechange: move from C-string to std::string for DoCommand
3 years ago
f703e23322
Fix assert fail when ChooseTrainTrack called on disallowed 90 degree turn
3 years ago
b791ffc6de
Fix: do not hide parameter by local variable with the same name
3 years ago
a896753ecc
Fix #9264 : Do not attach temporary wagons to free wagon chains when autoreplacing
3 years ago
8eb34b2f10
Do not attach temporary wagons to free wagon chains when autoreplacing
...
See: https://github.com/OpenTTD/OpenTTD/issues/9264
3 years ago
44ca7d9377
Change: Use gender-neutral pronouns
3 years ago
6b2a05d02e
Drive through depots: Allow moving between ends when current exit blocked
3 years ago
6a62b94263
Add NewGRF railtype flag to disable realistic braking for vehs of that type
...
See: #242
3 years ago
ba2e6087b2
Add train cache flag for whether train using realistic braking physics
3 years ago
b514d29db1
Replace TrainCache::cached_tilt with a flags field
3 years ago
686bcb8009
Fix no vehicle tile hash update when moving train in drive-through depot
3 years ago
8e92a6844f
Add a "misc_debug" console command
...
Add a flag to open veh window when TrainBrakesOverheatedBreakdown called
3 years ago
5d5100449e
Adjust realistic braking physics
...
Realistic acceleration uses 4 x the mass for acceleration as braking
Use 4 x mass for realistic braking as well to match
Increase per train length braking force
Add a power-based per train length braking force
3 years ago
d484c32d44
Reduce sensitivity of train overheated breakdown
3 years ago
26a123b708
Realistic braking: Cache offset of centre of mass of train
3 years ago
dc8680eec5
Ensure that cached decel values of free wagon chain heads are zeroed
3 years ago
8fd4f65a85
Validate lookahead reservation end OK before calling FollowTrainReservation
3 years ago
5b5e068e52
Don't check safe waiting point in FollowTrainReservation if result unused
3 years ago
1cbb9960af
Clear train lookahead when reaching an unreserved diverging junction
3 years ago
49676552bb
Use a flags parameter for ChooseTrainTrack mode
3 years ago
48498969eb
Fix through load crash when rear unit is longer than platform with no capacity
3 years ago
923b2eb0a9
Fix tracerestrict train is loading status condition when predicting orders
3 years ago
bac3bff716
Increase realistic braking signal sighting distance
...
(Outside of signalled tunnel/bridges)
3 years ago
4386da53ee
Slightly overestimate descents when deciding if reservation long enough
3 years ago
8cf2b827a1
Avoid pessimising braking speed when descending slope
...
When calculating speed using variable braking force
3 years ago
843dce94a4
Fix mispredicted stop location when through-loading
...
When using realistic braking and skipped train parts have different
lengths.
3 years ago
f7dcd66f08
Fix unnecessary braking when leaving station with order without non-stop flag
3 years ago
dbbe1bb3e4
Fix trains passing signals in original acceleration with braking models
3 years ago
056606d2b6
Fix ApplyLookAheadItem assuming current_order == order in order list
...
Fixes trains with no orders failing to brake in advance of stations
3 years ago
460d504269
Fix order index wrapping when depth exceeded in AdvanceOrderIndex
3 years ago
dfecdf3afb
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/dock_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/terraform_gui.cpp
# src/vehicle.cpp
# src/video/allegro_v.cpp
# src/video/cocoa/cocoa_v.mm
# src/video/dedicated_v.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
3 years ago
d9b4413bc9
Codechange: rename sound ids to make more sense. ( #8701 )
3 years ago
8fc4f13672
Fix train speed not being set to 0 for timetabled wait at waypoint orders
3 years ago
35d720b0ad
Add tracerestrict PBS end signal conditional
...
This is for realistic braking long reserve
3 years ago
1b0e602ed5
Do not fill reservation lookahead if reservation could still be cancelled
...
If ExtendTrainReservation finds a safe waiting point, this could
later not be a safe waiting point after advancing orders, due to
conditionally reserve through routing restrictions
3 years ago
8a814bbfe3
Add release slot train order
3 years ago
62ea3b7794
Use original speeds when braking at station in original braking mode
...
Partially reverts: 628077d0
3 years ago
0cc994c870
Save/restore implicit and TT order indices in VehicleOrderSaver
...
Fix implicit/TT order indices being unexpectedly changed by
UpdateOrderDest if an order target is unsuitable.
This could assert UpdateVehicleTimetable
3 years ago
48395cb2db
Fix assert when freeing train reservation from track edit command
3 years ago
5283e16946
Fix misspelling of variable name: acceleration_type
3 years ago
d52eebb829
Set value of cached_uncapped_decel in original acceleration model
...
This is to avoid false positive cache mismatch messages
3 years ago
c1f1b5f3b3
Give monorail/maglev larger realistic braking deceleration limits
3 years ago
4e1b1bc91e
Fix wrong power units used for maglev realistic braking deceleration calc
3 years ago
a9b82b817b
Prevent signed overflow of lookahead position
3 years ago
b7ddd486cf
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/aircraft_cmd.cpp
# src/blitter/32bpp_anim.cpp
# src/cargopacket.cpp
# src/cheat_gui.cpp
# src/company_cmd.cpp
# src/company_gui.cpp
# src/core/pool_func.hpp
# src/date.cpp
# src/economy.cpp
# src/error_gui.cpp
# src/ground_vehicle.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/industry_cmd.cpp
# src/lang/dutch.txt
# src/lang/french.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/linkgraph/mcf.cpp
# src/network/network_content.cpp
# src/network/network_server.cpp
# src/network/network_udp.cpp
# src/newgrf_engine.cpp
# src/newgrf_station.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/saveload.cpp
# src/settings_gui.cpp
# src/station_cmd.cpp
# src/station_kdtree.h
# src/string_func.h
# src/table/settings.ini
# src/tgp.cpp
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/train_gui.cpp
# src/tree_gui.cpp
# src/tunnelbridge_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/video/sdl2_v.cpp
# src/video/sdl_v.cpp
# src/video/win32_v.cpp
# src/viewport.cpp
# src/viewport_sprite_sorter_sse4.cpp
# src/window.cpp
3 years ago
f9956d88c3
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/company_gui.cpp
# src/lang/arabic_egypt.txt
# src/lang/czech.txt
# src/lang/esperanto.txt
# src/lang/faroese.txt
# src/lang/finnish.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/latvian.txt
# src/lang/malay.txt
# src/lang/polish.txt
# src/lang/spanish.txt
# src/lang/spanish_MX.txt
# src/lang/unfinished/urdu.txt
# src/main_gui.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/road_cmd.cpp
# src/settings_type.h
# src/station_cmd.cpp
# src/table/settings.ini
3 years ago
6c3e5642f8
Merge branch 'master' into jgrpp
...
# Conflicts:
# cmake/CompileFlags.cmake
# src/crashlog.cpp
# src/fileio.cpp
# src/fileio_func.h
# src/fios_gui.cpp
# src/ini_load.cpp
# src/ini_type.h
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/network/network_client.cpp
# src/order_base.h
# src/order_cmd.cpp
# src/os/windows/win32.cpp
# src/road_cmd.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/settings.cpp
# src/station_cmd.cpp
# src/stdafx.h
# src/table/settings.ini
# src/tree_cmd.cpp
# src/tree_gui.cpp
# src/vehicle_base.h
# src/video/cocoa/cocoa_v.mm
# src/video/cocoa/event.mm
# src/video/cocoa/wnd_quartz.mm
# src/viewport.cpp
# src/widgets/tree_widget.h
3 years ago
4e0804b791
Fix const issues around GetTrainStopLocation/GetCurrentMaxSpeed
3 years ago
87c87649b8
Fix lookahead init inside a signalled tunnel/bridge only filling interior
3 years ago
62fffddb3f
Don't mark train stuck if no reachable track in TryPathReserve
3 years ago
628077d0bb
Fix missing stop due to speed when entering station with lookahead
3 years ago
ed0ffb6220
Add feature: realistic train braking
...
Add setting to select train braking model.
3 years ago
1838e8939f
Improve handling of reversing inside bidi signalled tunnel/bridge
...
Avoid train crashes when reversing trains either side of entrance tile
3 years ago
e0893de5c3
Set tunnel/bridge PBS exit to red when leaving
3 years ago
aacb70d371
Debug: Extend random debug logging to also include state checksum updates
3 years ago
4f44540eb9
Fix false positive desync messages for vehicle cached weight/length
3 years ago
6a6d9f3773
Fix tunnel/bridge PBS start tile in TryPathReserve
3 years ago
cd36e17160
Fix: don't allow free-wagon-chains to exceed max-train-length ( #8533 )
...
This makes no sense, that a free-wagon-chain could be larger than
the maximum length of a train, as you cannot put an engine in
front of that anyway. And it prevents run-away AIs making very
silly long free-wagon-chains.
3 years ago
d666036ffd
TBTR: Close vehicles window when acquiring idle vehicle for replacement
...
This fixes possible duplicate vehicle windows, which is not allowed
3 years ago
515aeb04e0
TBTR: Add support for vehicle reversed flag
3 years ago
e9f7783327
TBTR: Allow flipping direction of vehicles in template editor
3 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
3 years ago
d1e23551ec
Fix handling of bridge signals when reversing inside wormhole
...
Fix handling of train detection when moving in wrong direction
3 years ago
d32a282112
Fix bridges not being redrawn after all signals reset when cleared
3 years ago
dff7ee8e1c
Fix #7611 : keeps news about accidents around after vehicle is cleaned up ( #8497 )
...
When a vehicle is cleaned up, all news that points to the news is
also removed. This was a bit evil, as it would also remove any
news related to crashed, acting like the crash never happened.
This left players a bit in the dark what was going on exactly.
3 years ago
9b28b15e67
Codechange: create MutableSpriteCache to remove the need to cast Vehicle to a mutable type in render methods
3 years ago
0f91cb0479
Fix: GetCurveSpeedLimit needs railtype from current tile ( #8466 )
3 years ago
f2c492c351
Fix reversing behind waypoint/signal in bridges/tunnels
3 years ago
933d75f532
Clear unused train cache fields, fixes warning spam on MP client load
4 years ago
9efeb3551a
Tunnel/bridge signal simulation spacing is now a company setting
4 years ago
53af61fc9e
Do not charge vehicle running costs when waiting in depot due to timetable
...
See: #202
4 years ago
92ca965ef7
Fix PBS rail type handling with incorrect GRF rail type compatibility
4 years ago
5e7b469d16
Fix reversing train inside signalled bridge/tunnel not unreserving exit
4 years ago
cce6d731a1
TBTR: Delete orphaned virtual trains on client disconnection
4 years ago
bd2649c19e
Avoid unnecessary redrawing of vehicle list windows
...
Redraw info section every tick if values have changed
4 years ago
a474e71243
Viewport: Cache landscape pixels in map mode
...
Avoid invalidating landscape pixels for non-landscape updates
(vehicles, overlays, etc.)
4 years ago
352b361e1b
Viewport: Replace viewport mark dirty if zoom level below with flags param
...
Fix missing flags for tracerestrict and effect vehicles
4 years ago
84dd35b685
Add drive-through train depot emulation (default off)
4 years ago
11a9a4dc0c
Fix no error message when attaching new template/virtual vehicle fails
...
See: #187
4 years ago
817bc44a3e
Initial implementation of tracerestrict counter mechanism
4 years ago
d2594ece79
Add routing restrictions action to control news reports about stuck trains
4 years ago
cc6be16422
Add news setting for trains waiting due to routing restrictions
4 years ago
810bfd276e
Add several NewGRF variables to vehicle image callback whitelist
...
Add vehicle flags to control cached image invalidation
Various refactorings
4 years ago
2e93ca9409
Increase verbosity of chosen track assert in TrainController
4 years ago
0202211514
Conditional orders: Add slot acquire modes to train in slot conditional
4 years ago
0dd9562ead
Continue waiting at rail waypoint if next order is a wait order for the same waypoint
4 years ago
cb6a01cab3
Fix cases where departures board data was not invalidated
4 years ago
4108672cf6
Use separate tile hash for each vehicle type
4 years ago
5240b46d1d
Reduce viewport invalidation area of signal state changes
4 years ago
76f68c48f5
Cache whether vehicle is currently drawn: Vehicle::IsDrawn()
4 years ago
ee6d808578
TBTR: Template replacements now also apply to child groups
4 years ago
06a2bedfe5
TBTR: Fix template replacement refits having 0 cost
4 years ago
7960db35f2
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
# projects/openttd_vs140.vcxproj
# projects/openttd_vs140.vcxproj.filters
# projects/openttd_vs141.vcxproj
# projects/openttd_vs141.vcxproj.filters
# projects/openttd_vs142.vcxproj
# projects/openttd_vs142.vcxproj.filters
# src/aircraft_cmd.cpp
# src/base_station_base.h
# src/core/pool_type.hpp
# src/disaster_vehicle.cpp
# src/economy.cpp
# src/engine.cpp
# src/group.h
# src/group_cmd.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/linkgraph/linkgraph_gui.cpp
# src/network/network_command.cpp
# src/network/network_server.cpp
# src/openttd.cpp
# src/order_cmd.cpp
# src/road_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/cargopacket_sl.cpp
# src/saveload/linkgraph_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/settings_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/station.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/toolbar_gui.cpp
# src/town_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehiclelist.cpp
# src/window_type.h
4 years ago
d8a1be48cd
Codechange: Replace vehicle related FOR_ALL with range-based for loops
5 years ago
aa8aae9a62
Initial implementation of tracerestrict speed restriction feature
5 years ago
cbdd9f84d8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/console_gui.cpp
# src/lang/korean.txt
# src/video/sdl2_v.cpp
# src/video/sdl2_v.h
# src/window.cpp
# src/window_gui.h
5 years ago
13cc8a0cee
Cleanup: Removed SVN headers
5 years ago
edfd378e93
Merge branch 'master' into jgrpp
...
# Conflicts:
# source.list
# src/blitter/32bpp_anim.cpp
# src/linkgraph/linkgraphjob.cpp
# src/order_cmd.cpp
# src/vehicle.cpp
# src/vehicle_type.h
5 years ago
04f659e768
Fix: Some typos found using codespell
5 years ago
e4b9eeee71
Set VRF_CONSIST_SPEED_REDUCTION flag in NormaliseTrainHead
5 years ago
d9c112cc9e
Fix #97 : Desync when moving newly built wagon
5 years ago
0299eaa45f
Clear order backup clone when train head is moved to non-head position
5 years ago
d0ee897135
Unreserve and re-reserve reservations to bidi bridge/tunnel entrances when reversing train inside
5 years ago
dae041601d
Unreserve signalled tunnel/bridge head when reversing on approach to exit
5 years ago
5bc9c8ed6e
Unreserve signalled tunnel/bridge head when entering from opposite to v->tile
5 years ago
70ef0f562b
Fix train reverse inside signalled tunnel/bridge entrance clearing reservation of incoming train
5 years ago
a1d36b02f0
Network: Add state checksum which is check in network sync
5 years ago
89a6cc3e03
Add game event flag for virtual train creation
5 years ago
162fcb050e
Only set TBTR replacement game event flag when replacement action occurs
5 years ago
36eb4165b8
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/bridge_map.h
# src/crashlog.cpp
# src/industry.h
# src/linkgraph/linkgraph_type.h
# src/order_type.h
# src/saveload/afterload.cpp
# src/settings.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/spritecache.cpp
# src/stdafx.h
# src/table/settings.h.preamble
# src/train.h
# src/vehicle.cpp
# src/viewport.cpp
# src/viewport_func.h
# src/widgets/station_widget.h
# src/zoom_func.h
# src/zoom_type.h
5 years ago
8fefef9d19
TBTR: Do not allocate virtual trains a unit number in NormaliseTrainHead
5 years ago
f3daada67f
TBTR: Avoid built virtual wagons which can't be attached being orphaned
5 years ago
5a2e498182
TBTR: Avoid articulated/rear units being added to tile hash
5 years ago
c7a9950269
Add game event for train crash
5 years ago
96f000226e
Exclude virtual trains from various vehicle list iterations
5 years ago
f0ffb52f2f
Fix per-railtype 90 deg turn setting with dual rail type tiles
5 years ago
8042150a35
Add error messages for vehicle build failure due to wrong depot owner and rail type
5 years ago
ee06258629
TBTR: Fix front engine not being cleared when being replaced. and kept in depot
5 years ago
49f6490c7d
Fix potential non-determinism in vehicle autorenew/template replace/pay for repair/sell
5 years ago
9d861fb8a0
TBTR: Allow cloning virtual/template trains with unavailable engines
5 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
5 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
5 years ago
ba34ec7ade
Merge branch 'master' into jgrpp
...
Replace build and refit, and group collapse implementations
Fix template creation build and refit
# Conflicts:
# Makefile.bundle.in
# config.lib
# src/animated_tile.cpp
# src/blitter/32bpp_anim.hpp
# src/blitter/32bpp_base.hpp
# src/blitter/8bpp_base.hpp
# src/blitter/null.hpp
# src/build_vehicle_gui.cpp
# src/command.cpp
# src/command_func.h
# src/console_gui.cpp
# src/core/smallstack_type.hpp
# src/date.cpp
# src/debug.cpp
# src/genworld_gui.cpp
# src/ground_vehicle.hpp
# src/group_gui.cpp
# src/lang/korean.txt
# src/linkgraph/linkgraph_gui.h
# src/main_gui.cpp
# src/misc_gui.cpp
# src/network/core/game.h
# src/network/core/packet.cpp
# src/network/core/udp.cpp
# src/network/core/udp.h
# src/network/network_content.cpp
# src/network/network_type.h
# src/network/network_udp.cpp
# src/newgrf_house.h
# src/openttd.cpp
# src/order_cmd.cpp
# src/order_gui.cpp
# src/os/unix/crashlog_unix.cpp
# src/os/windows/crashlog_win.cpp
# src/osk_gui.cpp
# src/pathfinder/opf/opf_ship.cpp
# src/rail_cmd.cpp
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/smallmap_gui.h
# src/station_base.h
# src/station_cmd.cpp
# src/table/gameopt_settings.ini
# src/table/newgrf_debug_data.h
# src/table/settings.ini
# src/timetable_gui.cpp
# src/toolbar_gui.cpp
# src/train_gui.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehiclelist.cpp
# src/viewport.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
5 years ago
c01a2e2a81
Codechange: Removed SmallVector completely
5 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
5 years ago
5e6d283463
Merge branch 'master' into jgrpp
...
Remove the viewport sign cache as this is now superseded by the kd tree
implementation
# Conflicts:
# src/crashlog.cpp
# src/lang/english.txt
# src/misc.cpp
# src/pathfinder/follow_track.hpp
# src/pbs.cpp
# src/rail_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/settings.cpp
# src/settings_gui.cpp
# src/ship_cmd.cpp
# src/station.cpp
# src/station_base.h
# src/station_cmd.cpp
# src/table/settings.ini
# src/thread/thread_morphos.cpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/waypoint.cpp
5 years ago
cc5f175615
Feature: Railtype flags to allow/disallow 90 degree curves. ( #7352 )
5 years ago
5be04b6427
Fix wrong track piece being used in ConsistChanged after a rail type change
5 years ago
635ee89b86
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/economy.cpp
5 years ago
664ecdcb89
Revert "Revert "Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )""
...
This reverts commit ec736d8b40690d1dd6a4
5 years ago
690d1dd6a4
Fix #7159 , e934f09: Waiting time at red one-way signals was too short.
...
This is not an exact fix as previously, the wait time was speed/acceleration dependant. This simple fix ignores that and just makes the 'days' from the settings comment to be actually days.
5 years ago
8ec9f5e174
Fix case where trains were unable to exit signalled bridge/tunnels
5 years ago
7bc010d402
Avoid unnecessary calls to InvalidateVehicleTickCaches
...
Don't call from Train::ConsistChanged
5 years ago
3b55f5d765
Cache whether ground vehicles currently have 0 slope resistance
5 years ago
7ae2aa93ea
Allow trains to reverse in station when front is in a bridge/tunnel
5 years ago
f64cb4048e
Fix trains not reversing in station when front is on a diagonal rail piece
5 years ago
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
5 years ago
ec736d8b40
Revert "Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )"
...
This reverts commit e934f09f02
5 years ago
029c48cf4a
Cleanup: [NPF] Remove unused parameter.
5 years ago
96c5e5e73a
Cleanup: [NPF] Remove unused parameters.
5 years ago
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
5 years ago
a47c4c781c
Restore gv_flags when aborting train entering/exiting wormhole
...
This fixes train disconnecting when reversing at the end of a
sloped bridge ramp due to heading the wrong way onto a signalled bridge.
5 years ago
37adf9be4a
Cache the last vehicle in a consist to have a visual effect
5 years ago
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
5 years ago
e15601e12f
Cache whether a train may have a depot or bridge speed restriction
5 years ago
d87ac8ec7e
Improve performance of train breakdown detection
5 years ago
e3d167f9f0
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# config.lib
# src/misc_gui.cpp
# src/network/network_gui.cpp
# src/settings_type.h
# src/smallmap_gui.cpp
# src/smallmap_gui.h
# src/station_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle_gui.cpp
# src/window.cpp
5 years ago
96854b2b8b
Codechange #5859 : Simplify CheckTrainStayInDepot() ( #7045 )
5 years ago
e934f09f02
Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )
5 years ago
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
cd41683b9b
Add tracerestrict feature reverse behind signal
6 years ago
e735c1a51a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/aircraft_cmd.cpp
# src/autoreplace_cmd.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/script_station.hpp
# src/track_func.h
# src/vehicle_base.h
6 years ago
bb7353c02a
Codechange: Some more null checks
6 years ago
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
ee00a28717
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
6 years ago
c4f5c8e789
TBTR: Add option to replace only old vehicles
6 years ago
ce4e2ca3c3
Add setting to enable flipping direction of all train types in depot
6 years ago
16a245ccab
Merge branch 'signal_tunnels_bridges' into jgrpp
6 years ago
9638d22ff7
Fix clearing wrong M2 bit in GetAndClearLastBridgeEntranceSetSignalIndex
6 years ago
23cfd4709c
Merge branch 'signal_tunnels_bridges' into jgrpp
6 years ago
a0ef4ea760
Fix incorrect signal offsets in GetAndClearLastBridgeEntranceSetSignalIndex
...
Fixes #65
6 years ago
f59535c0b7
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
60cc1a48ac
Refresh trace restrict slots window as with the train list window
6 years ago
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
f13b686d0c
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/train_cmd.cpp
6 years ago
1b9775479d
Fix incorrect vehicle alignment when entering bridge from W,N directions
6 years ago
a87720ca06
Fix train bounding box/delta not being updated when entering bridge from 45° angle
6 years ago
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
6 years ago
0dd3ff23de
Fix signalled tunnel/bridge entrance not being marked dirty when reservation cleared
6 years ago
c2678b896e
Fix clearing of train reservations in tunnels and on bridges.
...
(cherry picked from commit e2c4fb517d1064b163d8f2b0627506d785ffb3ed)
See: #46
6 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
6 years ago
c779915ccb
Fix train through load always advancing last section to far end of platform
6 years ago
f012d45491
Merge branch 'signal_tunnels_bridges' into jgrpp
6 years ago
df72bc6e09
Fix signal on tun/bridge gradual decel end tile detection
6 years ago
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
6 years ago
4a9df57665
TBTR: Enable autorenew when template replacement active
6 years ago
Jonathan G Rennison
Patric Stout
Michael Lutz
Vít Šefl
glx22
Andreas Schmitt
rubidium42
frosch
Charles Pigott
Matt Kimber
Andy
S. D. Cloudt
JMcKiern
Henry Wilson
J0an Josep
Andy
Niels Martin Hansen
PeterN
keldorkatarn
HackaLittleBit