Jonathan G Rennison
|
5b78090a61
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# src/saveload/town_sl.cpp
# src/screenshot.h
# src/script/api/ai/ai_date.hpp.sq
# src/script/api/ai/ai_marine.hpp.sq
# src/script/api/ai/ai_station.hpp.sq
# src/script/api/game/game_date.hpp.sq
# src/script/api/game/game_marine.hpp.sq
# src/script/api/game/game_station.hpp.sq
# src/script/api/game/game_window.hpp.sq
# src/script/api/script_window.hpp
# src/script/api/template/template_window.hpp.sq
# src/signal.cpp
# src/statusbar_gui.cpp
# src/toolbar_gui.cpp
# src/viewport.cpp
# src/viewport_func.h
|
4 years ago |
|
Jonathan G Rennison
|
810bfd276e
|
Add several NewGRF variables to vehicle image callback whitelist
Add vehicle flags to control cached image invalidation
Various refactorings
|
4 years ago |
TechGeekNZ
|
a10013dd00
|
Codechange: Spell 'Viewport' consistently
Some places in the codebase misspell 'Viewport' as 'ViewPort' or 'view_port'.
This patch makes everything consistent.
|
4 years ago |
|
Jonathan G Rennison
|
002e99ac34
|
Debug: Show tile info on separate lines in vehicle debug window
|
4 years ago |
|
Jonathan G Rennison
|
1f5de8b82c
|
Auto separation: Remove circular linked list, use new algorithm
|
4 years ago |
|
Jonathan G Rennison
|
894fd6c609
|
Add separation state to DumpVehicleFlags
|
4 years ago |
|
Jonathan G Rennison
|
09a1a7ce1a
|
Auto-separation: Tidy up Vehicle::InitSeparation
|
4 years ago |
|
Jonathan G Rennison
|
b520193831
|
Fix incorrect news parameters for vehicle too heavy advice message
|
4 years ago |
|
Jonathan G Rennison
|
3adeff1883
|
Merge branch 'master' into jgrpp
# Conflicts:
# CMakeLists.txt
# cmake/CompileFlags.cmake
# src/bridge_gui.cpp
# src/saveload/afterload.cpp
# src/saveload/saveload.cpp
# src/saveload/saveload.h
# src/saveload/town_sl.cpp
# src/screenshot.cpp
# src/screenshot.h
# src/toolbar_gui.cpp
# src/town.h
# src/town_cmd.cpp
|
4 years ago |
Charles Pigott
|
218db00c4c
|
Fix #8216: Don't show floating text on autoreplace if cost is 0
|
4 years ago |
Michael Lutz
|
f2b40f40aa
|
Codechange: Replace SmallPair with std::pair.
std::pair is already the smallest possible pair, and it already handles non-POD types correctly.
|
4 years ago |
|
Jonathan G Rennison
|
f077c3bf6e
|
Merge branch 'master' into jgrpp
|
4 years ago |
glx
|
b50d77b831
|
Fix #8064: Incorrect display of refit capacity
|
4 years ago |
|
Jonathan G Rennison
|
f3145030b7
|
Fix false positive in ValidateVehicleTileHash
|
4 years ago |
|
Jonathan G Rennison
|
cb6a01cab3
|
Fix cases where departures board data was not invalidated
|
4 years ago |
|
Jonathan G Rennison
|
a4608f6f72
|
Cache vehicle positions across draw blocks in viewport map mode
|
4 years ago |
|
Jonathan G Rennison
|
4108672cf6
|
Use separate tile hash for each vehicle type
|
4 years ago |
|
Jonathan G Rennison
|
4020719227
|
Exclude effect and disaster vehicles from vehicle tile hash
|
4 years ago |
|
Jonathan G Rennison
|
de2c2f7cea
|
Fix 37adf9be: Fix last effect flag not being checked if front has no effect
|
4 years ago |
|
Jonathan G Rennison
|
76f68c48f5
|
Cache whether vehicle is currently drawn: Vehicle::IsDrawn()
|
4 years ago |
|
Jonathan G Rennison
|
9917a1daef
|
Scheduled dispatch: Add hints about dispatch order to timetable window
Adjust condition for dispatch order
|
4 years ago |
|
Jonathan G Rennison
|
c3fce9c09b
|
Fix ff628813: Inverted test for if train refit state matches template
|
5 years ago |
|
Jonathan G Rennison
|
7611e1229c
|
Use 0 for per-cargo percent loaded value when capacity is 0
|
5 years ago |
|
Jonathan G Rennison
|
09b13dd484
|
Add conditional orders for cargo load percentage and waiting cargo amount
See: #90
|
5 years ago |
|
Jonathan G Rennison
|
ee6d808578
|
TBTR: Template replacements now also apply to child groups
|
5 years ago |
|
Jonathan G Rennison
|
ff6288139e
|
TBTR: Send train to depot when replacement due but servicing disabled
This is to match autoreplace
|
5 years ago |
|
Jonathan G Rennison
|
424813446f
|
TBTR: Avoid unnecessary iterations of template replacement pool
|
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 |
SamuXarick
|
9e7c5235e8
|
Fix #7891: Actually check the vehicle type before casting
|
5 years ago |
|
glx
|
d8a1be48cd
|
Codechange: Replace vehicle related FOR_ALL with range-based for loops
|
5 years ago |
|
glx
|
1f6b3a37f9
|
Codechange: Replace FOR_ALL_ENGINES with range-based for loops
|
5 years ago |
|
glx
|
ddabfed1cd
|
Codechange: Replace station related FOR_ALL with range-based for loops
|
5 years ago |
|
Jonathan G Rennison
|
ec0b5e0ed0
|
Improve performance of departures window
See: #119
|
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 |
|
Jonathan G Rennison
|
455e694e79
|
Refactor effect vehicle cache to reduce cost of inserts/removes
|
5 years ago |
JMcKiern
|
04f659e768
|
Fix: Some typos found using codespell
|
5 years ago |
|
Jonathan G Rennison
|
ba9d1a0390
|
Merge branch 'jgrpp' into jgrpp-nrt
# Conflicts:
# .ottdrev-vc
# README.md
# jgrpp-changelog.md
|
5 years ago |
|
Jonathan G Rennison
|
9a05ea67d5
|
Add chicken bits setting
2 bits so far
|
5 years ago |
|
Jonathan G Rennison
|
7ed86e7488
|
Merge branch 'jgrpp' into jgrpp-nrt
|
5 years ago |
|
Jonathan G Rennison
|
162fcb050e
|
Only set TBTR replacement game event flag when replacement action occurs
|
5 years ago |
|
Jonathan G Rennison
|
ba8ed880c1
|
Merge branch 'master' into jgrpp-nrt
Merge NRT feature
# Conflicts:
# docs/landscape.html
# docs/landscape_grid.html
# src/bridge_map.h
# src/build_vehicle_gui.cpp
# src/company_base.h
# src/company_cmd.cpp
# src/misc_gui.cpp
# src/newgrf.cpp
# src/newgrf_engine.cpp
# src/pathfinder/follow_track.hpp
# src/pathfinder/npf/npf.cpp
# src/road_cmd.cpp
# src/road_func.h
# src/road_gui.cpp
# src/road_map.h
# src/road_type.h
# src/roadveh_cmd.cpp
# src/saveload/afterload.cpp
# src/saveload/company_sl.cpp
# src/script/api/script_bridge.cpp
# src/table/newgrf_debug_data.h
# src/tile_cmd.h
# src/town_cmd.cpp
# src/tunnel_map.h
# src/tunnelbridge_cmd.cpp
|
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
|
9b87610cd6
|
Check vehicle tile hash in CheckCaches
|
5 years ago |
|
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 |