Archives
/
OpenTTD-patches
mirror of https://github.com/JGRennison/OpenTTD-patches
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
50,508 Commits
12 Branches
178 Tags
446 MiB
jgrpp
tmp-jgrpp
master
mapgen-water-desert-removal-circular
wip-string-2
wip-string
diagonal_road_investigations
sse-blitter-set-alpha
desync-debugging
save_ext
tracerestrict
tracerestrict-sx
jgrpp-0.1
jgrpp-0.1.1
jgrpp-0.1.2
jgrpp-0.10.0
jgrpp-0.10.1
jgrpp-0.10.2
jgrpp-0.11.0
jgrpp-0.12.0
jgrpp-0.12.1
jgrpp-0.13.0
jgrpp-0.13.1
jgrpp-0.13.2
jgrpp-0.13.3
jgrpp-0.14.0
jgrpp-0.15.0
jgrpp-0.15.1
jgrpp-0.16.0
jgrpp-0.16.1
jgrpp-0.17.0
jgrpp-0.17.1
jgrpp-0.17.2
jgrpp-0.18.0
jgrpp-0.19.0
jgrpp-0.2.0
jgrpp-0.2.1
jgrpp-0.20.0
jgrpp-0.20.1
jgrpp-0.21.0
jgrpp-0.22.0
jgrpp-0.22.1
jgrpp-0.22.2
jgrpp-0.23.0
jgrpp-0.24.0
jgrpp-0.24.1
jgrpp-0.25.0
jgrpp-0.25.1
jgrpp-0.25.2
jgrpp-0.26.0
jgrpp-0.26.1
jgrpp-0.26.2
jgrpp-0.27.0
jgrpp-0.27.1
jgrpp-0.28.0
jgrpp-0.29.0
jgrpp-0.29.1
jgrpp-0.29.2
jgrpp-0.29.3
jgrpp-0.3.0
jgrpp-0.3.1
jgrpp-0.3.2
jgrpp-0.30.0
jgrpp-0.30.1
jgrpp-0.30.2
jgrpp-0.30.3
jgrpp-0.31.0
jgrpp-0.31.1
jgrpp-0.31.2
jgrpp-0.31.3
jgrpp-0.31.4
jgrpp-0.31.5
jgrpp-0.32-rc1
jgrpp-0.32-rc2
jgrpp-0.32-rc3
jgrpp-0.32-rc4
jgrpp-0.32-rc5
jgrpp-0.32.0
jgrpp-0.32.1
jgrpp-0.32.2
jgrpp-0.32.3
jgrpp-0.32.4
jgrpp-0.33.0
jgrpp-0.33.1
jgrpp-0.33.2
jgrpp-0.34-rc1
jgrpp-0.34.0
jgrpp-0.34.1
jgrpp-0.34.2
jgrpp-0.34.3
jgrpp-0.34.4
jgrpp-0.35.0
jgrpp-0.35.1
jgrpp-0.36.0
jgrpp-0.37.0
jgrpp-0.38.0
jgrpp-0.38.1
jgrpp-0.39.0
jgrpp-0.39.1
jgrpp-0.39.2
jgrpp-0.4.0
jgrpp-0.4.1
jgrpp-0.40.0
jgrpp-0.40.1
jgrpp-0.40.2
jgrpp-0.40.3
jgrpp-0.40.4
jgrpp-0.40.5
jgrpp-0.41.0
jgrpp-0.41.1
jgrpp-0.41.2
jgrpp-0.41.3
jgrpp-0.42.0
jgrpp-0.42.1
jgrpp-0.42.2
jgrpp-0.42.3
jgrpp-0.43.0
jgrpp-0.43.1
jgrpp-0.43.2
jgrpp-0.44-rc1
jgrpp-0.44.0
jgrpp-0.44.1
jgrpp-0.44.2
jgrpp-0.45.0
jgrpp-0.45.1
jgrpp-0.46-rc1
jgrpp-0.46-rc2
jgrpp-0.46.0
jgrpp-0.46.1
jgrpp-0.47.0
jgrpp-0.47.1
jgrpp-0.47.2
jgrpp-0.47.3
jgrpp-0.48.0
jgrpp-0.48.1
jgrpp-0.48.2
jgrpp-0.48.3
jgrpp-0.48.4
jgrpp-0.48.5
jgrpp-0.49.0
jgrpp-0.49.1
jgrpp-0.49.2
jgrpp-0.5.0
jgrpp-0.5.1
jgrpp-0.5.2
jgrpp-0.5.3
jgrpp-0.50.0
jgrpp-0.50.1
jgrpp-0.50.2
jgrpp-0.50.3
jgrpp-0.51.0
jgrpp-0.51.1
jgrpp-0.52.0
jgrpp-0.52.1
jgrpp-0.53.0
jgrpp-0.53.1
jgrpp-0.53.2
jgrpp-0.53.3
jgrpp-0.54.0
jgrpp-0.54.1
jgrpp-0.54.2
jgrpp-0.54.3
jgrpp-0.54.4
jgrpp-0.54.5
jgrpp-0.55.0
jgrpp-0.55.1
jgrpp-0.55.2
jgrpp-0.55.3
jgrpp-0.56.0
jgrpp-0.56.1
jgrpp-0.56.2
jgrpp-0.57.0
jgrpp-0.57.1
jgrpp-0.58.0
jgrpp-0.58.1
jgrpp-0.58.2
jgrpp-0.58.3
jgrpp-0.59.0
jgrpp-0.59.1
jgrpp-0.6.0
jgrpp-0.60.0
jgrpp-0.60.1
jgrpp-0.60.2
jgrpp-0.61.0
jgrpp-0.62.0
jgrpp-0.7.0
jgrpp-0.7.1
jgrpp-0.8.0
jgrpp-0.8.1
jgrpp-0.9.0
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from 'fa2f3ed104'
${ noResults }
Commit Graph

1767 Commits (fa2f3ed1049f1f171ecc2f40b5d27c9d481bf0d5)

Author SHA1 Message Date
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
 6 years ago
Henry Wilson c01a2e2a81 Codechange: Removed SmallVector completely 6 years ago
Henry Wilson ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 6 years ago
Henry Wilson a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 6 years ago
Henry Wilson a690936ed7 Codechange: Replace SmallVector::Length() with std::vector::size() 6 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
 6 years ago
Michael Lutz cc5f175615 Feature: Railtype flags to allow/disallow 90 degree curves. (#7352) 6 years ago
Jonathan G Rennison 5be04b6427 Fix wrong track piece being used in ConsistChanged after a rail type change 6 years ago
Jonathan G Rennison 635ee89b86 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/economy.cpp
 6 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.
 6 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.
 6 years ago
Jonathan G Rennison 8ec9f5e174 Fix case where trains were unable to exit signalled bridge/tunnels 6 years ago
Jonathan G Rennison 7bc010d402 Avoid unnecessary calls to InvalidateVehicleTickCaches 
Don't call from Train::ConsistChanged
 6 years ago
Jonathan G Rennison 3b55f5d765 Cache whether ground vehicles currently have 0 slope resistance 6 years ago
Jonathan G Rennison 7ae2aa93ea Allow trains to reverse in station when front is in a bridge/tunnel 6 years ago
Jonathan G Rennison f64cb4048e Fix trains not reversing in station when front is on a diagonal rail piece 6 years ago
Jonathan G Rennison 9d3b77c5a2 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/fios_gui.cpp
#	src/lang/english.txt
#	src/lang/german.txt
 6 years ago
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.
 6 years ago
J0an Josep 029c48cf4a Cleanup: [NPF] Remove unused parameter. 6 years ago
J0an Josep 96c5e5e73a Cleanup: [NPF] Remove unused parameters. 6 years ago
Jonathan G Rennison 255b6adfc9 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/vehicle_cmd.cpp
 6 years ago
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.
 6 years ago
Jonathan G Rennison 37adf9be4a Cache the last vehicle in a consist to have a visual effect 6 years ago
Jonathan G Rennison e5b61e0b6c Refactor CallVehicleTicks vehicle loop 6 years ago
Jonathan G Rennison e15601e12f Cache whether a train may have a depot or bridge speed restriction 6 years ago
Jonathan G Rennison d87ac8ec7e Improve performance of train breakdown detection 6 years ago
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
 6 years ago
Joan Josep 96854b2b8b Codechange #5859: Simplify CheckTrainStayInDepot() (#7045) 6 years ago
Andy e934f09f02 Fix: Don't increase motion counter while train is waiting at non-path signals (Author: frosch123) #5877 (#7018) 6 years ago
Jonathan G Rennison 65b9a103ad Initial implementation of two rail types per tile 6 years ago
Jonathan G Rennison cd41683b9b Add tracerestrict feature reverse behind signal 6 years ago
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
 6 years ago
Charles Pigott bb7353c02a Codechange: Some more null checks 6 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison ee00a28717 Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 6 years ago
Jonathan G Rennison c4f5c8e789 TBTR: Add option to replace only old vehicles 6 years ago
Jonathan G Rennison ce4e2ca3c3 Add setting to enable flipping direction of all train types in depot 6 years ago
Jonathan G Rennison 16a245ccab Merge branch 'signal_tunnels_bridges' into jgrpp 6 years ago
Jonathan G Rennison 9638d22ff7 Fix clearing wrong M2 bit in GetAndClearLastBridgeEntranceSetSignalIndex 6 years ago
Jonathan G Rennison 23cfd4709c Merge branch 'signal_tunnels_bridges' into jgrpp 6 years ago
Jonathan G Rennison a0ef4ea760 Fix incorrect signal offsets in GetAndClearLastBridgeEntranceSetSignalIndex 
Fixes #65
 6 years ago
Jonathan G Rennison f59535c0b7 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/train_cmd.cpp
 6 years ago
Jonathan G Rennison 60cc1a48ac Refresh trace restrict slots window as with the train list window 6 years ago
Jonathan G Rennison 6578d94e63 Add support for timetabled wait times at waypoints 6 years ago
Jonathan G Rennison f13b686d0c Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/settings_gui.cpp
#	src/train_cmd.cpp
 6 years ago
Jonathan G Rennison 1b9775479d Fix incorrect vehicle alignment when entering bridge from W,N directions 6 years ago
Jonathan G Rennison a87720ca06 Fix train bounding box/delta not being updated when entering bridge from 45° angle 6 years ago
Jonathan G Rennison 649118c928 Fix assertion failure when deleting train from signalled tunnel/bridge 6 years ago
Jonathan G Rennison 9e1e074c2b Update existing assertions to log tile information where suitable 6 years ago
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
 6 years ago
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.
 6 years ago
Jonathan G Rennison e67cd04596 Merge branch 'custom_bridgeheads' into jgrpp 
# Conflicts:
#	src/train_cmd.cpp
 6 years ago
Jonathan G Rennison 6ca0fcbae2 Use head tile track pieces in Train::GetVehicleTrackdir for trains in wormhole 6 years ago
Jonathan G Rennison a7e767d766 Fix 90° turns being wrongly detected across bridges of non-zero length 
This prevented reservations
 6 years ago
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
 6 years ago
Jonathan G Rennison 77362b829a Initial support for rail custom bridge heads 6 years ago
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
 6 years ago
Jonathan G Rennison 2586096ef6 Merge branch 'tracerestrict-sx' into jgrpp 
# Conflicts:
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
 6 years ago
Jonathan G Rennison e9f5d80440 Trace restrict slots: Add support for slot operations at PBS end signal 6 years ago
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
 6 years ago
Jonathan G Rennison 814f9f7e0f Implement bidirectional mode for signals on bridges/tunnels 6 years ago
Jonathan G Rennison d03139b241 Use separate bits for signals on bridge/tunnel entrance/exit red/green states 6 years ago
PeterN c2a7728084
Fix: Prevent ships moving into docks after finishing (un)loading. (#6791) 6 years ago
Jonathan G Rennison cecbf257bc Merge branch 'save_ext' into template_train_replacement 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/vehicle_gui.cpp
 6 years ago
Jonathan G Rennison 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
PeterN a07394a63a
Change: Remove direction parameter from Vehicle::UpdateDeltaXY. (#6792) 
The value is either unused or always the same as this->direction.
 6 years ago
Jonathan G Rennison a60eff174d Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 6 years ago
Jonathan G Rennison 5877cd0f9b TBTR: Fix display of vehicle sprites for some NewGRFs, fix issues in large UI modes 
Slight code, GUI layout, and savegame format tidying
 6 years ago
Jonathan G Rennison e0126a1fbc Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/train_cmd.cpp
 7 years ago
Jonathan G Rennison 0dd3ff23de Fix signalled tunnel/bridge entrance not being marked dirty when reservation cleared 7 years ago
keldorkatarn c2678b896e Fix clearing of train reservations in tunnels and on bridges. 
(cherry picked from commit e2c4fb517d1064b163d8f2b0627506d785ffb3ed)

See: #46
 7 years ago
Jonathan G Rennison 2821599f6b Better handle out of track and depot through load cases 
Add advice messages for when loading is aborted due to out of track/depot
Handle non-aligned use of platform
Fix full-load behaviour
Fix speed limiting whilst advancing
 7 years ago
Jonathan G Rennison c779915ccb Fix train through load always advancing last section to far end of platform 7 years ago
Jonathan G Rennison f012d45491 Merge branch 'signal_tunnels_bridges' into jgrpp 7 years ago
Jonathan G Rennison df72bc6e09 Fix signal on tun/bridge gradual decel end tile detection 7 years ago
Jonathan G Rennison 78838ee2a2 Add freight train load/unload mode: through load 7 years ago
Jonathan G Rennison 09ca051ff8 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train.h
 7 years ago
Jonathan G Rennison def3a3933b Move dual-use of load_unload_ticks for bridge/tun signals to new field 7 years ago
Jonathan G Rennison 10db379202 Merge branch 'signal_tunnels_bridges' into jgrpp 
# Conflicts:
#	src/train_cmd.cpp
 7 years ago
Jonathan G Rennison 38cb80872b Gradually slow down for red signals on bridges/tunnels 
Instead of coming to a sudden halt immediately before the signal
 7 years ago
Jonathan G Rennison 8a4d462d44 Merge branch 'chunnel' into jgrpp 7 years ago
HackaLittleBit d5a316e365 Use flag GVF_CHUNNEL_BIT properly 7 years ago
Jonathan G Rennison ec661d7ae9 Merge branch 'template_train_replacement' into jgrpp 7 years ago
Jonathan G Rennison 4a9df57665 TBTR: Enable autorenew when template replacement active 7 years ago
Jonathan G Rennison 06a2457efc Merge branch 'template_train_replacement' into jgrpp 
# Conflicts:
#	src/vehicle.cpp
 7 years ago
Jonathan G Rennison 233b0f8e9e TBTR: Add sanity check assertions 7 years ago
Jonathan G Rennison bb6b8d8cd6 Increase verbosity of some assertion failure messages 7 years ago
Jonathan G Rennison d730cfd51d Cache sprite sequence bounds for vehicles 7 years ago
Jonathan G Rennison dda20d08c1 Merge branch 'improved_breakdowns' into jgrpp 
Update German and Korean language strings

# Conflicts:
#	src/saveload/extended_ver_sl.cpp
 7 years ago
Jonathan G Rennison beda7ebb39 Set minimum speed for train critical breakdown reduction. 7 years ago
Jonathan G Rennison 4b392b66db Fix DeleteVisibleTrain being called on virtual trains 
Add assertion to check for this case
 7 years ago
Jonathan G Rennison 1c04653518 Add scope info logging to DeleteVisibleTrain 7 years ago
Jonathan G Rennison 9559ad4946 Merge branch 'template_train_replacement' into jgrpp 7 years ago
Jonathan G Rennison 40c99956ed TBTR: Fix attempting to get sprite for new virtual engine before marking as virtual 7 years ago
Jonathan G Rennison ba33754993 Merge branch 'save_ext' into tracerestrict-sx 
# Conflicts:
#	src/vehiclelist.cpp
 7 years ago
Jonathan G Rennison f34833f111 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/vehiclelist.cpp
 7 years ago
Jonathan G Rennison 2d66f25f6c Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/vehicle.cpp
 7 years ago
frosch b4b98e5165 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
frosch a47fb85cd8 (svn r27893) -Codechange: Use fallthrough attribute. (LordAro) 7 years ago
Jonathan G Rennison b76d594654 Merge branch 'adjacent_crossings' into jgrpp 
# Conflicts:
#	src/road_func.h
 7 years ago
Jonathan G Rennison 3e85e9fc53 Fix MaybeBarCrossingWithSound setting crossing reservation 
Improve efficiency of adjacent crossings checks
 7 years ago
Jonathan G Rennison bbd2e6f2f5 Merge branch 'improved_breakdowns' into jgrpp 
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/train_cmd.cpp
 7 years ago
Jonathan G Rennison 350c2bb24f Make trains break down after collision with road vehicle. 7 years ago
Jonathan G Rennison 44fa555c6d Merge branch 'save_ext' into improved_breakdowns 7 years ago
Jonathan G Rennison 0acb4fdd2f Safer level crossings: add setting to improve RV level crossing safety. 8 years ago
Jonathan G Rennison 4979309094 TBTR: Fix build and refit of template trains. 8 years ago
Jonathan G Rennison 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
 8 years ago
Jonathan G Rennison 4d21d6f81c Merge branch 'chunnel' into jgrpp 8 years ago
Jonathan G Rennison 40eff50c98 Clear waiting due to tracerestrict flag when no longer required. 8 years ago
Jonathan G Rennison 85c7c4b307 Merge branch 'signal_tunnels_bridges' into jgrpp 8 years ago
Jonathan G Rennison ab595bf67c Fix bridge/tunnel exit PBS signals never being set to green. 8 years ago
Jonathan G Rennison f4b5efd67d Merge branch 'template_train_replacement' into jgrpp 8 years ago
Jonathan G Rennison 753fc2ab67 TBTR: Fix virtual rail engines not havign build year set. 8 years ago
Jonathan G Rennison 0772236986 Add a release slot at front of train slot action. 
Distinguish from release slot at back.
Fix slot release and acquire at front when passing PBS from back.
 8 years ago
Jonathan G Rennison 6417fb16c3 Initial implementation of trace restrict slots 8 years ago
Jonathan G Rennison 5a2d482c28 Tracerestrict: Add wait at PBS signal action. 8 years ago
Jonathan G Rennison c882082467 Chunnel: Fix swap of vehicle chunnel flag when reversing consist. 8 years ago
Jonathan G Rennison efe30c4299 Merge branch 'tracerestrict-sx' into jgrpp 8 years ago
Jonathan G Rennison 2af2a49887 Revert "(svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation" 
This reverts commit 166e504c13.

These parameters are used for tracerestrict functionality.
 8 years ago
Jonathan G Rennison f9f2d37a8e Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/saveload/saveload.cpp
 8 years ago
Jonathan G Rennison fc60857b66 Merge branches 'adjacent_crossings' and 'zoning' into jgrpp 8 years ago
Jonathan G Rennison 0c42b384bc Merge branch 'save_ext' into adjacent_crossings 
# Conflicts:
#	src/train_cmd.cpp
 8 years ago
peter1138 166e504c13 (svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation 
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
 8 years ago
peter1138 5951d2406e (svn r27811) -Change: Remove unused parameters in FreeTrainTrackReservation 
FreeTrainTrackReservation is always called with INVALID_TILE
and INVALID_TRACKDIR as second and third arguments, so remove
them and just use those constants instead. (cirdan)
 8 years ago
peter1138 040df26e9e (svn r27809) -Codechange: Improve check in UpdateLevelCrossing 
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
 8 years ago
peter1138 67ab0450dd (svn r27809) -Codechange: Improve check in UpdateLevelCrossing 
In UpdateLevelCrossing, checking if a level crossing is reserved is
cheaper than finding trains on it or approaching it, so do it first. (cirdan)
 8 years ago
Jonathan G Rennison ec9f0371e8 Chunnel: Adjust z position of vehicles in chunnels to go "under" the water. 8 years ago
Jonathan G Rennison f3bea35fcc Merge branches 'template_train_replacement' and 'infrastructure_sharing' into jgrpp 8 years ago
Jonathan G Rennison 11e4bcee40 Slightly decrease proximity required for trains to crash. 
This is to fix trains of different companies being able to crash when
two stations or line-ends are directly against each other.
 8 years ago
Jonathan G Rennison f5e4d8e73a Merge branch 'master' into tracerestrict 
# Conflicts:
#	src/rail_gui.cpp
#	src/saveload/saveload.cpp
 8 years ago
Jonathan G Rennison dcbde21f18 Merge branch 'save_ext' into improved_breakdowns 
# Conflicts:
#	src/train_cmd.cpp
 8 years ago
Jonathan G Rennison 074555e41d Merge branch 'save_ext' into signal_tunnels_bridges 8 years ago
Jonathan G Rennison 66751457ad Fix train crash on bridge/tunnel with signals leaving red signals. 
Update signals on far end of bridge/tunnel.
If clearing the crash results in a clear bridge/tunnel, set all
bridge/tunnel signals green.
 8 years ago
Jonathan G Rennison 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
Jonathan G Rennison 92254acf8d TBTR: Savegame and API changes to support multiple sprites per vehicle. 8 years ago
Jonathan G Rennison d204062300 Merge branch 'master' into template_train_replacement 8 years ago
frosch a37bb32fd6 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 8 years ago
frosch c175067ed9 (svn r27667) -Codechange: Add VehicleSpriteSeq::GetBounds and Draw. 8 years ago
frosch f36539837e (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 8 years ago
frosch d2393b4f6c (svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq. 8 years ago
frosch 2a1e955fee (svn r27663) -Codechange: Deduplicate code when rotating crashed vehicles. 8 years ago
frosch a6d1d128da (svn r27663) -Codechange: Deduplicate code when rotating crashed vehicles. 8 years ago
Jonathan G Rennison f82feb160f Merge branch 'signal_tunnels_bridges' into jgrpp 
# 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/misc.cpp
#	src/openttd.cpp
#	src/pbs.cpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/saveload.cpp
#	src/signal.cpp
#	src/train_cmd.cpp
#	src/tunnelbridge_map.h
 8 years ago
Jonathan G Rennison 556594f2f0 Extend bridge signal simulation to support an unlimited no. of signals. 
This is instead of the previous limit of 16, all stored in M2.
 8 years ago
Jonathan G Rennison 61500b596e Fix tunnel/bridge entrance signal not being refreshed. 
When a train left a tunnel or a bridge with no intermediary signals,
when setting the entrance signal to green, the display was not refreshed
with show track reservations was enabled.
 8 years ago
Jonathan G Rennison 0d2e9f91bf Adjust signal on bridge/tunnel map bits, rename accessors, add docs. 
Use same bit to store red/green state for entrances and exits.
No longer re-use exit bit to store red/green state of entrance.
Avoid modifying the M2 of tunnel entrances/exits.
Rename and rationalise map accessor functions.
Document bits used in landscape HTML docs.
 8 years ago
Jonathan G Rennison 888cd1be07 Merge branch 'cpp-11' into signal_tunnels_bridges 
# Conflicts:
#	src/saveload/saveload.cpp
 8 years ago
Jonathan G Rennison 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
Jonathan G Rennison 3507b51d9e Initial LinkRefresher support for cargo-specific links. 8 years ago
Jonathan G Rennison 23a1c07378 Merge branch 'master' into template_train_replacement 
Fix Template creation window vehicle drag cursor.
 8 years ago