dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
51,219 Commits 1 Branch 0 Tags
d1114b6b79d34d052dcb5be1c03ea4cc696c0ba4
Commit Graph

1615 Commits

Author SHA1 Message Date
Jonathan G Rennison
3392d25aa3 Merge PR #274 into jgrpp 2021-06-15 02:01:22 +01:00
Andreas Schmitt
92dad745c9 Fix a small bug 2021-06-13 06:20:51 +02:00
Andreas Schmitt
c4c2fedbb1 Refactor station rating and tooltip - multiply vehicle age check by 10 2021-06-13 06:03:03 +02:00
Jonathan G Rennison
1002c6d9d2 Fix various compiler warnings 
See: #267
 2021-06-11 22:54:27 +01:00
glx22
8333323090 Codechange: Replace FOR_ALL_ROADTRAMTYPES with range-based for loops 
(cherry picked from commit 2feb801e56)
 2021-05-06 21:21:41 +01:00
Peter Nelson
da571d6481 Codechange: Use std::vector for NewGRF station tile sprite layouts. 
(cherry picked from commit a3e49178d1)
 2021-05-06 21:10:33 +01:00
Peter Nelson
72bc8c7595 Codechange: Use std::vector for NewGRF station platform layouts. 
This avoids the need to custom memory management and additional members.

This also resolves use-after-free if modifying copied layouts, so presumably nobody has ever done that.

(cherry picked from commit bd1a20f6ee)
 2021-05-06 21:10:31 +01:00
glx22
050b95e351 Codechange: Replace FOR_ALL_CARGOSPECS with range-based for loops 
(cherry picked from commit 9a8756d7ed)
 2021-05-06 19:35:57 +01:00
Jonathan G Rennison
95ca147445 Add cheat: town local authority ratings fixed as Outstanding 2021-05-05 01:17:54 +01:00
Jonathan G Rennison
e0d5bf584d Fix assertion failure when removing airport with order backup 
See: #252, https://github.com/OpenTTD/OpenTTD/issues/9113
 2021-05-03 00:35:47 +01:00
Jonathan G Rennison
ba2e6087b2 Add train cache flag for whether train using realistic braking physics 2021-04-15 20:56:45 +01:00
Jonathan G Rennison
f1cab62140 Add cheat to fix station ratings at 100% 2021-04-11 04:00:17 +01:00
Jonathan G Rennison
1f360e97a1 Fix building over existing stations bypassing realistic braking moving train restrictions 2021-03-16 03:09:23 +00:00
Jonathan G Rennison
d6b5d6778e Fix train overshot station advice message being shown to all companies 2021-03-14 20:41:17 +00:00
Jonathan G Rennison
1b146b3bff Fix crash when removing/upgrading airport with hangar window open 
See: https://github.com/OpenTTD/OpenTTD/issues/8809
 2021-03-07 00:10:46 +00:00
Jonathan G Rennison
e95216b59d Merge branch 'master' into jgrpp 
# Conflicts:
#	src/company_cmd.cpp
#	src/core/geometry_func.cpp
#	src/date.cpp
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/object_gui.cpp
#	src/openttd.cpp
#	src/settings_type.h
#	src/video/allegro_v.cpp
#	src/video/dedicated_v.cpp
#	src/video/null_v.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
 2021-02-19 15:38:34 +00:00
Yourself
310bb876a2 Add: new town council "indifferent" attitude 
Closes: #184
 2021-02-16 22:49:18 +00:00
SamuXarick
a4035af337 Codechange: Apply coding style (#8640) 
* Fix: Missing or needed spaces

* Codechange: Remove space

* Codechange: Remove space

* Codechange: More missing spaces

* Codechange: Missing spaces

* Codechange: Remove space

* Codechange: Remove space
 2021-02-05 11:00:36 +01:00
Jonathan G Rennison
b7ddd486cf Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
 2021-02-01 17:07:34 +00:00
Jonathan G Rennison
f9956d88c3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/aircraft_cmd.cpp
#	src/company_gui.cpp
#	src/lang/arabic_egypt.txt
#	src/lang/czech.txt
#	src/lang/esperanto.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/malay.txt
#	src/lang/polish.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/unfinished/urdu.txt
#	src/main_gui.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_cmd.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings.ini
 2021-01-31 01:11:12 +00:00
Jonathan G Rennison
6c3e5642f8 Merge branch 'master' into jgrpp 
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/crashlog.cpp
#	src/fileio.cpp
#	src/fileio_func.h
#	src/fios_gui.cpp
#	src/ini_load.cpp
#	src/ini_type.h
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/network/network_client.cpp
#	src/order_base.h
#	src/order_cmd.cpp
#	src/os/windows/win32.cpp
#	src/road_cmd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/settings.ini
#	src/tree_cmd.cpp
#	src/tree_gui.cpp
#	src/vehicle_base.h
#	src/video/cocoa/cocoa_v.mm
#	src/video/cocoa/event.mm
#	src/video/cocoa/wnd_quartz.mm
#	src/viewport.cpp
#	src/widgets/tree_widget.h
 2021-01-31 01:08:35 +00:00
Jonathan G Rennison
4e0804b791 Fix const issues around GetTrainStopLocation/GetCurrentMaxSpeed 2021-01-29 02:13:08 +00:00
Jonathan G Rennison
ed0ffb6220 Add feature: realistic train braking 
Add setting to select train braking model.
 2021-01-28 19:03:18 +00:00
Charles Pigott
9b800a96ed Codechange: Remove min/max functions in favour of STL variants (#8502) 2021-01-08 11:16:18 +01:00
SamuXarick
79d938b957 Fix 0125892: Warning about unsigned unary minus 2021-01-07 21:42:10 +00:00
SamuXarick
f84a466ca5 Fix #7945: Add cost of clearing the sloped tile when placing a dock (#7947) 2021-01-07 10:35:09 +01:00
gooball
0125892f04 Fix #8297: Infrastructure counters for road tunnels, bridges, depots … (#8454) 
The previous fix 887e9481ff0e70df6bf93ce15a3899a03f124c50 only worked for roads and failed to consider a multiplier used for the infrastructure totals for tunnels/bridges.
Also, depots and bus/truck stops are counted as 2 road pieces on creation but were only counted as 1 road piece on conversion because the function DiagDirToRoadBits() was used, which only ever returns single-piece road segments.

Co-authored-by: A. S <admin-git@sotai.tk>
 2020-12-28 22:54:28 +01:00
Pavel Stupnikov
f39a00d676 Feature: Set exclusive access to industry from GS (#8115) 
(cherry picked from commit 9a45a0f535)
 2020-12-27 21:07:41 +00:00
glx22
d8605ad18d Codechange: Replace FOR_VEHICLE_ORDERS with range-based for loops 2020-12-27 10:28:46 +00:00
Pavel Stupnikov
9a45a0f535 Feature: Set exclusive access to industry from GS (#8115) 2020-12-22 14:29:48 +01:00
Jonathan G Rennison
2ad446369d Cache animated tile speed, use btree map for animated tiles 2020-11-26 00:19:51 +00:00
Jonathan G Rennison
ffe3c769a3 Add road tile cached one way state, one way road section detection 2020-10-28 00:27:48 +00:00
Jonathan G Rennison
3a75f13874 Allow drive-through road stops to be one-way 2020-10-28 00:27:48 +00:00
Jonathan G Rennison
67506e3781 Return error when upgrading airport to an identical configuration 
See: #200
 2020-10-28 00:27:48 +00:00
Jonathan G Rennison
3b49f892fa Redraw connecting link graph overlay links when moving station sign 
Add test console command
 2020-09-18 18:58:16 +01:00
Jonathan G Rennison
c82d372d54 Reduce performance issues in DeleteStaleLinks with refit to any cargo 
Remove redundant executions of LinkRefresher::Run
 2020-08-24 18:04:03 +01:00
Jonathan G Rennison
d5ada6a14b Add setting to control RV re-routing on road layout change 
Default to road removal only
This is due to poor performance with many RVs when town growth is
continually adding to the road layout
 2020-07-02 17:47:26 +01:00
Jonathan G Rennison
271fac01a7 Add setting to scale station cargo capacity and rating tolerance by size 2020-06-07 19:50:37 +01:00
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
 2020-05-21 22:24:01 +01:00
Michael Lutz
63ccb36ef3 Codechange: Use std::string for most of the user-settable custom names. 2020-05-21 20:02:34 +02:00
Jonathan G Rennison
d37d08ebb3 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/industry_cmd.cpp
#	src/station_cmd.cpp
#	src/station_func.h
 2020-05-14 00:40:16 +01:00
dP
f2a9a1e2a5 Fix #8137: New clients can't join (desync) after funding an industry 2020-05-13 08:43:01 +01:00
dP
7bd52970a1 Codechange: Refactor FindStationsAroundTiles to avoid code duplication 2020-05-13 08:43:01 +01:00
Jonathan G Rennison
a4bf068c6c Merge branch 'master' into jgrpp 
# Conflicts:
#	src/toolbar_gui.cpp
 2020-04-12 11:25:34 +01:00
glx
9339e4dcad Fix #8081: Check for waypoints when removing docking tiles 2020-04-12 08:46:55 +02:00
Jonathan G Rennison
ba65a79d09 Enable allowing/disallowing supply to a station, per cargo 
Ctrl-click station cargo rating
 2020-03-22 13:49:22 +00:00
Jonathan G Rennison
8fb0b638fa Merge branch 'master' into jgrpp 
# Conflicts:
#	src/network/network.cpp
 2020-03-11 23:16:32 +00:00
Jonathan G Rennison
7949de2c05 Add a minimum visible height and no ground tile parameter to DrawTileProc. 
Filter out tile parts which are entirely outside the drawing area.
 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
f2bc12bb21 Avoid integer overflow in MoveGoodsToStation 
In case where input cargo amount > 255
 2020-02-23 23:43:04 +00:00