Commit Graph

55414 Commits

Author SHA1 Message Date
PeterN
702194cfef Change: Cargo flow legend only shows defined cargo. (#10872)
This removes the large mostly-empty grid of cargo buttons when not using a complex industry set.
2023-05-29 06:48:43 +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
translators
c9c6721a47 Update: Translations from eints
esperanto: 44 changes by legoscia
2023-05-28 18:42:42 +00: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
Peter Nelson
bae1897826 Change: Include font style in font name for Freetype. 2023-05-27 20:40:25 +01:00
Peter Nelson
9976293c1e Codechange: Return fontcache font name as std::string. 2023-05-27 20:40:25 +01:00
translators
90fdf17e39 Update: Translations from eints
esperanto: 28 changes by legoscia
2023-05-27 18:40:39 +00:00
Loïc Guilloux
c880157518 Fix: Check max member count in squirrel classes (#10883)
Manual cherry-pick from 23a0620658
2023-05-27 16:09:21 +00: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
PeterN
8ea9c1a133 Fix #10880: Crash in object window due to incorrect parameter order. (#10881) 2023-05-26 21:29:52 +00: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
PeterN
876871157f Fix: Ask FontConfig for the face index when opening fonts. (#10878)
This allows selection of the correct face in truetype fonts containing
multiple faces.
2023-05-26 18:56:13 +00: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
PeterN
101e4e54a1 Fix d9a04ba446: Ensure MD5Hash is initialized. (#10876)
Not all instances need to be initialized as often they are copied or
written to, but doing all ensures no surprises.

Move the ^= operator to MD5Hash while we're at it.
2023-05-26 18:17:54 +00:00
Jonathan G Rennison
ba11467c02 Fix: Rail waypoint selection window not closed
When rail toolbar or rail waypoint build windows closed
2023-05-26 08:41:13 +02: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
PeterN
584faaf064 Change: Reorganise industry accept/produce arrays. (#10853)
Use a array of struct for each cargo instead of an array for each statistic.
This makes iterating for acceptance and production much simpler.
pct_transported is now calculated when needed.
2023-05-25 21:25:46 +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
Loïc Guilloux
db3b086a52 Fix #10867, 8b93e45: Squirrel compile error exception type changed (#10869) 2023-05-25 12:46:27 +02:00
Rubidium
b133328737 Codechange: use std::string over strecat to create the RV capacity string 2023-05-25 05:43:00 +02:00
Rubidium
4fdde00e25 Codechange: use std::string to create the GRF parameter list 2023-05-25 05:43:00 +02:00
Rubidium
fbab94eabb Codechange: use std::string to create error message about external files 2023-05-25 05:43:00 +02:00
Rubidium
30b9e02dd9 Codechange: replace crashlog filenames with std::string in Crashlog 2023-05-25 05:42:10 +02:00
Rubidium
19304bd3d5 Codechange: replace seprintf with fmt::format for filling the crash log data 2023-05-25 05:42:10 +02:00
Rubidium
f4b0ac2bd4 Codechange: use std::string for formatting settings 2023-05-24 22:42:01 +02: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
translators
1412ea48ed Update: Translations from eints
esperanto: 268 changes by legoscia
2023-05-24 18:40:52 +00:00
Peter Nelson
09408e8e46 Codechange: Add IsCargoAccepted/Produced() helpers. 2023-05-24 17:34:11 +01:00
Peter Nelson
633f19419d Codechange: Make more use of GetCargoAccepted/ProducedIndex(). 2023-05-24 17:34:11 +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
Rubidium
29b20718ba Codechange: use Tthis instead of StrongTypedef, so ==/= does not compare/assign different strong typedefs 2023-05-23 20:46:32 +02:00
translators
9f0e406a51 Update: Translations from eints
esperanto: 18 changes by legoscia
2023-05-23 18:41:14 +00:00
Peter Nelson
8931e90302 Cleanup: No need to cound actual cargo to get scroll count. 2023-05-23 19:07:36 +01:00