0748d540e8
Implement improved breakdown speed reductions for ships
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
4cf6b1e923
Fix ViewportAddVehiclesIntl using wrong image rotation for ships
...
When rotating in place
3 years ago
977604ef08
Feature: [Linkgraph] Prioritize faster routes for passengers, mail and express cargo
...
Passengers usually prefer fast paths to short paths.
Average travel times of links are updated in real-time for use in Dijkstra's algorithm,
and newer travel times weigh more, just like capacities.
3 years ago
71dfd2900a
Add depot order flag for specific depot
...
Use upper half of order flags for extra depot flags
See: #302
3 years ago
fd0cb63963
Fix send vehicle to specific depot allowing incompatible rail types
3 years ago
382955396f
Fix send vehicle to specific depot allowing incompatible road/tram types
...
See: #302
3 years ago
5fb3eb0bb9
Adjust signal speed restriction timeouts when date or day length changed
3 years ago
c1bf236a26
Rewrite the ATC logic
...
Now signals store speed information with a timeout for this data's validity
3 years ago
55a11710a6
Codechange: convert printf DEBUG statements to fmt Debug statements
3 years ago
1002c6d9d2
Fix various compiler warnings
...
See: #267
3 years ago
28e90769f7
Codechange: use "[[maybe_unused]]" instead of a wide variety of other ways we had
...
While at it, replace OTTD_ASSERT with WITH_ASSERT, as this
is always set if assert() is valid. No matter if NDEBUG is set
or not.
3 years ago
5799402f7a
Codechange: Rename window related DeleteXXX to match new behaviour
3 years ago
aa0c1ba2e0
Only update vehicle image when in the vicinity of a viewport
...
This reduces the performance impact of expensive NewGRF
graphics chains.
3 years ago
a15e26f369
NewGRF: Elide unmasked vehicle callbacks where possible
...
This includes:
* CBID_VEHICLE_32DAY_CALLBACK
* CBID_VEHICLE_REFIT_COST
* CBID_VEHICLE_MODIFY_PROPERTY
This is on a per-property basis
The main benefit of this is to avoid callbacks not handled by the
vehicle's current sprite group from using the full graphics chain as
the "default" branch in the callback switch.
In the case where the graphics chain is long/expensive, a lot of work
had to be done before a callback failure result was eventually returned.
3 years ago
520595ff87
Fix 3d7ab09: stopped trains not updating viewport hash when reversed for a second time ( #9165 )
3 years ago
e6a858c0dc
Fix date cheat/scenario load not adjusting vehicle date of last service
3 years ago
d484c32d44
Reduce sensitivity of train overheated breakdown
3 years ago
dd798d688b
Fix #8919 : Release builds with asserts enabled ( #8925 )
3 years ago
fece1c57ca
Codechange: Suppress warnings when asserts are disabled ( #8917 )
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
a4035af337
Codechange: Apply coding style ( #8640 )
...
* Fix: Missing or needed spaces
* Codechange: Remove space
* Codechange: Remove space
* Codechange: More missing spaces
* Codechange: Missing spaces
* Codechange: Remove space
* Codechange: Remove space
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
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
ed0ffb6220
Add feature: realistic train braking
...
Add setting to select train braking model.
3 years ago
40d5fe1631
Fix eeb88e8: Trains reversed while paused do not correctly update sprite bounds ( #8540 )
3 years ago
188bf0fbc9
Change: Remove disable_unsuitable_building setting
...
This setting is no longer useful, as you can now always build roads,
canals, etc.
3 years ago
9b800a96ed
Codechange: Remove min/max functions in favour of STL variants ( #8502 )
3 years ago
5728f9c7d0
Codechange: consider vehicle co-ordinates when identifying viewport candidate as using only the hash generates false positives
3 years ago
9b28b15e67
Codechange: create MutableSpriteCache to remove the need to cast Vehicle to a mutable type in render methods
3 years ago
eeb88e87d8
Codechange: improve performance for complex vehicle chains by resolving sprites less often
3 years ago
204f8e173f
Fix sprite bound issues for vehicles which vary bounds with curvature
...
If a vehicle uses curvature vars 0x45 or 0x62, cache the directions
of its 4 nearest neighbours, and check them in UpdateViewport along
with the vehicle's own direction.
3 years ago
860c270c73
Codechange: Replace assert_compile macro with static_assert
3 years ago
78b06ddc40
TBTR: Fix palette recolouring of templates
...
Fix group overrides affecting template image when cloning vehicle
Update template when changing company colours
Update template images on demand instead of at load
3 years ago
99b2698658
Update vehicle image on demand when image is continuously updated by GRF
...
This is for trains/RVs only (to avoid issues with variable sprite bounds)
This largely fixes the performance issues of continuously updating
vehicle images
4 years ago
75eeac8ff9
Fix crash when skipping suppressed unreached implicit orders on load
4 years ago
cce6d731a1
TBTR: Delete orphaned virtual trains on client disconnection
4 years ago
e684135e4a
Add fast path to ViewportMapDrawVehicles horizontal hash bit check
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
933d02dce2
Change: Service depot also reset breakdown chance.
4 years ago
ff12051ee1
Only show ship is lost messages if lost for a significant time
4 years ago
5b78090a61
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# src/saveload/town_sl.cpp
# src/screenshot.h
# src/script/api/ai/ai_date.hpp.sq
# src/script/api/ai/ai_marine.hpp.sq
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_date.hpp.sq
# src/script/api/game/game_marine.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/game/game_window.hpp.sq
# src/script/api/script_window.hpp
# src/script/api/template/template_window.hpp.sq
# src/signal.cpp
# src/statusbar_gui.cpp
# src/toolbar_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
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
a10013dd00
Codechange: Spell 'Viewport' consistently
...
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
4 years ago
002e99ac34
Debug: Show tile info on separate lines in vehicle debug window
4 years ago
1f5de8b82c
Auto separation: Remove circular linked list, use new algorithm
4 years ago
894fd6c609
Add separation state to DumpVehicleFlags
4 years ago
09a1a7ce1a
Auto-separation: Tidy up Vehicle::InitSeparation
4 years ago
b520193831
Fix incorrect news parameters for vehicle too heavy advice message
4 years ago
3adeff1883
Merge branch 'master' into jgrpp
...
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
4 years ago
218db00c4c
Fix #8216 : Don't show floating text on autoreplace if cost is 0
4 years ago
f2b40f40aa
Codechange: Replace SmallPair with std::pair.
...
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
4 years ago
f077c3bf6e
Merge branch 'master' into jgrpp
4 years ago
b50d77b831
Fix #8064 : Incorrect display of refit capacity
4 years ago
f3145030b7
Fix false positive in ValidateVehicleTileHash
4 years ago
cb6a01cab3
Fix cases where departures board data was not invalidated
4 years ago
a4608f6f72
Cache vehicle positions across draw blocks in viewport map mode
4 years ago
4108672cf6
Use separate tile hash for each vehicle type
4 years ago
4020719227
Exclude effect and disaster vehicles from vehicle tile hash
4 years ago
de2c2f7cea
Fix 37adf9be: Fix last effect flag not being checked if front has no effect
4 years ago
76f68c48f5
Cache whether vehicle is currently drawn: Vehicle::IsDrawn()
4 years ago
9917a1daef
Scheduled dispatch: Add hints about dispatch order to timetable window
...
Adjust condition for dispatch order
4 years ago
c3fce9c09b
Fix ff628813: Inverted test for if train refit state matches template
4 years ago
7611e1229c
Use 0 for per-cargo percent loaded value when capacity is 0
4 years ago
09b13dd484
Add conditional orders for cargo load percentage and waiting cargo amount
...
See: #90
4 years ago
ee6d808578
TBTR: Template replacements now also apply to child groups
4 years ago
ff6288139e
TBTR: Send train to depot when replacement due but servicing disabled
...
This is to match autoreplace
4 years ago
424813446f
TBTR: Avoid unnecessary iterations of template replacement pool
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
9e7c5235e8
Fix #7891 : Actually check the vehicle type before casting
4 years ago
d8a1be48cd
Codechange: Replace vehicle related FOR_ALL with range-based for loops
5 years ago
1f6b3a37f9
Codechange: Replace FOR_ALL_ENGINES with range-based for loops
5 years ago
ddabfed1cd
Codechange: Replace station related FOR_ALL with range-based for loops
5 years ago
ec0b5e0ed0
Improve performance of departures window
...
See: #119
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
455e694e79
Refactor effect vehicle cache to reduce cost of inserts/removes
5 years ago
04f659e768
Fix: Some typos found using codespell
5 years ago
ba9d1a0390
Merge branch 'jgrpp' into jgrpp-nrt
...
# Conflicts:
# .ottdrev-vc
# README.md
# jgrpp-changelog.md
5 years ago
9a05ea67d5
Add chicken bits setting
...
2 bits so far
5 years ago
7ed86e7488
Merge branch 'jgrpp' into jgrpp-nrt
5 years ago
162fcb050e
Only set TBTR replacement game event flag when replacement action occurs
5 years ago
ba8ed880c1
Merge branch 'master' into jgrpp-nrt
...
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
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
9b87610cd6
Check vehicle tile hash in CheckCaches
5 years ago
31ad8bdd07
Do not add virtual vehicles to tile hash
5 years ago
5b7d1f7f80
Add game event for TBTR replacement attempt
5 years ago
49f6490c7d
Fix potential non-determinism in vehicle autorenew/template replace/pay for repair/sell
5 years ago
1e51d7af2f
Add console command to dump vehicle stats
5 years ago
10d0f79e83
Validate vehicle tick caches in CheckCaches
5 years ago
c02ef3e456
Feature: Add NotRoadTypes (NRT)
5 years ago
5b34c8019f
Codechange: Remove Company/OwnerByte types
5 years ago
d47c083e00
Comment out some unused constants
5 years ago
2a41d783cd
Adjust vehicle position filter in ViewportMapDrawVehicles
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
99b79c26c6
Remove disaster vehicles from tick cache immediately on deletion
5 years ago
cc62f4163f
Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector
5 years ago
ab711e6942
Codechange: Replaced SmallVector::[Begin|End]() with std alternatives
5 years ago
297fd3dda3
Codechange: Replaced SmallVector::Include() with include()
5 years ago
a0f36a50e6
Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back()
5 years ago
f3938fdb83
Codechange: Replaced SmallVector::Reset() with std::vector::clear() + shrink_to_fit()
5 years ago
bfd79e59dc
Codechange: Replace SmallVector::Clear() with std::vector::clear()
5 years ago
8acca3a72b
Change: Do not display a newspaper about old vehicles for which replacement is activated.
5 years ago
1c84d80333
Fix dumping of subtype for non ground vehicles in DumpVehicleFlags
5 years ago
dd94c4d22d
Skip Vehicle::UpdateViewport in network dedicated mode
5 years ago
3b55f5d765
Cache whether ground vehicles currently have 0 slope resistance
5 years ago
ac5b4b9454
De-virtualise call to EffectVehicle::Tick in CallVehicleTicks
5 years ago
e28e2f638e
Fix handling of effect vehicles in CallVehicleTicks
...
Move effect vehicles into separate cache vector
Call effect vehicle ticks before other vehicle types
See #76
5 years ago
2fdcc52321
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/lang/dutch.txt
# src/lang/korean.txt
# src/network/network.cpp
# src/network/network_client.cpp
# src/rail.cpp
# src/rail_cmd.cpp
# src/saveload/afterload.cpp
# src/ship_cmd.cpp
# src/toolbar_gui.cpp
# src/vehicle.cpp
5 years ago
22f33fdd08
Fix 148e5b41d6: Uninitialized variable usage. ( #7216 )
5 years ago
148e5b41d6
Change: Skip reliability decay if servicing is disabled
5 years ago
d242875d27
Fix #7197 : Invalidate depot buttons when necessary. ( #7212 )
5 years ago
d03cb80346
Fix: trains cancelling their pending reversal when ordered to go to a depot behind them
...
Previously, if a train had been ordered to reverse, and while it was slowing down, was
ordered to travel to a depot that is behind it, the train would continue forwards.
Also when a train had been ordered to reverse, and while it was slowing down, was
ordered to travel to a depot that is in front of it, the train would not cancel the
reversal.
In both cases the train would travel away from the target depot.
Trains in this situation now behave correctly and will travel towards the depot.
5 years ago
e3b440c9c5
Add #5006 : Flag to hide rail type from construction.
5 years ago
2142452305
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# Makefile.src.in
# findversion.sh
# projects/determineversion.vbs
# src/gamelog.cpp
# src/gamelog_internal.h
# src/lang/german.txt
# src/lang/korean.txt
# src/network/core/config.h
# src/network/network.cpp
# src/network/network_udp.cpp
# src/rev.h
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/saveload/depot_sl.cpp
# src/saveload/gamelog_sl.cpp
# src/saveload/misc_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/saveload.cpp
# src/saveload/station_sl.cpp
# src/saveload/town_sl.cpp
# src/saveload/vehicle_sl.cpp
# src/table/settings.ini
# src/viewport.cpp
5 years ago
e8f1c446a6
Fix: DMU/EMU livery should apply to passenger carriages with DMU/EMU engines.
5 years ago
ddf31702a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/group_gui.cpp
# src/lang/english.txt
# src/saveload/saveload.cpp
# src/widgets/group_widget.h
5 years ago
23960d0f2c
Feature: Group liveries, and livery window usability enhancements. ( #7108 )
...
* Change: Replace checkbox in livery selection window with Default option in drop down selection.
This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.
* Feature: Add vehicle group liveries.
5 years ago
98aa58a6b4
Log position tile where it differs from vehicle tile in DumpVehicleFlags
5 years ago
8105b5582e
Add track to train DumpVehicleFlags
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
191afd93c1
Merge branch 'save_ext' into jgrpp
...
# Conflicts:
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/settings.cpp
# src/station_cmd.cpp
# src/table/settings.ini
# src/vehicle_base.h
# src/widgets/dropdown.cpp
5 years ago
81330b8d6e
Change: Add path cache for ships.
5 years ago
f4180e8714
Check vehicle sound setting before motion/tick counts in CallVehicleTicks
5 years ago
d87ac8ec7e
Improve performance of train breakdown detection
5 years ago
841ea7639f
De-virtualise most common calls to Vehicle::Tick
5 years ago
d8ccad91f9
Fix: Some code and comment typos
...
Found with codespell
5 years ago
d78db1c004
Dump tile data in Vehicle::DumpVehicleFlags
6 years ago
65b9a103ad
Initial implementation of two rail types per tile
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
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
a96428ed13
Fix timetabling of through-load orders
6 years ago
0e3986c39c
Extend timetable wait/travel times from 16 to 32 bits wide
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
1c41cff322
Add GV flags and reversing distance to DumpVehicleFlags
6 years ago
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
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
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
3330e4cef8
Merge branch 'cargo_type_order' into jgrpp
...
# Conflicts:
# src/pathfinder/yapf/yapf_common.hpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/order_sl.cpp
# src/saveload/station_sl.cpp
# src/track_func.h
6 years ago
00b1fe6246
Cargo type orders: Add support for 64 cargo types
6 years ago
0ae32838ea
Merge branch 'save_ext' into cargo_type_order
...
# Conflicts:
# src/core/smallstack_type.hpp
6 years ago
ef0a458ab6
Add go to depot and sell vehicle orders
...
Controlled by a setting (default off)
6 years ago
b5dea7f236
Fix undefined behaviour in Vehicle destructor
6 years ago
58ccafbf1d
Debug: Add vehicle_flags and cargo_payment to veh flags dump
6 years ago
943f4fdabb
Debug: Add train and RV flags to scope info dump
...
Move flag dumping to separate function
6 years ago
016f0bdfaf
Through load: Fix getting and checking station veh/tile when leaving station
6 years ago
ec8ad55bb5
Clear all VF_CARGO_UNLOADING flags when leaving station
6 years ago
4aa211e454
Merge branch 'crashlog_improvements' into jgrpp
6 years ago
bb8c18b017
Add scope info logging to LoadUnloadStation
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
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
6 years ago
53dd010f3b
Add way to mass cancel vehicle go to depot/service
6 years ago
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
6 years ago
5558899621
(svn r27986) -Codechange: Name magic constants in the vehicle position hash functions.
6 years ago
6b088d37bf
(svn r27986) -Codechange: Name magic constants in the vehicle position hash functions.
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
06a2457efc
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
6 years ago
64d9f88802
TBTR: Fix bugs when both autoreplace and template replacement active on same vehicle
6 years ago
233b0f8e9e
TBTR: Add sanity check assertions
6 years ago
d730cfd51d
Cache sprite sequence bounds for vehicles
6 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
0a80aec634
Implement critical breakdown speed reduction for road vehicles
7 years ago
218085c535
Timetable: Implement autofill/automate for taken conditional orders.
...
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
7 years ago
6df5cac0df
Merge branch 'enhanced_viewport_overlay' into jgrpp
...
# Conflicts:
# src/vehicle.cpp
7 years ago
4a6ddb2d50
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# config.lib
7 years ago
2574e46df8
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/smallmap_gui.cpp
7 years ago
add9be20a0
Merge branch 'enhanced_viewport_overlay' into jgrpp
7 years ago
d3a1e8060d
Fix vehicle draw flickering, particularly in viewport map mode
...
Incorrect bounds check in ViewportAddVehicles/ViewportMapDrawVehicles
7 years ago
88726f71b6
(svn r27904) -Fix [FS#6593]: When last vehicle is removed from shared orders group, hide the "Stop sharing" button in vehile orders window
7 years ago
dbf7ed502a
(svn r27904) -Fix [FS#6593]: When last vehicle is removed from shared orders group, hide the "Stop sharing" button in vehile orders window
7 years ago
ac016eae5e
Add client setting to enable shared order group window for single vehicles
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
965938c0f5
Merge branch 'scheduled-dispatch-sx' into jgrpp
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
0b8f0e64ec
Scheduled Dispatch feature
...
Code is tested and run well on small-ish train network. Not tested extensively.
7 years ago
0acb4fdd2f
Safer level crossings: add setting to improve RV level crossing safety.
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
6417fb16c3
Initial implementation of trace restrict slots
7 years ago
19d56a33e8
(svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR)
7 years ago
0887289e3d
(svn r27822) -Feature: Vehicle Group Info: Add profits and occupancy display to group vehicle list (mtm, JGR)
7 years ago
9d5f34fea6
Replace various uses of std::set/map with btree containers.
7 years ago
1e1fcc471b
Replace leftover debug print from veh repair fix with scope info fmt.
...
Fixes c6b1decaf
7 years ago
c6b1decafd
Do not pay for repair cost when vehicle is being auto-replaced.
7 years ago
c600ffe6d5
Fix go to nearest depot and halt orders, not halting.
7 years ago
7ecdebddb3
Change and simplify algorithm for vehicle repair cost.
...
This is due to absurdly high repair costs for old vehicles with
old algorithm, due to implicit exponential increases.
Get rid of variable in vehicle struct.
8 years ago
51d4a6b14d
Merge branch 'improved_breakdowns' into jgrpp
8 years ago
5ba666883b
Fix double/inconsistent updating of variables when servicing vehicle.
8 years ago
dcbde21f18
Merge branch 'save_ext' into improved_breakdowns
...
# Conflicts:
# src/train_cmd.cpp
8 years ago
0d1e08ed75
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/clear_cmd.cpp
8 years ago
09188e30f9
Exclude virtual/template vehicles from vehicle ageing and news messages.
8 years ago
55e57fd07d
Add shift-clicking on vehicle depot button to select specific depot.
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
d204062300
Merge branch 'master' into template_train_replacement
8 years ago
117e73751c
(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.
8 years ago
ba566e9126
(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.
8 years ago
c175067ed9
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
8 years ago
a37bb32fd6
(svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw.
8 years ago
d2393b4f6c
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
f36539837e
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
16ce37ad14
Show vehicle route markers when cargo load by type window focused.
8 years ago
e844b82d9e
Use vector instead of list for Station::loading_vehicles.
8 years ago
c20cf31514
Merge branch 'cpp-11' into enhanced_viewport_overlay
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
# src/smallmap_gui.cpp
8 years ago
f7774415f2
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# src/stdafx.h
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
ca98e78c69
Remove unused Vehicle capacity methods
...
Remove unused methods Vehicle::GetConsistFreeCapacities and
Vehicle::GetConsistTotalCapacity.
(cherry picked from commit d97442878f9856c253a3bf976b6a3e114faebefe)
8 years ago
6031cca2d7
Refactor Link Refresher cargo mask handling.
...
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
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
5b7eb46fe4
Merge branch 'improved_breakdowns-sx' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
8 years ago
60d5bbc0e7
Fix improved breakdowns aircraft speed-reductions.
...
Breakdown speed was wrong and possibly 0 for planes with
GRF-defined speed limits.
8 years ago
655b329142
Merge branch 'master' into jgrpp
...
# Conflicts:
# config.lib
8 years ago
dac94c7cbc
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
8 years ago
a66e0ff1f4
(svn r27584) -Codechange: Add some assertions about Vehicle::cargo_payment.
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
13c88dcef2
Merge branch 'template_train_replacement-sx' into jgrpp
8 years ago
bdca33ee80
Merge branch 'crashlog_improvements' into jgrpp
8 years ago
5359c43ec1
Add scope logging for Vehicle::PreDestructor.
8 years ago
330a7327d6
Minor changes to avoid undefined behaviour warnings.
...
Avoid creating a reference from a nullptr.
Avoid trying a malloc and memcpy into a 0 length buffer.
Virtual trains should never be drawn.
8 years ago
6741c98f6b
TBTR: Fix virtual trains being created at load using wrong company.
...
Fix virtual trains showing up in company engine counts.
8 years ago
4722c81e88
Merge branch 'crashlog_improvements' into jgrpp
8 years ago
0062881a46
Avoid using malloc in scope guard logger.
...
Use a temporary object with its own buffer, which lives on the stack.
Reformat SCOPE_INFO_FMT to not be all on one line.
Other minor reformatting.
8 years ago
1e9ab8e64e
Template replacement usage of scope guard logging.
8 years ago
5dba89c783
Merge branch 'crashlog_improvements' into jgrpp
...
# Conflicts:
# source.list
# src/openttd.cpp
# src/stdafx.h
# src/vehicle.cpp
8 years ago
ae6e43c5fa
Initial uses of scope guard logging.
8 years ago
580b2f7584
Merge branch 'template_train_replacement-sx' into jgrpp
...
Remove a duplicated declaration.
# 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/group_gui.cpp
# src/lang/english.txt
# src/network/network_command.cpp
# src/saveload/extended_ver_sl.cpp
# src/saveload/extended_ver_sl.h
# src/saveload/saveload.cpp
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_gui.cpp
# src/vehicle_gui_base.h
# src/window_type.h
8 years ago
Jonathan G Rennison
Nicolas Chappe
Andreas Schmitt
rubidium42
Patric Stout
glx22
Matt Kimber
Charles Pigott
frosch
SamuXarick
Matt Kimber
Galigator
TechGeekNZ
Michael Lutz
S. D. Cloudt
JMcKiern
peter1138
Henry Wilson
stormcone
PeterN
Eddi-z
nikolas
Niels Martin Hansen
adf88
innocenat
cirdan