Commit Graph

1706 Commits (b7118b60fef80a9035958b565a8d9957620ca98b)

Author SHA1 Message Date
Jonathan G Rennison 2e93ca9409 Increase verbosity of chosen track assert in TrainController 4 years ago
Jonathan G Rennison 0202211514 Conditional orders: Add slot acquire modes to train in slot conditional 4 years ago
Jonathan G Rennison 0dd9562ead Continue waiting at rail waypoint if next order is a wait order for the same waypoint 4 years ago
Jonathan G Rennison cb6a01cab3 Fix cases where departures board data was not invalidated 4 years ago
Jonathan G Rennison 4108672cf6 Use separate tile hash for each vehicle type 4 years ago
Jonathan G Rennison 5240b46d1d Reduce viewport invalidation area of signal state changes 4 years ago
Jonathan G Rennison 76f68c48f5 Cache whether vehicle is currently drawn: Vehicle::IsDrawn() 4 years ago
Jonathan G Rennison ee6d808578 TBTR: Template replacements now also apply to child groups 5 years ago
Jonathan G Rennison 06a2bedfe5 TBTR: Fix template replacement refits having 0 cost 5 years ago
Jonathan G Rennison 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
glx d8a1be48cd Codechange: Replace vehicle related FOR_ALL with range-based for loops 5 years ago
Jonathan G Rennison aa8aae9a62 Initial implementation of tracerestrict speed restriction feature 5 years ago
Jonathan G Rennison 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
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Jonathan G Rennison 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
JMcKiern 04f659e768 Fix: Some typos found using codespell 5 years ago
Jonathan G Rennison e4b9eeee71 Set VRF_CONSIST_SPEED_REDUCTION flag in NormaliseTrainHead 5 years ago
Jonathan G Rennison d9c112cc9e Fix #97: Desync when moving newly built wagon 5 years ago
Jonathan G Rennison 0299eaa45f Clear order backup clone when train head is moved to non-head position 5 years ago
Jonathan G Rennison d0ee897135 Unreserve and re-reserve reservations to bidi bridge/tunnel entrances when reversing train inside 5 years ago
Jonathan G Rennison dae041601d Unreserve signalled tunnel/bridge head when reversing on approach to exit 5 years ago
Jonathan G Rennison 5bc9c8ed6e Unreserve signalled tunnel/bridge head when entering from opposite to v->tile 5 years ago
Jonathan G Rennison 70ef0f562b Fix train reverse inside signalled tunnel/bridge entrance clearing reservation of incoming train 5 years ago
Jonathan G Rennison a1d36b02f0 Network: Add state checksum which is check in network sync 5 years ago
Jonathan G Rennison 89a6cc3e03 Add game event flag for virtual train creation 5 years ago
Jonathan G Rennison 162fcb050e Only set TBTR replacement game event flag when replacement action occurs 5 years ago
Jonathan G Rennison 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
Jonathan G Rennison 8fefef9d19 TBTR: Do not allocate virtual trains a unit number in NormaliseTrainHead 5 years ago
Jonathan G Rennison f3daada67f TBTR: Avoid built virtual wagons which can't be attached being orphaned 5 years ago
Jonathan G Rennison 5a2e498182 TBTR: Avoid articulated/rear units being added to tile hash 5 years ago
Jonathan G Rennison c7a9950269 Add game event for train crash 5 years ago
Jonathan G Rennison 96f000226e Exclude virtual trains from various vehicle list iterations 5 years ago
Jonathan G Rennison f0ffb52f2f Fix per-railtype 90 deg turn setting with dual rail type tiles 5 years ago
Jonathan G Rennison 8042150a35 Add error messages for vehicle build failure due to wrong depot owner and rail type 5 years ago
Jonathan G Rennison ee06258629 TBTR: Fix front engine not being cleared when being replaced. and kept in depot 5 years ago
Jonathan G Rennison 49f6490c7d Fix potential non-determinism in vehicle autorenew/template replace/pay for repair/sell 5 years ago
Jonathan G Rennison 9d861fb8a0 TBTR: Allow cloning virtual/template trains with unavailable engines 5 years ago
Jonathan G Rennison 674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Jonathan G Rennison 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
Henry Wilson c01a2e2a81 Codechange: Removed SmallVector completely 5 years ago
Henry Wilson ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 5 years ago
Henry Wilson a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 5 years ago
Henry Wilson a690936ed7 Codechange: Replace SmallVector::Length() with std::vector::size() 5 years ago
Jonathan G Rennison 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
5 years ago
Michael Lutz cc5f175615 Feature: Railtype flags to allow/disallow 90 degree curves. (#7352) 5 years ago
Jonathan G Rennison 5be04b6427 Fix wrong track piece being used in ConsistChanged after a rail type change 5 years ago
Jonathan G Rennison 635ee89b86 Merge branch 'master' into jgrpp
# Conflicts:
#	src/economy.cpp
5 years ago
Jonathan G Rennison 664ecdcb89 Revert "Revert "Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 (#7018)""
This reverts commit ec736d8b40.

See 690d1dd6a4.
5 years ago
Michael Lutz 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.
5 years ago