Commit Graph

1578 Commits (cbbea0c8f4ebc66fe33606447ccac522aba6961c)

Author SHA1 Message Date
Jonathan G Rennison 31ad8bdd07 Do not add virtual vehicles to tile hash 5 years ago
Jonathan G Rennison 5b7d1f7f80 Add game event for TBTR replacement attempt 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 1e51d7af2f Add console command to dump vehicle stats 5 years ago
Jonathan G Rennison 10d0f79e83 Validate vehicle tick caches in CheckCaches 5 years ago
peter1138 c02ef3e456 Feature: Add NotRoadTypes (NRT) 5 years ago
Charles Pigott 5b34c8019f Codechange: Remove Company/OwnerByte types 5 years ago
Jonathan G Rennison d47c083e00 Comment out some unused constants 5 years ago
Jonathan G Rennison 2a41d783cd Adjust vehicle position filter in ViewportMapDrawVehicles 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
Jonathan G Rennison 99b79c26c6 Remove disaster vehicles from tick cache immediately on deletion 5 years ago
Henry Wilson cc62f4163f Cleanup: Remove unused size template parameters from SmallMap and Auto[Free|Delete]SmallVector 5 years ago
Henry Wilson ab711e6942 Codechange: Replaced SmallVector::[Begin|End]() with std alternatives 5 years ago
Henry Wilson 297fd3dda3 Codechange: Replaced SmallVector::Include() with include() 5 years ago
Henry Wilson a0f36a50e6 Codechange: Replaced SmallVector::Append() with std::vector::[push|emplace]_back() 5 years ago
Henry Wilson f3938fdb83 Codechange: Replaced SmallVector::Reset() with std::vector::clear() + shrink_to_fit() 5 years ago
Henry Wilson bfd79e59dc Codechange: Replace SmallVector::Clear() with std::vector::clear() 5 years ago
stormcone 8acca3a72b Change: Do not display a newspaper about old vehicles for which replacement is activated. 5 years ago
Jonathan G Rennison 1c84d80333 Fix dumping of subtype for non ground vehicles in DumpVehicleFlags 5 years ago
Jonathan G Rennison dd94c4d22d Skip Vehicle::UpdateViewport in network dedicated mode 5 years ago
Jonathan G Rennison 3b55f5d765 Cache whether ground vehicles currently have 0 slope resistance 5 years ago
Jonathan G Rennison ac5b4b9454 De-virtualise call to EffectVehicle::Tick in CallVehicleTicks 5 years ago
Jonathan G Rennison e28e2f638e Fix handling of effect vehicles in CallVehicleTicks
Move effect vehicles into separate cache vector
Call effect vehicle ticks before other vehicle types

See #76
5 years ago
Jonathan G Rennison 2fdcc52321 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/lang/dutch.txt
#	src/lang/korean.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/rail.cpp
#	src/rail_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship_cmd.cpp
#	src/toolbar_gui.cpp
#	src/vehicle.cpp
5 years ago
PeterN 22f33fdd08
Fix 148e5b41d6: Uninitialized variable usage. (#7216) 5 years ago
Eddi-z 148e5b41d6 Change: Skip reliability decay if servicing is disabled 5 years ago
PeterN d242875d27
Fix #7197: Invalidate depot buttons when necessary. (#7212) 5 years ago
Henry Wilson d03cb80346 Fix: trains cancelling their pending reversal when ordered to go to a depot behind them
Previously, if a train had been ordered to reverse, and while it was slowing down, was
ordered to travel to a depot that is behind it, the train would continue forwards.
Also when a train had been ordered to reverse, and while it was slowing down, was
ordered to travel to a depot that is in front of it, the train would not cancel the
reversal.
In both cases the train would travel away from the target depot.

Trains in this situation now behave correctly and will travel towards the depot.
5 years ago
Peter Nelson e3b440c9c5 Add #5006: Flag to hide rail type from construction. 5 years ago
Jonathan G Rennison 2142452305 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	Makefile.src.in
#	findversion.sh
#	projects/determineversion.vbs
#	src/gamelog.cpp
#	src/gamelog_internal.h
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/core/config.h
#	src/network/network.cpp
#	src/network/network_udp.cpp
#	src/rev.h
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/depot_sl.cpp
#	src/saveload/gamelog_sl.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/saveload/vehicle_sl.cpp
#	src/table/settings.ini
#	src/viewport.cpp
5 years ago
Peter Nelson e8f1c446a6 Fix: DMU/EMU livery should apply to passenger carriages with DMU/EMU engines. 5 years ago
Jonathan G Rennison ddf31702a2 Merge branch 'master' into jgrpp
# Conflicts:
#	src/group_gui.cpp
#	src/lang/english.txt
#	src/saveload/saveload.cpp
#	src/widgets/group_widget.h
5 years ago
PeterN 23960d0f2c Feature: Group liveries, and livery window usability enhancements. (#7108)
* Change: Replace checkbox in livery selection window with Default option in drop down selection.

This reduces clutter in the UI and allows for primary/secondary colours to independently follow the default scheme if desired.

* Feature: Add vehicle group liveries.
5 years ago
Jonathan G Rennison 98aa58a6b4 Log position tile where it differs from vehicle tile in DumpVehicleFlags 5 years ago
Jonathan G Rennison 8105b5582e Add track to train DumpVehicleFlags 5 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 191afd93c1 Merge branch 'save_ext' into jgrpp
# Conflicts:
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/table/settings.ini
#	src/vehicle_base.h
#	src/widgets/dropdown.cpp
6 years ago
Peter Nelson 81330b8d6e Change: Add path cache for ships. 6 years ago
Jonathan G Rennison f4180e8714 Check vehicle sound setting before motion/tick counts in CallVehicleTicks 6 years ago
Jonathan G Rennison d87ac8ec7e Improve performance of train breakdown detection 6 years ago
Jonathan G Rennison 841ea7639f De-virtualise most common calls to Vehicle::Tick 6 years ago
nikolas d8ccad91f9 Fix: Some code and comment typos
Found with codespell
6 years ago
Jonathan G Rennison d78db1c004 Dump tile data in Vehicle::DumpVehicleFlags 6 years ago
Jonathan G Rennison 65b9a103ad Initial implementation of two rail types per tile 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 f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
Jonathan G Rennison a96428ed13 Fix timetabling of through-load orders 6 years ago
Jonathan G Rennison 0e3986c39c Extend timetable wait/travel times from 16 to 32 bits wide 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 1c41cff322 Add GV flags and reversing distance to DumpVehicleFlags 6 years ago
Jonathan G Rennison 6578d94e63 Add support for timetabled wait times at waypoints 6 years ago
Jonathan G Rennison 5344ec1931 Add a "leave early" order timetable flag
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
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 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 3330e4cef8 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/order_sl.cpp
#	src/saveload/station_sl.cpp
#	src/track_func.h
6 years ago
Jonathan G Rennison 00b1fe6246 Cargo type orders: Add support for 64 cargo types 6 years ago
Jonathan G Rennison 0ae32838ea Merge branch 'save_ext' into cargo_type_order
# Conflicts:
#	src/core/smallstack_type.hpp
6 years ago
Jonathan G Rennison ef0a458ab6 Add go to depot and sell vehicle orders
Controlled by a setting (default off)
6 years ago
Jonathan G Rennison b5dea7f236 Fix undefined behaviour in Vehicle destructor 6 years ago
Jonathan G Rennison 58ccafbf1d Debug: Add vehicle_flags and cargo_payment to veh flags dump 6 years ago
Jonathan G Rennison 943f4fdabb Debug: Add train and RV flags to scope info dump
Move flag dumping to separate function
6 years ago
Jonathan G Rennison 016f0bdfaf Through load: Fix getting and checking station veh/tile when leaving station 6 years ago
Jonathan G Rennison ec8ad55bb5 Clear all VF_CARGO_UNLOADING flags when leaving station 6 years ago
Jonathan G Rennison 4aa211e454 Merge branch 'crashlog_improvements' into jgrpp 6 years ago
Jonathan G Rennison bb8c18b017 Add scope info logging to LoadUnloadStation 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 4cebebcf68
Change: Add CargoTypes type for cargo masks. (#6790) 6 years ago
Jonathan G Rennison f42cc19aad Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
#	Makefile.src.in
#	src/crashlog.cpp
#	src/crashlog.h
6 years ago
Jonathan G Rennison 53dd010f3b Add way to mass cancel vehicle go to depot/service 6 years ago
Jonathan G Rennison 78838ee2a2 Add freight train load/unload mode: through load 6 years ago
Jonathan G Rennison 385a2552e9 Merge branch 'enhanced_viewport_overlay' into jgrpp 6 years ago
Jonathan G Rennison 864d94d2c5 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/industry_cmd.cpp
#	src/vehicle.cpp
6 years ago
frosch 5558899621 (svn r27986) -Codechange: Name magic constants in the vehicle position hash functions. 6 years ago
frosch 6b088d37bf (svn r27986) -Codechange: Name magic constants in the vehicle position hash functions. 6 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 64d9f88802 TBTR: Fix bugs when both autoreplace and template replacement active on same vehicle 7 years ago
Jonathan G Rennison 233b0f8e9e TBTR: Add sanity check assertions 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 0a80aec634 Implement critical breakdown speed reduction for road vehicles 7 years ago
Jonathan G Rennison 218085c535 Timetable: Implement autofill/automate for taken conditional orders.
Fix wrong timetable values being set after using skip or send to depot.
Add timetabled flag for conditional order branch taken travel time.
7 years ago
Jonathan G Rennison 6df5cac0df Merge branch 'enhanced_viewport_overlay' into jgrpp
# Conflicts:
#	src/vehicle.cpp
7 years ago
Jonathan G Rennison 4a6ddb2d50 Merge branch 'cpp-11' into crashlog_improvements
# Conflicts:
#	config.lib
7 years ago
Jonathan G Rennison 2574e46df8 Merge branch 'save_ext' into enhanced_viewport_overlay
# Conflicts:
#	src/smallmap_gui.cpp
7 years ago
Jonathan G Rennison add9be20a0 Merge branch 'enhanced_viewport_overlay' into jgrpp 7 years ago
Jonathan G Rennison d3a1e8060d Fix vehicle draw flickering, particularly in viewport map mode
Incorrect bounds check in ViewportAddVehicles/ViewportMapDrawVehicles
7 years ago
adf88 88726f71b6 (svn r27904) -Fix [FS#6593]: When last vehicle is removed from shared orders group, hide the "Stop sharing" button in vehile orders window 7 years ago
adf88 dbf7ed502a (svn r27904) -Fix [FS#6593]: When last vehicle is removed from shared orders group, hide the "Stop sharing" button in vehile orders window 7 years ago
Jonathan G Rennison ac016eae5e Add client setting to enable shared order group window for single vehicles 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