Jonathan G Rennison
7ae2aa93ea
Allow trains to reverse in station when front is in a bridge/tunnel
2019-02-03 09:51:39 +00:00
Jonathan G Rennison
f64cb4048e
Fix trains not reversing in station when front is on a diagonal rail piece
2019-02-03 09:34:32 +00:00
Jonathan G Rennison
9d3b77c5a2
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/fios_gui.cpp
# src/lang/english.txt
# src/lang/german.txt
2019-02-02 01:27:56 +00:00
Jonathan G Rennison
ec736d8b40
Revert "Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )"
...
This reverts commit e934f09f02
.
2019-02-02 01:03:23 +00:00
J0an Josep
029c48cf4a
Cleanup: [NPF] Remove unused parameter.
2019-01-31 22:15:56 +00:00
J0an Josep
96c5e5e73a
Cleanup: [NPF] Remove unused parameters.
2019-01-31 22:15:56 +00:00
Jonathan G Rennison
255b6adfc9
Merge branch 'master' into jgrpp
...
# Conflicts:
# src/vehicle_cmd.cpp
2019-01-31 02:04:02 +00:00
Jonathan G Rennison
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.
2019-01-31 01:43:08 +00:00
Jonathan G Rennison
37adf9be4a
Cache the last vehicle in a consist to have a visual effect
2019-01-26 11:36:04 +00:00
Jonathan G Rennison
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
2019-01-25 20:17:15 +00:00
Jonathan G Rennison
e15601e12f
Cache whether a train may have a depot or bridge speed restriction
2019-01-19 21:22:32 +00:00
Jonathan G Rennison
d87ac8ec7e
Improve performance of train breakdown detection
2019-01-19 04:39:16 +00:00
Jonathan G Rennison
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
2019-01-14 00:01:44 +00:00
Joan Josep
96854b2b8b
Codechange #5859 : Simplify CheckTrainStayInDepot() ( #7045 )
2019-01-12 17:04:04 +00:00
Andy
e934f09f02
Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 ( #7018 )
2019-01-09 18:37:58 +01:00
Jonathan G Rennison
65b9a103ad
Initial implementation of two rail types per tile
2018-12-21 03:27:58 +00:00
Jonathan G Rennison
cd41683b9b
Add tracerestrict feature reverse behind signal
2018-12-09 01:13:27 +00:00
Jonathan G Rennison
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
2018-11-05 12:53:36 +00:00
Charles Pigott
bb7353c02a
Codechange: Some more null checks
2018-10-31 12:41:49 +01:00
Charles Pigott
f5b1115039
Doc: Lots and lots of doxymentation fixes
2018-10-31 12:35:54 +01:00
Jonathan G Rennison
ee00a28717
Merge branch 'template_train_replacement' into jgrpp
...
# Conflicts:
# src/saveload/extended_ver_sl.cpp
2018-10-18 23:57:20 +01:00
Jonathan G Rennison
c4f5c8e789
TBTR: Add option to replace only old vehicles
2018-10-18 23:54:40 +01:00
Jonathan G Rennison
ce4e2ca3c3
Add setting to enable flipping direction of all train types in depot
2018-09-11 06:08:02 +01:00
Jonathan G Rennison
16a245ccab
Merge branch 'signal_tunnels_bridges' into jgrpp
2018-08-22 22:31:29 +01:00
Jonathan G Rennison
9638d22ff7
Fix clearing wrong M2 bit in GetAndClearLastBridgeEntranceSetSignalIndex
2018-08-22 22:31:11 +01:00
Jonathan G Rennison
23cfd4709c
Merge branch 'signal_tunnels_bridges' into jgrpp
2018-08-21 04:23:05 +01:00
Jonathan G Rennison
a0ef4ea760
Fix incorrect signal offsets in GetAndClearLastBridgeEntranceSetSignalIndex
...
Fixes #65
2018-08-21 04:22:33 +01:00
Jonathan G Rennison
f59535c0b7
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
2018-08-16 05:45:30 +01:00
Jonathan G Rennison
60cc1a48ac
Refresh trace restrict slots window as with the train list window
2018-08-15 19:38:56 +01:00
Jonathan G Rennison
6578d94e63
Add support for timetabled wait times at waypoints
2018-08-14 12:35:05 +01:00
Jonathan G Rennison
f13b686d0c
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/settings_gui.cpp
# src/train_cmd.cpp
2018-08-05 10:49:02 +01:00
Jonathan G Rennison
1b9775479d
Fix incorrect vehicle alignment when entering bridge from W,N directions
2018-08-05 10:47:13 +01:00
Jonathan G Rennison
a87720ca06
Fix train bounding box/delta not being updated when entering bridge from 45° angle
2018-08-05 10:45:21 +01:00
Jonathan G Rennison
649118c928
Fix assertion failure when deleting train from signalled tunnel/bridge
2018-07-31 20:53:53 +01:00
Jonathan G Rennison
9e1e074c2b
Update existing assertions to log tile information where suitable
2018-07-26 19:13:35 +01:00
Jonathan G Rennison
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
2018-07-24 18:30:42 +01:00
Niels Martin Hansen
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.
2018-07-19 21:17:07 +02:00
Jonathan G Rennison
e67cd04596
Merge branch 'custom_bridgeheads' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
2018-07-13 03:14:31 +01:00
Jonathan G Rennison
6ca0fcbae2
Use head tile track pieces in Train::GetVehicleTrackdir for trains in wormhole
2018-07-13 03:13:50 +01:00
Jonathan G Rennison
a7e767d766
Fix 90° turns being wrongly detected across bridges of non-zero length
...
This prevented reservations
2018-07-13 03:01:08 +01:00
Jonathan G Rennison
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
2018-07-08 23:04:30 +01:00
Jonathan G Rennison
77362b829a
Initial support for rail custom bridge heads
2018-07-08 23:03:42 +01:00
Jonathan G Rennison
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
2018-06-25 18:57:48 +01:00
Jonathan G Rennison
2586096ef6
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/pbs.cpp
# src/saveload/extended_ver_sl.cpp
2018-06-17 23:24:22 +01:00
Jonathan G Rennison
e9f5d80440
Trace restrict slots: Add support for slot operations at PBS end signal
2018-06-17 21:13:53 +01:00
Jonathan G Rennison
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
2018-06-17 09:35:18 +01:00
Jonathan G Rennison
814f9f7e0f
Implement bidirectional mode for signals on bridges/tunnels
2018-06-17 04:27:03 +01:00
Jonathan G Rennison
d03139b241
Use separate bits for signals on bridge/tunnel entrance/exit red/green states
2018-06-17 04:01:31 +01:00
PeterN
c2a7728084
Fix: Prevent ships moving into docks after finishing (un)loading. ( #6791 )
2018-06-14 09:25:39 +01:00
Jonathan G Rennison
cecbf257bc
Merge branch 'save_ext' into template_train_replacement
...
# Conflicts:
# src/saveload/saveload.cpp
# src/vehicle_gui.cpp
2018-05-25 19:12:10 +01:00