4386da53ee
Slightly overestimate descents when deciding if reservation long enough
4 years ago
8cf2b827a1
Avoid pessimising braking speed when descending slope
...
When calculating speed using variable braking force
4 years ago
843dce94a4
Fix mispredicted stop location when through-loading
...
When using realistic braking and skipped train parts have different
lengths.
4 years ago
f7dcd66f08
Fix unnecessary braking when leaving station with order without non-stop flag
4 years ago
dbbe1bb3e4
Fix trains passing signals in original acceleration with braking models
4 years ago
056606d2b6
Fix ApplyLookAheadItem assuming current_order == order in order list
...
Fixes trains with no orders failing to brake in advance of stations
4 years ago
460d504269
Fix order index wrapping when depth exceeded in AdvanceOrderIndex
4 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
4 years ago
d9b4413bc9
Codechange: rename sound ids to make more sense. ( #8701 )
4 years ago
8fc4f13672
Fix train speed not being set to 0 for timetabled wait at waypoint orders
4 years ago
35d720b0ad
Add tracerestrict PBS end signal conditional
...
This is for realistic braking long reserve
4 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
4 years ago
8a814bbfe3
Add release slot train order
4 years ago
62ea3b7794
Use original speeds when braking at station in original braking mode
...
Partially reverts: 628077d0
4 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
4 years ago
48395cb2db
Fix assert when freeing train reservation from track edit command
4 years ago
5283e16946
Fix misspelling of variable name: acceleration_type
4 years ago
d52eebb829
Set value of cached_uncapped_decel in original acceleration model
...
This is to avoid false positive cache mismatch messages
4 years ago
c1f1b5f3b3
Give monorail/maglev larger realistic braking deceleration limits
4 years ago
4e1b1bc91e
Fix wrong power units used for maglev realistic braking deceleration calc
4 years ago
a9b82b817b
Prevent signed overflow of lookahead position
4 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
4 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
4 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
4 years ago
4e0804b791
Fix const issues around GetTrainStopLocation/GetCurrentMaxSpeed
4 years ago
87c87649b8
Fix lookahead init inside a signalled tunnel/bridge only filling interior
4 years ago
62fffddb3f
Don't mark train stuck if no reachable track in TryPathReserve
4 years ago
628077d0bb
Fix missing stop due to speed when entering station with lookahead
4 years ago
ed0ffb6220
Add feature: realistic train braking
...
Add setting to select train braking model.
4 years ago
1838e8939f
Improve handling of reversing inside bidi signalled tunnel/bridge
...
Avoid train crashes when reversing trains either side of entrance tile
4 years ago
e0893de5c3
Set tunnel/bridge PBS exit to red when leaving
4 years ago
aacb70d371
Debug: Extend random debug logging to also include state checksum updates
4 years ago
4f44540eb9
Fix false positive desync messages for vehicle cached weight/length
4 years ago
6a6d9f3773
Fix tunnel/bridge PBS start tile in TryPathReserve
4 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.
4 years ago
d666036ffd
TBTR: Close vehicles window when acquiring idle vehicle for replacement
...
This fixes possible duplicate vehicle windows, which is not allowed
4 years ago
515aeb04e0
TBTR: Add support for vehicle reversed flag
4 years ago
e9f7783327
TBTR: Allow flipping direction of vehicles in template editor
4 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
4 years ago
d1e23551ec
Fix handling of bridge signals when reversing inside wormhole
...
Fix handling of train detection when moving in wrong direction
4 years ago
d32a282112
Fix bridges not being redrawn after all signals reset when cleared
4 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.
4 years ago
9b28b15e67
Codechange: create MutableSpriteCache to remove the need to cast Vehicle to a mutable type in render methods
4 years ago
0f91cb0479
Fix: GetCurveSpeedLimit needs railtype from current tile ( #8466 )
4 years ago
f2c492c351
Fix reversing behind waypoint/signal in bridges/tunnels
4 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
5 years ago
4108672cf6
Use separate tile hash for each vehicle type
5 years ago
5240b46d1d
Reduce viewport invalidation area of signal state changes
5 years ago
76f68c48f5
Cache whether vehicle is currently drawn: Vehicle::IsDrawn()
5 years ago
ee6d808578
TBTR: Template replacements now also apply to child groups
5 years ago
06a2bedfe5
TBTR: Fix template replacement refits having 0 cost
5 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
5 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
6 years ago
674732cd68
Merge: Codechange: Use null pointer literal instead of the NULL macro
6 years ago
7c8e7c6b6e
Codechange: Use null pointer literal instead of the NULL macro
6 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
6 years ago
c01a2e2a81
Codechange: Removed SmallVector completely
6 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
6 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
6 years ago
a690936ed7
Codechange: Replace SmallVector::Length() with std::vector::size()
6 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
6 years ago
cc5f175615
Feature: Railtype flags to allow/disallow 90 degree curves. ( #7352 )
6 years ago
5be04b6427
Fix wrong track piece being used in ConsistChanged after a rail type change
6 years ago
635ee89b86
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/economy.cpp
6 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
6 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.
6 years ago
8ec9f5e174
Fix case where trains were unable to exit signalled bridge/tunnels
6 years ago
7bc010d402
Avoid unnecessary calls to InvalidateVehicleTickCaches
...
Don't call from Train::ConsistChanged
6 years ago
3b55f5d765
Cache whether ground vehicles currently have 0 slope resistance
6 years ago
7ae2aa93ea
Allow trains to reverse in station when front is in a bridge/tunnel
6 years ago
f64cb4048e
Fix trains not reversing in station when front is on a diagonal rail piece
6 years ago
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
6 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
6 years ago
029c48cf4a
Cleanup: [NPF] Remove unused parameter.
6 years ago
96c5e5e73a
Cleanup: [NPF] Remove unused parameters.
6 years ago
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
6 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.
6 years ago
37adf9be4a
Cache the last vehicle in a consist to have a visual effect
6 years ago
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
6 years ago
e15601e12f
Cache whether a train may have a depot or bridge speed restriction
6 years ago
d87ac8ec7e
Improve performance of train breakdown detection
6 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
6 years ago
96854b2b8b
Codechange #5859 : Simplify CheckTrainStayInDepot() ( #7045 )
6 years ago
e934f09f02
Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )
6 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
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
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
Jonathan G Rennison
frosch
Patric Stout
Charles Pigott
Matt Kimber
Andy
glx
S. D. Cloudt
JMcKiern
Henry Wilson
Michael Lutz
J0an Josep
Andy
Niels Martin Hansen
PeterN
keldorkatarn
HackaLittleBit
peter1138