dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
52,371 Commits 1 Branch 0 Tags
4db14ccd1817da3ff9de683feab9ca2fb2ea950d
Commit Graph

1855 Commits

Author SHA1 Message Date
Jonathan G Rennison
4db14ccd18 Fix 71c39dc: Incorrect handling of order without non-stop flag 
See: #337
 2021-11-20 12:14:01 +00:00
Jonathan G Rennison
4ccbb11440 Only show level crossing overlay sprites on outsides of multi-track crossings 
When using both adjacent crossings and safer crossings
 2021-11-20 01:42:54 +00:00
Jonathan G Rennison
551560537f Ensure that adjacent level crossings cannot leave map if there are no void tiles 2021-11-20 01:27:41 +00:00
Jonathan G Rennison
af2c51e3d4 Merge branch 'running-costs-exploration' into jgrpp 2021-11-19 23:18:17 +00:00
Jonathan G Rennison
71c39dc8c2 If train next order is for same station when leaving, do not leave 
Just start loading again without moving instead
 2021-11-19 00:53:01 +00:00
Jonathan G Rennison
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
 2021-11-18 23:55:48 +00:00
Jonathan G Rennison
bb8e4eb18a Adjust stopped/depot detection for running costs division 
Fix v/this use in Train::GetRunningCost
 2021-11-18 23:41:12 +00:00
reldred
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. 2021-11-18 12:47:23 +10:30
Jonathan G Rennison
76ad272f3b Fix reservation loop with single-vehicle trains and signalled tunnel/bridges 2021-11-14 00:00:22 +00:00
Jonathan G Rennison
74bfe4e6d2 Allow placing routing restrictions on tunnel/bridge entrance/exit signals 
No reserve through support
 2021-11-13 22:28:14 +00:00
Jonathan G Rennison
1ee59c8333 Fix pending speed restrictions not being applied on signalled tunnel/bridges 
Distance remaining was not decremented
 2021-11-13 21:24:31 +00:00
Jonathan G Rennison
8c8c0e250a Fix exit signal state when unable to leave signalled custom bridge head 
When the exit direction is different to the bridge direction.
 2021-11-13 20:37:18 +00:00
Jonathan G Rennison
e661a07425 Fix train not stuck action clearing wait counter when in depot/tunnel/bridge 2021-11-13 18:15:57 +00:00
Jonathan G Rennison
48977853a4 Simplify some rail/signalled tunnel/bridge tile checks 2021-11-13 17:26:07 +00:00
Jonathan G Rennison
dad007e16a Fix spelling of TRPRF_SPEED_RESTRICTION_SET 2021-11-13 02:00:37 +00:00
Jonathan G Rennison
3308edf792 Try to extend reservation when passing sighting distance of non-end signal 2021-11-12 01:02:29 +00:00
Jonathan G Rennison
2a2b988424 Fix premature reservation end after reversing station found 
ChooseTrainTrackLookAheadStateFlags/TrainReservationLookAheadFlags mixup
 2021-11-12 00:03:09 +00:00
Jonathan G Rennison
2b1993ee4d Fix crash with wrong-way running on multi-aspect signalled tunnel/bridge 
When using the ignore signals buttons and updating middle signal states
 2021-11-11 18:06:35 +00:00
Jonathan G Rennison
3cff5e53e4 Add train cached_curve_speed_mod to VENC, cache checks and debug window 2021-11-02 22:37:34 +00:00
Jonathan G Rennison
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
 2021-11-02 17:51:38 +00:00
Jonathan G Rennison
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
 2021-11-01 21:18:24 +00:00
Jonathan G Rennison
61cc60099a Merge branch 'jgrpp' into jgrpp-beta 
# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
 2021-10-29 22:22:54 +01:00
Jonathan G Rennison
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
 2021-10-16 19:59:43 +01:00
Jonathan G Rennison
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
 2021-10-08 18:12:04 +01:00
Jonathan G Rennison
2e022d5194 Move game events to new event_logs header/cpp files 2021-10-04 20:43:50 +01:00
Jonathan G Rennison
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
 2021-09-27 22:47:23 +01:00
Jonathan G Rennison
aff4dc74d0 Avoid premature reservations with reverse at waypoint orders with wait time 2021-09-13 00:48:35 +01:00
Jonathan G Rennison
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.
 2021-09-09 22:49:55 +01:00
Jonathan G Rennison
964ea7b910 Debug: Show realistic braking approach speeds in debug window 2021-09-04 21:40:26 +01:00
Jonathan G Rennison
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.
 2021-09-04 11:39:54 +01:00
Jonathan G Rennison
f8e30e807d Fix ProcessOrders not always being called after leaving a waiting order 
Fixes conditional order loop on leaving a depot
 2021-08-30 15:26:49 +01:00
Jonathan G Rennison
b08cc3cf38 Reduce screen re-draw area for tunnel/bridge end signal updates 2021-08-30 03:09:30 +01:00
Jonathan G Rennison
f6c2a81f72 Reduce screen re-draw area for bridge middle signal updates 2021-08-30 01:46:40 +01:00
Jonathan G Rennison
fea967bbbf Prevent train reversing when wholly inside a train depot 
See: #316, https://github.com/OpenTTD/OpenTTD/issues/9520
 2021-08-29 16:37:04 +01:00
Jonathan G Rennison
b2ef6c0de8 Add implementation of multi-aspect signalling and GRF support 
Requires realistic braking

See: #247
 2021-08-28 12:54:18 +01:00
Jonathan G Rennison
6546f6deba Fix tunnel exit signal not being set to red when train exited 2021-08-27 23:42:36 +01:00
Jonathan G Rennison
dc4b7e0558 Add helper function to set tunnel/bridge entrance signal green 2021-08-27 23:40:53 +01:00
Jonathan G Rennison
55c4fe7d45 Add helper functions to get tunnel/bridge entrance/exit trackdirs 2021-08-27 23:39:20 +01:00
Jonathan G Rennison
2283ce3a2b ATC: Reduce lower limit of nominal look-ahead distance for speed timers 
See: #310
 2021-08-19 01:39:29 +01:00
Jonathan G Rennison
b8d5113c5a Tracerestrict: Add slot action mode, try to acquire (only on reserve) 2021-08-15 22:39:52 +01:00
Michael Lutz
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)."
 2021-08-15 12:14:53 +02:00
Vít Šefl
2183fd4dab Feature: [NewGRF] Maximum curve speed modifier for rail vehicles (#9346) 2021-08-15 11:17:05 +02:00
Jonathan G Rennison
9003ef7d11 When reversing train, ensure that loading is aborted if necessary 2021-07-27 18:06:44 +01:00
Jonathan G Rennison
2135aa2ae8 Fix false positive desync log message for powered free wagon chains 2021-07-26 18:08:56 +01:00
Jonathan G Rennison
6a009686c9 Fix #299: Add estimated max speed (full) to template windows 2021-07-17 23:21:12 +01:00
Jonathan G Rennison
502af119e5 Rename and move train max speed estimation functions 2021-07-17 23:06:34 +01:00
glx22
49b66ea504 Codechange: Remove FOR_EACH_SET_TRACK 2021-07-09 21:36:09 +02:00
Jonathan G Rennison
fb4e10626e Make look ahead distance vaiable with speed, within a reasonable range 2021-07-03 22:50:43 +01:00
Jonathan G Rennison
11e49ef99e Only apply signal speed restrictions from the front direction 2021-06-28 00:04:12 +01:00
Jonathan G Rennison
5fb3eb0bb9 Adjust signal speed restriction timeouts when date or day length changed 2021-06-27 23:07:32 +01:00