dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,292 Commits 1 Branch 0 Tags
eda50ef6a58056f14e32dfcd8bd27ba8a8ae8d67
Commit Graph

1847 Commits

Author SHA1 Message Date
Michael Lutz
b6933a2ebd Codechange: Move command arguments to the back of the DoCommand function call. 2021-12-16 22:28:32 +01:00
Jonathan G Rennison
9e946d4c5d Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/command.cpp
#	src/console_cmds.cpp
#	src/group_gui.cpp
#	src/lang/catalan.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/greek.txt
#	src/lang/hungarian.txt
#	src/lang/irish.txt
#	src/lang/japanese.txt
#	src/lang/luxembourgish.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/saveload/afterload.cpp
#	src/saveload/newgrf_sl.cpp
#	src/saveload/saveload.h
#	src/script/script_instance.cpp
#	src/toolbar_gui.cpp
#	src/toolbar_gui.h
#	src/vehicle_gui.cpp
#	src/widgets/rail_widget.h
#	src/widgets/vehicle_widget.h
#	src/window.cpp
 2021-11-03 00:45:12 +00:00
Jonathan G Rennison
324e90e5ac Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/lang/arabic_egypt.txt
#	src/lang/english.txt
#	src/lang/greek.txt
#	src/network/core/tcp_connect.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/yapf/yapf_ship.cpp
#	src/rail_gui.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/table/settings/gui_settings.ini
#	src/town_cmd.cpp
#	src/widgets/rail_widget.h
 2021-11-02 19:23:24 +00:00
Jonathan G Rennison
9e1bb3eea7 Merge tag '12.0-beta2' into jgrpp-beta 
# Conflicts:
#	docs/landscape_grid.html
#	src/lang/simplified_chinese.txt
#	src/network/network_server.cpp
#	src/station_cmd.cpp
 2021-11-02 18:02:37 +00:00
Jonathan G Rennison
f54d69a60a Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	src/economy.cpp
#	src/elrail.cpp
#	src/graph_gui.cpp
#	src/linkgraph/linkgraph_gui.cpp
#	src/network/core/game_info.cpp
#	src/newgrf_station.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/strings_func.h
#	src/table/settings/network_settings.ini
#	src/table/settings/settings.ini
 2021-11-01 21:18:24 +00:00
Loïc Guilloux
a4a7240511 Change: Allow all tiles around docks to be docking tiles (#9578) 
(cherry picked from commit 38a64eb2aa)
 2021-10-31 13:25:26 +00:00
Jonathan G Rennison
fd605e3cf3 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/commit-checker.yml
#	src/company_cmd.cpp
#	src/console_cmds.cpp
#	src/crashlog.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/swedish.txt
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/mcf.cpp
#	src/network/core/tcp.cpp
#	src/network/core/tcp.h
#	src/network/core/tcp_game.h
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_admin.cpp
#	src/network/network_admin.h
#	src/network/network_chat_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_func.h
#	src/network/network_internal.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf.cpp
#	src/newgrf_station.cpp
#	src/order_gui.cpp
#	src/rail_cmd.cpp
#	src/saveload/saveload.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_type.h
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/table/currency_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/terraform_cmd.cpp
#	src/timetable_gui.cpp
#	src/train_cmd.cpp
#	src/tree_cmd.cpp
#	src/water_cmd.cpp
 2021-09-27 22:47:23 +01:00
Loïc Guilloux
38a64eb2aa Change: Allow all tiles around docks to be docking tiles (#9578) 2021-09-26 19:31:55 +02:00
Jonathan G Rennison
0b0d154788 Merge branch 'master' into jgrpp-beta 
# Conflicts:
#	.github/workflows/ci-build.yml
#	src/lang/german.txt
#	src/lang/romanian.txt
#	src/lang/slovak.txt
#	src/lang/turkish.txt
#	src/network/core/address.cpp
#	src/network/core/tcp.h
#	src/network/core/udp.cpp
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/network/network_udp.cpp
#	src/openttd.cpp
#	src/saveload/newgrf_sl.cpp
#	src/tree_cmd.cpp
#	src/video/video_driver.hpp
#	src/window.cpp
#	src/window_gui.h
 2021-09-22 21:50:02 +01:00
SamuXarick
18247bb3b8 Fix #9521: Don't load at just removed docks that were part of a multi-dock station (#9524) 2021-09-18 13:25:07 +02:00
Nicolas Chappe
b83820e723 Change: [Linkgraph] Delete links only served by vehicles stopped in depot 
A stale link is not deleted if the link refresher finds a vehicle that still serves it.
This commit excludes vehicles stopped in depot for a very long time from the link refresher,
so that their stale links can be deleted.
 2021-08-20 22:37:03 +02:00
Joan Josep
cc38a42b07 Fix 659989af45: Set appropriate town window dirty when building/removing airports. (#9497) 2021-08-18 14:33:32 +02:00
Nicolas Chappe
977604ef08 Feature: [Linkgraph] Prioritize faster routes for passengers, mail and express cargo 
Passengers usually prefer fast paths to short paths.
Average travel times of links are updated in real-time for use in Dijkstra's algorithm,
and newer travel times weigh more, just like capacities.
 2021-08-17 14:57:59 +02:00
dP
c1d79398d5 Fix: Use of unstable sort when distributing cargo production can cause desyncs 2021-08-01 07:43:49 +02:00
dP
9176fe5f64 Fix: Use of unstable sort when distributing cargo production can cause desyncs 
(cherry picked from commit 4ed694fe98b146d984826d06b96e0c11045239bc)

See: https://github.com/OpenTTD/OpenTTD/pull/9460
 2021-08-01 00:21:41 +01:00
Jonathan G Rennison
4174fe727c Add NewGRF feature: Extra station name strings 
These are used when all the default names have been used up,
instead of "Town Station #NNN".
 2021-07-17 20:54:10 +01:00
glx22
89ab8b79a5 Codechange: Remove FOR_EACH_SET_BIT 2021-07-09 21:36:09 +02:00
Jonathan G Rennison
5698507d0b Change station cargo history storage format 
Use uint16 to avoid truncation issues
Don't reserve memory for unused cargoes
Store history as ring buffer
Update history graph immediately on storage date
Show total waiting cargo
 2021-06-29 19:37:20 +01:00
Andreas Schmitt
9b1783809d Add station cargo history 2021-06-23 08:48:46 +02:00
Jonathan G Rennison
3392d25aa3 Merge PR #274 into jgrpp 2021-06-15 02:01:22 +01:00
rubidium42
55a11710a6 Codechange: convert printf DEBUG statements to fmt Debug statements 2021-06-13 12:45:45 +02: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
5799402f7a Codechange: Rename window related DeleteXXX to match new behaviour 2021-05-29 21:08:25 +02:00
rubidium42
2e136285e1 Codechange: move from C-string to std::string for DoCommand 2021-05-29 19:02:18 +02:00
rubidium42
661728558e Codechange: let IsUnique.* functions accept std::string 2021-05-29 19:02:18 +02:00
rubidium42
b791ffc6de Fix: do not hide parameter by local variable with the same name 2021-05-27 18:30:56 +02:00
rubidium42
44ca7d9377 Change: Use gender-neutral pronouns 2021-05-15 10:16:48 +02:00
glx22
38c97e1492 Codechange: Replace TILE_AREA_LOOP with range-based for loops 2021-05-13 00:13:54 +02: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
glx22
2feb801e56 Codechange: Replace FOR_ALL_ROADTRAMTYPES with range-based for loops 2021-05-03 19:46:57 +02:00
Jonathan G Rennison
ece9a356dc Fix #9113: Assertion failure when removing airport with order backup (#9182) 2021-05-03 15:03:25 +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
Peter Nelson
a3e49178d1 Codechange: Use std::vector for NewGRF station tile sprite layouts. 2021-05-02 17:15:27 +01:00
Peter Nelson
bd1a20f6ee 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.
 2021-05-02 17:15:27 +01:00
glx22
9a8756d7ed Codechange: Replace FOR_ALL_CARGOSPECS with range-based for loops 2021-04-29 21:08:24 +02: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
25909b06d2 Fix #8809: Crash when removing airport when hangar window open 2021-03-07 17:59:38 +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