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
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
98aa58a6b4
Log position tile where it differs from vehicle tile in DumpVehicleFlags
5 years ago
8105b5582e
Add track to train DumpVehicleFlags
5 years ago
37adf9be4a
Cache the last vehicle in a consist to have a visual effect
5 years ago
e5b61e0b6c
Refactor CallVehicleTicks vehicle loop
5 years ago
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
5 years ago
81330b8d6e
Change: Add path cache for ships.
5 years ago
f4180e8714
Check vehicle sound setting before motion/tick counts in CallVehicleTicks
5 years ago
d87ac8ec7e
Improve performance of train breakdown detection
5 years ago
841ea7639f
De-virtualise most common calls to Vehicle::Tick
5 years ago
d8ccad91f9
Fix: Some code and comment typos
...
Found with codespell
6 years ago
d78db1c004
Dump tile data in Vehicle::DumpVehicleFlags
6 years ago
65b9a103ad
Initial implementation of two rail types per tile
6 years ago
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
f5b1115039
Doc: Lots and lots of doxymentation fixes
6 years ago
a96428ed13
Fix timetabling of through-load orders
6 years ago
0e3986c39c
Extend timetable wait/travel times from 16 to 32 bits wide
6 years ago
f59535c0b7
Merge branch 'tracerestrict-sx' into jgrpp
...
# Conflicts:
# src/train_cmd.cpp
6 years ago
60cc1a48ac
Refresh trace restrict slots window as with the train list window
6 years ago
1c41cff322
Add GV flags and reversing distance to DumpVehicleFlags
6 years ago
6578d94e63
Add support for timetabled wait times at waypoints
6 years ago
5344ec1931
Add a "leave early" order timetable flag
...
Re-arrange timetable GUI slightly.
Add an "extra" drop-down item.
6 years ago
9e1e074c2b
Update existing assertions to log tile information where suitable
6 years ago
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
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
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
77362b829a
Initial support for rail custom bridge heads
6 years ago
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
00b1fe6246
Cargo type orders: Add support for 64 cargo types
6 years ago
0ae32838ea
Merge branch 'save_ext' into cargo_type_order
...
# Conflicts:
# src/core/smallstack_type.hpp
6 years ago
ef0a458ab6
Add go to depot and sell vehicle orders
...
Controlled by a setting (default off)
6 years ago
b5dea7f236
Fix undefined behaviour in Vehicle destructor
6 years ago
58ccafbf1d
Debug: Add vehicle_flags and cargo_payment to veh flags dump
6 years ago
943f4fdabb
Debug: Add train and RV flags to scope info dump
...
Move flag dumping to separate function
6 years ago
016f0bdfaf
Through load: Fix getting and checking station veh/tile when leaving station
6 years ago
ec8ad55bb5
Clear all VF_CARGO_UNLOADING flags when leaving station
6 years ago
4aa211e454
Merge branch 'crashlog_improvements' into jgrpp
6 years ago
bb8c18b017
Add scope info logging to LoadUnloadStation
6 years ago
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
4cebebcf68
Change: Add CargoTypes type for cargo masks. ( #6790 )
6 years ago
f42cc19aad
Merge branch 'cpp-11' into crashlog_improvements
...
# Conflicts:
# Makefile.src.in
# src/crashlog.cpp
# src/crashlog.h
6 years ago
53dd010f3b
Add way to mass cancel vehicle go to depot/service
6 years ago
78838ee2a2
Add freight train load/unload mode: through load
6 years ago
385a2552e9
Merge branch 'enhanced_viewport_overlay' into jgrpp
6 years ago
864d94d2c5
Merge branch 'save_ext' into enhanced_viewport_overlay
...
# Conflicts:
# src/industry_cmd.cpp
# src/vehicle.cpp
6 years ago
5558899621
(svn r27986) -Codechange: Name magic constants in the vehicle position hash functions.
6 years ago
6b088d37bf
(svn r27986) -Codechange: Name magic constants in the vehicle position hash functions.
6 years ago
ec661d7ae9
Merge branch 'template_train_replacement' into jgrpp
6 years ago
4a9df57665
TBTR: Enable autorenew when template replacement active
6 years ago
Jonathan G Rennison
PeterN
Peter Nelson
nikolas
Charles Pigott
Niels Martin Hansen
frosch