fe2bcd2a58
Codechange: migrate size related functions to Map structure
1 year ago
0310fb0cdc
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/czech.txt
# src/lang/galician.txt
# src/lang/german.txt
# src/order_cmd.cpp
# src/saveload/afterload.cpp
# src/ship.h
# src/vehicle.cpp
1 year ago
375a5b8e3f
Codechange: refactor FindClosestDepot to not use pointers, but return a struct
1 year ago
58d841486e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/os/windows/font_win32.cpp
# src/script/api/script_object.hpp
# src/town_cmd.cpp
# src/train_cmd.cpp
# src/viewport.cpp
# src/viewport_func.h
2 years ago
7b5edba76c
Change: Support flipping shorter engines without NewGRF support. ( #10262 )
...
* Change: Support flipping shorter engines without NewGRF support.
* Cleanup: Remove write-only prop27_set temporary flag.
2 years ago
6d4474b84e
Merge tag '13.0-beta2' into jgrpp
...
# Conflicts:
# src/cheat_gui.cpp
# src/company_gui.cpp
# src/console_gui.cpp
# src/depot_gui.cpp
# src/error_gui.cpp
# src/gfx.cpp
# src/graph_gui.cpp
# src/group_gui.cpp
# src/lang/english.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/misc_gui.cpp
# src/network/network_content_gui.h
# src/newgrf_debug_gui.cpp
# src/order_gui.cpp
# src/rail_gui.cpp
# src/road_gui.cpp
# src/settings_gui.cpp
# src/settings_type.h
# src/station_gui.cpp
# src/subsidy_gui.cpp
# src/table/settings/gui_settings.ini
# src/timetable_gui.cpp
# src/town_gui.cpp
# src/train_cmd.cpp
# src/vehicle_gui.cpp
# src/viewport.cpp
# src/water_cmd.cpp
# src/widgets/dropdown.cpp
# src/window_gui.h
2 years ago
5bbf1f5375
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/core/geometry_type.hpp
# src/error_gui.cpp
# src/rail_gui.cpp
# src/tree_gui.cpp
# src/vehicle_gui.cpp
# src/widgets/dropdown.cpp
2 years ago
1f36c3f3e4
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/ai/ai_gui.cpp
# src/build_vehicle_gui.cpp
# src/genworld_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/newgrf_sound.cpp
# src/roadveh.h
# src/sound.cpp
# src/station_cmd.cpp
# src/train.h
# src/train_cmd.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_gui.cpp
2 years ago
f5f035a22b
Codechange: Make use of Rect Width/Height helpers.
2 years ago
ed60c88b0a
Change: Use power-of-2 scaling for some dimensions in GUI.
...
These are related to drawing sprites that are normally drawn on the
landscape, and should therefore still follow power-of-2 scaling to fit
correctly.
2 years ago
fd4f148c62
Feature: Hotkey to honk a vehicle's horn ( #10110 )
2 years ago
59dbcdb5ba
Feature: Display power-to-weight ratio in ground vehicle details GUI
2 years ago
1518c2fa1e
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/depot_type.h
# src/lang/german.txt
# src/order_gui.cpp
# src/pathfinder/yapf/yapf_rail.cpp
# src/script/api/script_window.hpp.in
# src/settings_table.cpp
# src/train_cmd.cpp
2 years ago
4b08874583
Only show edge level crossing overlays even when safer crossings is off
2 years ago
c19abebf8d
Feature: Multi-track level crossings ( #9931 )
2 years ago
0f697c5501
CheckNextTrainTile should never take action for OT_WAITING orders
2 years ago
721d98a7d0
Feature: Constantly update destination of 'any depot' orders
2 years ago
a4052ca348
Codechange: Add VehicleOrderSaver::Restore()
2 years ago
7e7d943526
Codechange: [YAPF] Allow to retrieve the final tile of the calculated path
2 years ago
a9a21e784d
Codechange: Always set the ODATFB_NEAREST_DEPOT flag for 'any depot' orders
2 years ago
29a1e49c28
Change various asserts to not be included in release builds
2 years ago
bda602f4b0
Fix: reduce framerate overhead on train ticks
...
Tick() is a noop for all but front-engine / crashed vehicles. Starting a framerate is rather cheap, but not free, and introduces a lot of overhead for such close loops.
2 years ago
7f782a1bc3
Fix calculating train curve speed limit on dual rail type tiles
2 years ago
38c2fa3b66
Add a change counter value special order type
2 years ago
839746d2bb
Fix template train move/sell command category for build while paused
2 years ago
33e3e571d3
Return specific error when wagon purchase fails due to wrong depot type
...
See: #419
2 years ago
a97d5cb333
Fix incorrect template replacement error message when chain not buildable
...
And no specific error returned
See: #419
2 years ago
e3896b69d3
Fix #416 : Division by zero for trains of 0 mass
...
In maximum achievable speed estimator
2 years ago
bc920df63a
Fix excessive braking for slopes with realistic braking
...
Unit conversion issue between potential and kinetic energies
2 years ago
cbabbb6db6
Fix train braking behaviour when lookahead is aspect limited
...
When lookahead end is within the reservation end
2 years ago
71b6d7a502
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/lang/arabic_egypt.txt
# src/station_cmd.cpp
# src/station_cmd.h
# src/timetable_cmd.cpp
# src/train_cmd.cpp
2 years ago
979704271b
Fix: reverse train direction command did not validate the given vehicle properly ( #9947 )
...
You could give a wagon in the chain to reverse (which makes no
functional sense ofc). In result, only parts of the vehicle were
reversing, leading to weird crashes.
2 years ago
c6ae82b611
Fix 9ff161e4 boosting lookahead braking stats but not actual brake forces
2 years ago
bd28d5a239
Use order state at reservation time for signal mode tracerestrict eval
2 years ago
78ae295dfe
Add combined normal and shunt aspect signal style flag
2 years ago
a6e3467d58
Fix virtual train consist change callbacks being run before cargotype set
...
When instantiating virtual train from non-buildable template train
See: #402
Also fixes instantiating virtual train from train not refitting leading
vehicle.
2 years ago
5b5fbaa476
Fix reservation error when a reserve through signal was the last tile
...
When there were no junctions earlier in the reservation
2 years ago
24e965061c
Fix limit train lookahead to signal aspect when starting
...
From depot and within signal sighting distance (e.g. reverse)
2 years ago
b6e099121a
Fix limit train lookahead to signal aspect within signalled tunnel/bridges
2 years ago
9ff161e453
Boost realistic braking stats of trains affected by the freight multiplier
2 years ago
22caac6529
Add game setting to limit train lookahead to signal aspect
...
In realistic braking mode when multi-aspect signalling enabled by GRF
2 years ago
99ee4b13ce
Realistic braking: Cache train overall z position
...
Refresh cache at a variable rate depending on train length and
weight distribution
2 years ago
6d877b5e70
Reduce redundant calls to get current max speed for trains and RVs
...
Between ShowVisualEffect() and UpdateSpeed()
2 years ago
502980ba61
Support railtype-dependant GRF train speed limits with realistic braking
...
See: #389
2 years ago
92142e5684
Add routing restriction action to make exempt from speed adaptation
2 years ago
e5a421b65a
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/economy.cpp
# src/linkgraph/refresh.cpp
# src/order_cmd.cpp
# src/saveload/vehicle_sl.cpp
# src/station.cpp
# src/station_base.h
# src/timetable_cmd.cpp
# src/timetable_gui.cpp
# src/vehicle.cpp
# src/vehicle_base.h
# src/vehicle_cmd.cpp
2 years ago
909b20ee68
Implement train speed adaptation on signalled tunnels/bridges
...
See: #373
2 years ago
e68bf58989
Codechange: Use anonymous union for vehicle orders/old orders list
2 years ago
beb6d01fe8
Improve handling of conditional order waiting loops
...
Do not leave station/depot/waypoint at all if conditional order
loop would result in re-starting waiting/loading
Only actually leave and update timetable at end of loop
Rate-limit loop checks regardless of timetabled wait time
2 years ago
904ff6757d
Add slot support to road vehicles, ships and aircraft
2 years ago
543433218c
Ensure that timetable and scheduled dispatch windows redrawn as required
...
Reduce inefficient window and shared order list iteration
2 years ago
a4ea155d33
Merge PR #357 into jgrpp
2 years ago
7823c81597
Add: Through load speed limit setting
2 years ago
aa7413a89f
Fix: Require non-zero capacity for refit cargo type
2 years ago
30817c3915
Fix VRF_BEYOND_PLATFORM_END not being cleared when switching order
2 years ago
f40191b3c0
Add hysteresis to depot search max penalty in missing depot order mode
...
See: #345
3 years ago
41fa16f325
Codechange: Don't use globals for return values from vehicle command procs.
3 years ago
13528bfcd0
Codechange: Un-bitstuff all remaining commands.
3 years ago
21675ec7e2
Codechange: Un-bitstuff vehicle/engine commands.
3 years ago
4f3ea3907e
Codechange: Un-bitstuff commands taking a ClientID (i.e. CMD_CLIENT_ID).
3 years ago
0f64ee5ce1
Codechange: Template DoCommandP to automagically reflect the parameters of the command proc.
...
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
3 years ago
e740c24eb7
Codechange: Template DoCommand to automagically reflect the parameters of the command proc.
...
When finished, this will allow each command handler to take individually
different parameters, obliviating the need for bit-packing.
3 years ago
7048e1522f
Codechange: Move flags in CommandProc in front of the command arguments.
3 years ago
33ca4f2b99
Codechange: Let the compile generate the master command table out of templated command traits.
...
This is using a non-intrusive type-traits like templated system, which
allows compile-time validation that the command table and the command
enum match up.
3 years ago
549caca39c
Codechange: Move command arguments to the back of the networked command function calls.
3 years ago
b6933a2ebd
Codechange: Move command arguments to the back of the DoCommand function call.
3 years ago
ba65a5bab5
Run most "daily" vehicle tasks at a fixed frequency at day lengths >= 8
...
This includes: running costs, track sharing costs, breakdown checks,
servicing checks, order checks
3 years ago
5723c317f7
Fix trains with non-front parts needing repair not being serviced
3 years ago
4db14ccd18
Fix 71c39dc: Incorrect handling of order without non-stop flag
...
See: #337
3 years ago
4ccbb11440
Only show level crossing overlay sprites on outsides of multi-track crossings
...
When using both adjacent crossings and safer crossings
3 years ago
551560537f
Ensure that adjacent level crossings cannot leave map if there are no void tiles
3 years ago
af2c51e3d4
Merge branch 'running-costs-exploration' into jgrpp
3 years ago
71c39dc8c2
If train next order is for same station when leaving, do not leave
...
Just start loading again without moving instead
3 years ago
f22a5685c3
Divide cost instead of cost_factor in running costs division
...
This is to prevent 0 running costs for cheap vehicles when
cost_factor would be < 1
3 years ago
bb8e4eb18a
Adjust stopped/depot detection for running costs division
...
Fix v/this use in Train::GetRunningCost
3 years ago
904ff346c2
Initial commit to allow configuring running costs as a fraction (1/1 default thru 1/4) independently for both vehicles stopped in depots (doesn't work for planes, I'm not smart enuff), or vehicles that are stationary.
3 years ago
76ad272f3b
Fix reservation loop with single-vehicle trains and signalled tunnel/bridges
3 years ago
74bfe4e6d2
Allow placing routing restrictions on tunnel/bridge entrance/exit signals
...
No reserve through support
3 years ago
1ee59c8333
Fix pending speed restrictions not being applied on signalled tunnel/bridges
...
Distance remaining was not decremented
3 years ago
8c8c0e250a
Fix exit signal state when unable to leave signalled custom bridge head
...
When the exit direction is different to the bridge direction.
3 years ago
e661a07425
Fix train not stuck action clearing wait counter when in depot/tunnel/bridge
3 years ago
48977853a4
Simplify some rail/signalled tunnel/bridge tile checks
3 years ago
dad007e16a
Fix spelling of TRPRF_SPEED_RESTRICTION_SET
3 years ago
3308edf792
Try to extend reservation when passing sighting distance of non-end signal
3 years ago
2a2b988424
Fix premature reservation end after reversing station found
...
ChooseTrainTrackLookAheadStateFlags/TrainReservationLookAheadFlags mixup
3 years ago
2b1993ee4d
Fix crash with wrong-way running on multi-aspect signalled tunnel/bridge
...
When using the ignore signals buttons and updating middle signal states
3 years ago
3cff5e53e4
Add train cached_curve_speed_mod to VENC, cache checks and debug window
3 years ago
faf32200cf
Merge tag '12.0-beta1' into jgrpp-beta
...
# Conflicts:
# CMakeLists.txt
# bin/ai/CMakeLists.txt
# bin/game/CMakeLists.txt
# src/build_vehicle_gui.cpp
# src/console_cmds.cpp
# src/core/overflowsafe_type.hpp
# src/fios.cpp
# src/lang/english.txt
# src/lang/german.txt
# src/lang/korean.txt
# src/lang/polish.txt
# src/network/core/game_info.cpp
# src/network/core/game_info.h
# src/network/core/tcp_game.cpp
# src/network/core/tcp_game.h
# src/network/network.cpp
# src/network/network_client.cpp
# src/network/network_client.h
# src/network/network_coordinator.cpp
# src/network/network_gui.cpp
# src/network/network_server.cpp
# src/network/network_server.h
# src/newgrf_engine.cpp
# src/openttd.cpp
# src/rev.cpp.in
# src/settings_type.h
# src/train.h
# src/train_cmd.cpp
3 years ago
f54d69a60a
Merge branch 'master' into jgrpp-beta
...
# Conflicts:
# src/economy.cpp
# src/elrail.cpp
# src/graph_gui.cpp
# src/linkgraph/linkgraph_gui.cpp
# src/network/core/game_info.cpp
# src/newgrf_station.cpp
# src/saveload/saveload.cpp
# src/settings.cpp
# src/station_cmd.cpp
# src/station_gui.cpp
# src/strings_func.h
# src/table/settings/network_settings.ini
# src/table/settings/settings.ini
3 years ago
61cc60099a
Merge branch 'jgrpp' into jgrpp-beta
...
# Conflicts:
# src/network/core/packet.cpp
# src/network/core/udp.cpp
3 years ago
900b9fdf3b
Fix crash with wrong-way running on signalled tunnel/bridge
...
When using the ignore signals buttons, and exiting the bridge/tunnel
in some cases
3 years ago
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
Rubidium
Jonathan G Rennison
PeterN
Artin Alavi
Henry Wilson
Tyler Trahan
Nicolas Chappe
Bouke Haarsma
Patric Stout
Niels Martin Hansen
Yourself
Michael Lutz
reldred
Vít Šefl
glx22
Andreas Schmitt