Commit Graph

55205 Commits

Author SHA1 Message Date
Jonathan G Rennison
40a9f19c20 Implement text filtering in dual pane train build window 2023-05-31 23:50:09 +01:00
Jonathan G Rennison
2ed248a61d Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-build.yml
#	.github/workflows/release-linux.yml
#	src/aircraft_cmd.cpp
#	src/airport_gui.cpp
#	src/articulated_vehicles.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout.cpp
#	src/misc_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_engine.cpp
#	src/news_gui.cpp
#	src/order_gui.cpp
#	src/roadveh_cmd.cpp
#	src/saveload/saveload.h
#	src/saveload/vehicle_sl.cpp
#	src/ship_cmd.cpp
#	src/statusbar_gui.cpp
#	src/table/settings/network_private_settings.ini
#	src/table/settings/network_settings.ini
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle_gui.cpp
2023-05-31 23:21:38 +01:00
Jonathan G Rennison
6880cf24a0 Fix crash in template replacement failure news if autorenew succeeds 2023-05-30 23:41:51 +01:00
Jonathan G Rennison
13183d3f13 Add command result flag for whether SetResultData was called
Use for tracerestrict validation result fail offset
2023-05-30 23:41:19 +01:00
Jonathan G Rennison
5dcbd9271b Hide min_years_for_shares setting when shares are disabled 2023-05-30 19:19:41 +01:00
Jonathan G Rennison
bac8f032da Re-add company shares 2023-05-30 18:57:42 +01:00
Jonathan G Rennison
6297abdb3b Remove str_fmt and str_vfmt 2023-05-30 00:55:24 +01:00
Jonathan G Rennison
94c422499f Use last pointer in std::string returning GetString 2023-05-30 00:49:59 +01:00
Jonathan G Rennison
7aef72b946 Add static_assert for length of _command_proc_table 2023-05-30 00:49:35 +01:00
Jonathan G Rennison
02fe4af934 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/console_cmds.cpp
#	src/economy.cpp
#	src/economy_cmd.h
#	src/fios.h
#	src/goal.cpp
#	src/group_gui.cpp
#	src/network/core/config.h
#	src/network/network_admin.cpp
#	src/newgrf_config.cpp
#	src/os/windows/win32.cpp
#	src/saveload/afterload.cpp
#	src/saveload/company_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/ship_cmd.cpp
#	src/stdafx.h
#	src/story.cpp
#	src/story_base.h
#	src/string.cpp
#	src/table/settings/economy_settings.ini
#	src/tests/CMakeLists.txt
#	src/tests/math_func.cpp
2023-05-30 00:49:24 +01:00
Jonathan G Rennison
3ec66e5fb5 Fix not being able to reload GS in script debug window
See: #523
2023-05-29 20:21:07 +01:00
Jonathan G Rennison
d6b8fc9fe8 Github: Fix CI build checkout with workflow dispatch ref 2023-05-29 00:23:52 +01:00
Jonathan G Rennison
bf1e66b2f3 Add missing <functional> header to src/timer/timer.h 2023-05-28 23:51:37 +01:00
Jonathan G Rennison
6091d7470c Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-macos.yml
#	src/company_gui.cpp
#	src/linkgraph/linkgraph.cpp
#	src/newgrf_debug_gui.cpp
#	src/strgen/strgen_base.cpp
#	src/timetable_gui.cpp
2023-05-28 10:20:52 +01:00
Jonathan G Rennison
b02817f262 Merge branch 'master' into jgrpp
# Conflicts:
#	src/newgrf.cpp
2023-05-27 01:12:47 +01:00
Jonathan G Rennison
ef03d44fb3 Use std::unique_ptr for GRFLineToSpriteOverride 2023-05-27 00:47:27 +01:00
Jonathan G Rennison
f00e0e195f cpp-btree: Add support for uncopyable/move-only map/multimap value types 2023-05-27 00:47:27 +01:00
Jonathan G Rennison
b381a30d2d Merge branch 'master' into jgrpp
# Conflicts:
#	src/base_media_func.h
#	src/cargopacket.h
#	src/gfxinit.cpp
#	src/industry_cmd.cpp
#	src/window_gui.h
2023-05-26 20:08:05 +01:00
Jonathan G Rennison
42b3c5fe25 Fix highlight of adjacent rail/road waypoints when only one waypoint type 2023-05-26 19:38:17 +01:00
Jonathan G Rennison
fd4d4d341d Merge branch 'master' into jgrpp
# Conflicts:
#	src/animated_tile.cpp
#	src/cargopacket.h
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/date.cpp
#	src/disaster_vehicle.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/engine.cpp
#	src/error_gui.cpp
#	src/fontcache/spritefontcache.cpp
#	src/game/game_gui.cpp
#	src/game/game_text.cpp
#	src/gfx.cpp
#	src/graph_gui.cpp
#	src/highscore_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/italian.txt
#	src/lang/portuguese.txt
#	src/lang/russian.txt
#	src/lang/turkish.txt
#	src/lang/vietnamese.txt
#	src/main_gui.cpp
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf.h
#	src/newgrf_generic.cpp
#	src/news_gui.cpp
#	src/openttd.cpp
#	src/os/unix/unix.cpp
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/afterload.cpp
#	src/saveload/misc_sl.cpp
#	src/saveload/oldloader_sl.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/script/script_gui.cpp
#	src/settings_table.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spritecache.cpp
#	src/spritecache.h
#	src/spriteloader/grf.cpp
#	src/station_cmd.cpp
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen_base.cpp
#	src/subsidy.cpp
#	src/table/settings/difficulty_settings.ini
#	src/texteff.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/townname.cpp
#	src/vehicle.cpp
#	src/waypoint_cmd.cpp
#	src/widgets/dropdown.cpp
#	src/window.cpp
2023-05-26 19:36:48 +01:00
Jonathan G Rennison
7615c831aa Avoid unnecessary checks when removing adjacent level crossing tile 2023-05-26 00:52:33 +01:00
Jonathan G Rennison
0b9b080aa6 Fix closing build waypoint window not closing waypoint selection window 2023-05-25 23:11:18 +01:00
Jonathan G Rennison
a419674157 Add coverage button to waypoint window 2023-05-25 22:35:05 +01:00
Jonathan G Rennison
df5ca1d7fb Highlight waypoint tiles when adjacent or distant joining 2023-05-25 22:34:54 +01:00
Jonathan G Rennison
65159f4b22 Refactor viewport catchment overlay change handling 2023-05-25 20:28:31 +01:00
Jonathan G Rennison
23ab1cb3d0 Show ctrl-click function of shared orders button in tooltip 2023-05-25 20:02:29 +01:00
Jonathan G Rennison
9f24895480 Fix case of Ctrl+Click in English tooltip texts 2023-05-25 19:53:35 +01:00
Jonathan G Rennison
0fd62de4f2 Re-organise interface settings in settings window
Fix enable_single_veh_shared_order_gui not being listed
2023-05-25 19:36:34 +01:00
Jonathan G Rennison
f053082478 Viewport map: Use transport colour for road bridge/tunnels and aqueducts
In route mode
2023-05-25 18:06:59 +01:00
Jonathan G Rennison
b5ee8e9e42 Add unset hotkey to toggle showing slopes in viewport map mode
See: #522
2023-05-24 20:29:27 +01:00
Jonathan G Rennison
d29cec53e0 Viewport map: Show bridges and tunnels in rail type colour in routes mode
See: #522
2023-05-24 20:29:27 +01:00
Jonathan G Rennison
9cb992ab14 Viewport map: Adjust vertical alignment of tunnels 2023-05-24 20:29:27 +01:00
Jonathan G Rennison
5428b6dd9b GS: Documentation/comment fixes for ScriptAsyncMode 2023-05-23 22:49:48 +01:00
Jonathan G Rennison
cd9930542d GS: Add GSAsyncMode(bool) class to set async mode of script DoCommands
In asynchronous mode, don't wait for result of executed command,
just fire-and-forget, and return estimated cost/result
2023-05-23 22:21:19 +01:00
Jonathan G Rennison
df6c35a48a Documentation: Add contents listing to script additions document 2023-05-23 22:21:19 +01:00
Jonathan G Rennison
72dcdfafbd Add setting for server sent commands per frame limit
Use higher of this and existing commands per frame limit setting
for server-originating commands, e.g. GS
2023-05-23 22:21:19 +01:00
Jonathan G Rennison
a25e674f06 Add "command" debug category to log commands 2023-05-23 21:35:07 +01:00
Jonathan G Rennison
8bb23e07ba Merge PR #520 into jgrpp 2023-05-22 20:06:55 +01:00
Jonathan G Rennison
e8748c310c Merge PR #519 into jgrpp 2023-05-22 20:05:20 +01:00
Jonathan G Rennison
a99418cb69 Revert "Codechange: Explicitly move a few variables to avoid a copy constructor (fixes warning from clang)"
This reverts commit 6378a78817.

Fixes: #521
2023-05-22 20:02:17 +01:00
translators
e9b376d484 Update: Translations from eints
catalan: 14 changes by J0anJosep
portuguese: 20 changes by azulcosta
portuguese (brazilian): 15 changes by ericandradex

(cherry picked from commit 27b40da06a)
2023-05-22 20:02:06 +01:00
Jonathan G Rennison
37b8b59c85 Merge branch 'master' into jgrpp
# Conflicts:
#	src/date_type.h
#	src/linkgraph/linkgraphjob.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/saveload/saveload.h
#	src/table/settings/linkgraph_settings.ini
2023-05-22 19:50:45 +01:00
Jonathan G Rennison
9a4512f789 Remove linkgraph duration not day length scaled setting
Now always enabled
2023-05-22 19:38:52 +01:00
Jonathan G Rennison
5dd99fb046 Add setting for milliseconds per game tick mode 2023-05-22 18:40:46 +01:00
Jonathan G Rennison
5e8266ac7d Fix value of payment algorithm setting when loading new vanilla saves 2023-05-22 17:46:40 +01:00
Jonathan G Rennison
8ba1010fb4 Merge branch 'master' into jgrpp 2023-05-22 17:38:03 +01:00
TELK
6ec28479ea Update: Korean translation for 0.53.3 2023-05-22 22:07:00 +09:00
pvillaverde
49da6b2070 🌐 Update Galician Translations up to 0.53.3 2023-05-22 13:29:16 +02:00
Jonathan G Rennison
2677c60f11 Don't show different version warning in save window when no file selected 2023-05-21 12:26:55 +01:00
Jonathan G Rennison
3cbd1a5a76 Add conditional order test for whether slot is empty/not empty 2023-05-21 12:03:22 +01:00