dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,333 Commits 1 Branch 0 Tags
f02d04fa1244c5cbab8fa8665023535d3d89df6f
Commit Graph

1771 Commits

Author SHA1 Message Date
Jonathan G Rennison
002e99ac34 Debug: Show tile info on separate lines in vehicle debug window 2020-07-09 17:40:00 +01:00
Jonathan G Rennison
1f5de8b82c Auto separation: Remove circular linked list, use new algorithm 2020-07-09 02:15:16 +01:00
Jonathan G Rennison
894fd6c609 Add separation state to DumpVehicleFlags 2020-07-07 18:22:06 +01:00
Jonathan G Rennison
09a1a7ce1a Auto-separation: Tidy up Vehicle::InitSeparation 2020-07-07 18:14:50 +01:00
Jonathan G Rennison
b520193831 Fix incorrect news parameters for vehicle too heavy advice message 2020-07-07 18:10:38 +01:00
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
 2020-06-30 21:43:04 +01:00
Charles Pigott
218db00c4c Fix #8216: Don't show floating text on autoreplace if cost is 0 2020-06-28 00:00:28 +01:00
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.
 2020-05-21 20:02:34 +02:00
Jonathan G Rennison
f077c3bf6e Merge branch 'master' into jgrpp 2020-04-06 20:58:54 +01:00
glx
b50d77b831 Fix #8064: Incorrect display of refit capacity 2020-04-06 16:21:30 +01:00
Jonathan G Rennison
f3145030b7 Fix false positive in ValidateVehicleTileHash 2020-03-09 09:22:51 +00:00
Jonathan G Rennison
cb6a01cab3 Fix cases where departures board data was not invalidated 2020-03-09 09:22:38 +00:00
Jonathan G Rennison
a4608f6f72 Cache vehicle positions across draw blocks in viewport map mode 2020-03-05 23:06:01 +00:00
Jonathan G Rennison
4108672cf6 Use separate tile hash for each vehicle type 2020-03-03 06:57:50 +00:00
Jonathan G Rennison
4020719227 Exclude effect and disaster vehicles from vehicle tile hash 2020-03-03 06:57:50 +00:00
Jonathan G Rennison
de2c2f7cea Fix 37adf9be: Fix last effect flag not being checked if front has no effect 2020-02-27 01:57:35 +00:00
Jonathan G Rennison
76f68c48f5 Cache whether vehicle is currently drawn: Vehicle::IsDrawn() 2020-02-03 18:58:19 +00:00
Jonathan G Rennison
9917a1daef Scheduled dispatch: Add hints about dispatch order to timetable window 
Adjust condition for dispatch order
 2020-01-29 00:25:09 +00:00
Jonathan G Rennison
c3fce9c09b Fix ff628813: Inverted test for if train refit state matches template 2020-01-18 21:49:36 +00:00
Jonathan G Rennison
7611e1229c Use 0 for per-cargo percent loaded value when capacity is 0 2020-01-18 20:48:41 +00:00
Jonathan G Rennison
09b13dd484 Add conditional orders for cargo load percentage and waiting cargo amount 
See: #90
 2020-01-18 20:32:42 +00:00
Jonathan G Rennison
ee6d808578 TBTR: Template replacements now also apply to child groups 2020-01-16 21:47:29 +00:00
Jonathan G Rennison
ff6288139e TBTR: Send train to depot when replacement due but servicing disabled 
This is to match autoreplace
 2020-01-16 21:10:56 +00:00
Jonathan G Rennison
424813446f TBTR: Avoid unnecessary iterations of template replacement pool 2020-01-16 01:16:08 +00:00
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
 2020-01-06 18:45:51 +00:00
SamuXarick
9e7c5235e8 Fix #7891: Actually check the vehicle type before casting 2020-01-03 00:04:39 +00:00
glx
d8a1be48cd Codechange: Replace vehicle related FOR_ALL with range-based for loops 2019-12-21 20:13:03 +01:00
glx
1f6b3a37f9 Codechange: Replace FOR_ALL_ENGINES with range-based for loops 2019-12-21 20:13:03 +01:00
glx
ddabfed1cd Codechange: Replace station related FOR_ALL with range-based for loops 2019-12-21 20:13:03 +01:00
Jonathan G Rennison
ec0b5e0ed0 Improve performance of departures window 
See: #119
 2019-12-17 22:47:16 +00:00
Jonathan G Rennison
aa8aae9a62 Initial implementation of tracerestrict speed restriction feature 2019-12-06 21:15:07 +00:00
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
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
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
 2019-10-05 21:45:54 +01:00
Jonathan G Rennison
455e694e79 Refactor effect vehicle cache to reduce cost of inserts/removes 2019-10-05 12:28:23 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Jonathan G Rennison
ba9d1a0390 Merge branch 'jgrpp' into jgrpp-nrt 
# Conflicts:
#	.ottdrev-vc
#	README.md
#	jgrpp-changelog.md
 2019-08-29 01:01:45 +01:00
Jonathan G Rennison
9a05ea67d5 Add chicken bits setting 
2 bits so far
 2019-08-28 19:10:34 +01:00
Jonathan G Rennison
7ed86e7488 Merge branch 'jgrpp' into jgrpp-nrt 2019-07-29 22:50:51 +01:00
Jonathan G Rennison
162fcb050e Only set TBTR replacement game event flag when replacement action occurs 2019-07-29 19:36:35 +01:00
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
 2019-07-11 19:45:56 +01:00
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
 2019-07-08 16:19:07 +01:00
Jonathan G Rennison
9b87610cd6 Check vehicle tile hash in CheckCaches 2019-05-27 15:58:30 +01:00
Jonathan G Rennison
31ad8bdd07 Do not add virtual vehicles to tile hash 2019-05-27 15:58:17 +01:00
Jonathan G Rennison
5b7d1f7f80 Add game event for TBTR replacement attempt 2019-05-19 18:38:02 +01:00
Jonathan G Rennison
49f6490c7d Fix potential non-determinism in vehicle autorenew/template replace/pay for repair/sell 2019-05-18 10:17:59 +01:00
Jonathan G Rennison
1e51d7af2f Add console command to dump vehicle stats 2019-05-16 18:58:50 +01:00
Jonathan G Rennison
10d0f79e83 Validate vehicle tick caches in CheckCaches 2019-05-02 19:20:47 +01:00
peter1138
c02ef3e456 Feature: Add NotRoadTypes (NRT) 2019-05-01 21:36:27 +02:00
Charles Pigott
5b34c8019f Codechange: Remove Company/OwnerByte types 2019-04-29 17:40:22 +01:00