Commit Graph

2581 Commits (ece0a431467579679b0a0efe029ad00315f900be)

Author SHA1 Message Date
Jonathan G Rennison 1d885c462f Fix incorrect string parameters for dispatch schedule assigned to depot
See: #368
2 years ago
Jonathan G Rennison 47f219d66d Settings GUI: Label sprite_zoom_min as should be left at default 2 years ago
Jonathan G Rennison e5c99b3601 Settings GUI: Add flag to mark a setting as should be left at default 2 years ago
Jonathan G Rennison 0a7a7ebcf0 Add build vehicle window sort mode: cargo capacity / running cost 2 years ago
Jonathan G Rennison eeef6c485a Initial implementation of NewGRF feature ID mapping 2 years ago
Jonathan G Rennison c69ed1711d Allow road vehicle go to station/waypoint orders to have a direction 2 years ago
Jonathan G Rennison b4fc0b4dc5 Initial implementation of road waypoints 2 years ago
Jonathan G Rennison d81cbc25b8 Add setting to allow hiding viewport labels of inidivudal waypoints 2 years ago
Jonathan G Rennison 26fb0940c6 Add client setting for whether to sync locale settings with server in multiplayer 2 years ago
Jonathan G Rennison 904ff6757d Add slot support to road vehicles, ships and aircraft 2 years ago
Jonathan G Rennison 0513961b2a Duplicate STR_SMALLMAP_LEGENDA_... veh type strings with format codes removed 2 years ago
Jonathan G Rennison fe522f193b Show confirmation window before clearing/removing dispatch schedule 2 years ago
Jonathan G Rennison 8754e1c5d0 Show scheduled dispatch marker in yellow in timetable window 2 years ago
Jonathan G Rennison 65cb4ccedf Limit number of warnings whon in timetable window 2 years ago
Jonathan G Rennison 4f7f8c5b63 Show which order schedule assigned to in scheduled dispatch window 2 years ago
Jonathan G Rennison ff3473fe6a Add support for multiple scheduled dispatch schedules per order list 2 years ago
Jonathan G Rennison a4ea155d33 Merge PR #357 into jgrpp 2 years ago
Yourself 7823c81597 Add: Through load speed limit setting 2 years ago
Yourself e4fa9f8465 Add: Cargo delivery distribution modes 2 years ago
Jonathan G Rennison 89181ea9fd Add setting to increase cost/distance of aircraft linkgraph links 2 years ago
Jonathan G Rennison f65a166308 Add client setting to show all signals using the default sprites 2 years ago
Jonathan G Rennison 66ce6c5090 Scheduled dispatch: Add clear schedule GUI function
Add management dropdown box to window
2 years ago
Jonathan G Rennison 7953a1f8d1 Allow setting autosave interval to a custom number of real-time minutes 2 years ago
Jonathan G Rennison 583663bca1 Allow setting autosave interval to a custom number of days 2 years ago
Jonathan G Rennison 4e25fa199c Add a "default" mode to TT autofill rounding setting, set as default
Use game ticks per minute or day ticks
3 years ago
Jonathan G Rennison 0aeafeaf3a Allow adding multiple scheduled dispatch departure slots at once 3 years ago
Jonathan G Rennison 6f38769b73 Rename incorrectly named set time/date window strings 3 years ago
Jonathan G Rennison 10f3641d9f Adjust road vehicle quantum tunneling setting text
See: #338
3 years ago
Jonathan G Rennison 70fdb9091b Merge PR #338 into jgrpp 3 years ago
Jonathan G Rennison 0794825187 Reduce unnecessary diffs with upstream in lang/english.txt 3 years ago
Jonathan G Rennison 8bc15c10cd Fix station/waypoint vehicle tooltip showing incorrect ctrl-click text
Split ctrl-click text from original tooltip strings

See: #36
3 years ago
Jonathan G Rennison e6fbf797ff Split timetable clear/set speed/wait time tooltip strings
This is to separate the original strings from added suffixes
3 years ago
Jonathan G Rennison b02b154218 Also show hours and minutes for schdispatch duration in minutes mode 3 years ago
Jonathan G Rennison dd5d4c795b Fix entering schdispatch delay/duration when not in minutes mode 3 years ago
Jonathan G Rennison 2308345803 Improve labels of non-text scheduled dispatch date/time entry window 3 years ago
reldred f461f0de08 Introduces a new setting (defaulted off) to allow preventing road vehicles from performing so-called quantum tunelling through other vehicles blocking their path. 3 years ago
Jonathan G Rennison 5959e1c0f9 Merge PR #336 into jgrpp 3 years ago
reldred 5a53b4d846 Additional tweaks to allow rivers to spawn in deserts (causing aditional tropic biome to spawn around them). This piggybacks off of the 'allow lakes in deserts' setting, renaming it to cover both. The actual setting name itself internally hasn't changed. 3 years ago
reldred 904ff346c2 Initial commit to allow configuring running costs as a fraction (1/1 default thru 1/4) independently for both vehicles stopped in depots (doesn't work for planes, I'm not smart enuff), or vehicles that are stationary. 3 years ago
Jonathan G Rennison b259d04339 Add tunnel/bridge entrance/exit values to entry direction conditional 3 years ago
Jonathan G Rennison 3d4261a33a Merge branch 'master' into jgrpp
# Conflicts:
#	src/order_cmd.cpp
#	src/table/settings/news_display_settings.ini
3 years ago
Guillaume Renoult c38af72978
Update: add setting to hide news about competitors vehicle crash (#9653) 3 years ago
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
3 years ago
Jonathan G Rennison 3ef1a0943b Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/lang/chuvash.txt
#	src/lang/czech.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/german.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latvian.txt
#	src/lang/russian.txt
#	src/tree_gui.cpp
#	src/vehicle.cpp
3 years ago
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
3 years ago
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
3 years ago
Jonathan G Rennison faf32200cf Merge tag '12.0-beta1' into jgrpp-beta
# Conflicts:
#	CMakeLists.txt
#	bin/ai/CMakeLists.txt
#	bin/game/CMakeLists.txt
#	src/build_vehicle_gui.cpp
#	src/console_cmds.cpp
#	src/core/overflowsafe_type.hpp
#	src/fios.cpp
#	src/lang/english.txt
#	src/lang/german.txt
#	src/lang/korean.txt
#	src/lang/polish.txt
#	src/network/core/game_info.cpp
#	src/network/core/game_info.h
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_coordinator.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/rev.cpp.in
#	src/settings_type.h
#	src/train.h
#	src/train_cmd.cpp
3 years ago
Jonathan G Rennison f764fcfb1f Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/console_cmds.cpp
#	src/debug.cpp
#	src/lang/vietnamese.txt
#	src/network/core/address.cpp
#	src/network/core/address.h
#	src/network/core/config.h
#	src/network/core/os_abstraction.cpp
#	src/network/core/os_abstraction.h
#	src/network/core/tcp_listen.h
#	src/network/core/udp.cpp
#	src/network/core/udp.h
#	src/network/network.cpp
#	src/network/network_client.cpp
#	src/network/network_gamelist.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf.cpp
#	src/openttd.cpp
#	src/saveload/saveload.h
#	src/settings.cpp
#	src/settings_table.cpp
#	src/settings_type.h
#	src/table/settings/network_settings.ini
3 years ago
Jonathan G Rennison 62afd94b47 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/company_cmd.cpp
#	src/economy.cpp
#	src/lang/swedish.txt
#	src/network/network_command.cpp
#	src/news_gui.cpp
#	src/saveload/saveload.h
#	src/script/api/script_list.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/sdl2_v.cpp
3 years ago
Jonathan G Rennison 61cc60099a Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
#	src/network/core/packet.cpp
#	src/network/core/udp.cpp
3 years ago
Jonathan G Rennison 53139c2405 Add current day/month to tracerestrict and conditional order conditionals 3 years ago
Jonathan G Rennison 944f090b46 Add settings for minimum contiguous landmass size for town/city placement 3 years ago
Charles Pigott 53e17d07d2
Fix #9595: Always use plural forms of cargo for subsidy strings (#9619) 3 years ago
Jonathan G Rennison 406b81abb1 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/economy.cpp
#	src/lang/traditional_chinese.txt
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
3 years ago
Charles Pigott 0853c1979b
Feature: Button to toggle showing advanced signal types (#9617) 3 years ago
Charles Pigott 3b7daca832
Change: Don't use 'server address' string in server list when displaying an invite code (#9615) 3 years ago
Tyler Trahan fb0549ea59 Feature: Configurable subsidy duration
(cherry picked from commit d09210e1c6)
3 years ago
Jonathan G Rennison 4042480806 Merge branch 'jgrpp' into jgrpp-beta
# Conflicts:
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/table/company_settings.ini
#	src/table/currency_settings.ini
#	src/table/gameopt_settings.ini
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/table/settings.ini
#	src/table/win32_settings.ini
#	src/table/window_settings.ini
3 years ago
Jonathan G Rennison db11c1d927 Add setting description help text for extra asymmetric linkgraph modes
See also: #321
3 years ago
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
3 years ago
dP 31cf9e888b
Add: [Network] external chat messages for remote admins (#9563) 3 years ago
Jonathan G Rennison 9ad5e4baf0 Add maximum speed (fully loaded) to train window sort list 3 years ago
Patric Stout cd03bac3dd
Fix: add back 'Spectate' option to company toolbar menu (#9556)
This was removed in ce7406f88b, but people used this to quickly
mark themselves as away.

Co-authored-by: dP <dp@dpointer.org>
3 years ago
Bernard Teo 20717ededf Feature: Button to open order window from VL_SHARED_ORDERS window 3 years ago
Jonathan G Rennison 2bd535e834 Merge branch 'master' into jgrpp-beta
# Conflicts:
#	src/engine_base.h
#	src/gfxinit.cpp
#	src/graph_gui.cpp
#	src/lang/brazilian_portuguese.txt
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/korean.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/network/core/address.cpp
#	src/network/core/game_info.h
#	src/network/core/os_abstraction.h
#	src/network/core/udp.cpp
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_internal.h
#	src/newgrf_engine.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/string_func.h
#	src/town_gui.cpp
#	src/video/video_driver.cpp
#	src/widget_type.h
3 years ago
SamuXarick a57c2b073a
Feature: Display icon/text whether vehicle is lost in vehicle (list) window (#9543) 3 years ago
dP 40a6181a16 Change: Return 'New company/Spectate' option to company toolbar menu
(cherry picked from commit dc2bbfd3f4c78ea14631c2005544bb6898faf1b0)

Include spectate option part
3 years ago
Jonathan G Rennison afd66c1631 Show linear scaling value in settings window for cargo scaling settings 3 years ago
Tyler Trahan 7469f00c5b
Feature: Hide block signals in GUI by default (#8688) 3 years ago
Jonathan G Rennison 5d351a14d2 Add new signal type: no-entry signal
This is only passable in one direction, but does not have a signal
or show an aspect in the opposite direction

Add a setting for whether this is shown in the signal UI.
Off by default.
3 years ago
Patric Stout 9c74dc2468
Codechange: validate that all STR_NNN strings are defined and used (#9518) 3 years ago
Jonathan G Rennison 6af182c3ca Add sort by number of vehicles calling to station list window 3 years ago
Jonathan G Rennison 16f2ef227b Store tunnel/bridge signal spacing on tile, adjust spacing to fit length 3 years ago
Patric Stout 13b53e1290
Codechange: remove unused strings (#9516) 3 years ago
Patric Stout dc5b7b996c
Fix: [Network] show query errors in the server listing instead of error popup (#9506)
When you are query several servers at once, it is rather unclear
for which server you got a popup. Instead, show any errors on the
server itself.

This is only true for the query-part. Joining a server still gives
an error popup to tell you about any issue.
3 years ago
Jonathan G Rennison 5afa1b93eb Show buy cost and running cost in template windows
See: #312
3 years ago
Jonathan G Rennison d67f63a04e Remove unused template replacement value strings 3 years ago
Patric Stout c4b700f1b0
Fix #9492: show for what server a relay session is being created (#9494)
Currently it says "the server" which is a bit ambigious. Be more
specific.
3 years ago
Patric Stout 996ae28989
Fix #9491: reword "no connection" error message (#9495) 3 years ago
Patric Stout 5da60cef46
Fix: typo in the word "spectator" (tnx Heiki) (#9496) 3 years ago
Patric Stout 6acf204d14
Fix: report reuse of invite-code and switch to local game-type (#9487)
This prevents two servers battling for the same invite-code. Now
the last one wins.
3 years ago
Jonathan G Rennison b8d5113c5a Tracerestrict: Add slot action mode, try to acquire (only on reserve) 3 years ago
Patric Stout 3d55ea2d4d
Feature: make "join game" button join the game, instead of first showing a lobby window (#9467)
Nobody really paid attention to the lobby window, and it completely
missed its purpose. Most people don't even wait for companies to
show up, but just hit "New Company".
This in turn means people create a lot of unneeded companies, while
they "just want to watch the game" or join another company.

Instead, "Join Game" now just joins the game as spectators.
3 years ago
Patric Stout 132c540d58
Fix: name the Online Players caption the same as in the menu (#9473)
Referring to one window in two ways is a bit annoying.
3 years ago
Patric Stout 65b8614d26
Add: mention you are a spectator in the status bar (if you are, ofc) (#9471) 3 years ago
Patric Stout 4c1ea4020d
Change: remove the ability to control "max spectators" (#9466)
Soon we will make "join game" join the game as spectator first,
so limiting the amount of spectators makes no sense anymore in
that context. Not sure it ever did make sense.
3 years ago
Jonathan G Rennison e76c5dfda7 Revert "Temporarily mark dual pane train purchase window as experimental"
This reverts commit f9bb004b05.
3 years ago
Patric Stout fa1e27994d Feature: allow the use of TURN to connect client and server together
TURN is a last resort, used only if all other methods failed.
TURN is a relay approach to connect client and server together, where
openttd.org (by default) is the middleman.

It is very unlikely either the client or server cannot connect to
the STUN server, as they are both already connected to the Game
Coordinator. But in the odd case it does fail, estabilishing the
connection fails without any further possibility to recover.
3 years ago
Jonathan G Rennison 6a009686c9 Fix #299: Add estimated max speed (full) to template windows 3 years ago
Patric Stout 8adade26ed Feature: allow the use of STUN to connect client and server together
This method doesn't require port-forwarding to be used, and works for
most common NAT routers in home setups. But, for sure it doesn't work
for all setups, and not everyone will be able to use this.
3 years ago
Patric Stout c921f6d817
Add: inform clients what game-script a server is running (#9441)
Co-authored-by: The Dude <thedude@novapolis.net>
3 years ago
Patric Stout b6a116a247
Add: allow setting your server visibility to "invite-only" (#9434)
In this mode you do register to the Game Coordinator, but your
server will not show up in the public server listing. You can give
your friends the invite code of the server with which they can
join.
3 years ago
Patric Stout e4d216e44b Feature: join servers based on their invite code
This removes the need to know a server IP to join it. Invite codes
are small (~7 characters) indentifiers for servers, which can be
exchanged with other players to join the servers.
3 years ago
Patric Stout b1280fd17e Add: use Game Coordinator to annouce public servers 3 years ago
Jonathan G Rennison f9bb004b05 Temporarily mark dual pane train purchase window as experimental
See: #287, #296, #297
3 years ago
Jonathan G Rennison 158608442c Merge pull request #281 from VacuumBreather/train_speed_adaptation
# Conflicts:
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
3 years ago
Jonathan G Rennison 0f73fe765f
Merge pull request #293 from VacuumBreather/station_cargo_history
Add station cargo history
3 years ago
Jonathan G Rennison 37c7cf9899 Remove number of days from hard-coded X axis label string
To support later day number changes and/or translations
3 years ago
Jonathan G Rennison 0773dde669
Merge pull request #287 from VacuumBreather/advanced_train_purchase_window
Advanced train purchase window
3 years ago
Jonathan G Rennison 5e418128da Add setting for whether to use dual pane train purchase window 3 years ago