Commit Graph

56932 Commits

Author SHA1 Message Date
Jonathan G Rennison
36776248b9 Do not get one way states when building road stops on tram-only tiles 2024-01-09 08:48:26 +00:00
Jonathan G Rennison
a90cbd837e Do not try to display one way markings for tram-only road stops 2024-01-09 08:47:51 +00:00
Jonathan G Rennison
c488dae9c8 Fix strings for amount of rivers setting in settings window 2024-01-09 08:42:02 +00:00
Jonathan G Rennison
e0361791fd Used curved instead of square circular area for mapgen water desert removal 2024-01-09 08:35:07 +00:00
Jonathan G Rennison
69f7c3e63b Add function to iterate (curved) circular tile area 2024-01-09 08:35:06 +00:00
Jonathan G Rennison
16b840d86e Increase DateTicks to 64 bits, fix overflow after year 79455 2024-01-09 00:13:28 +00:00
Jonathan G Rennison
bd35b0c47c Debug: Log more info in GfxBlitter sprite dimension assert failures 2024-01-08 22:22:11 +00:00
Jonathan G Rennison
5e2ac22ef5 Assert: Add more assert macros for using a simple string as the extra text 2024-01-08 22:22:11 +00:00
Jonathan G Rennison
61db988a4a Fix time since pickup values in station rating tooltips with day length
See: #625
2024-01-07 20:16:26 +00:00
Rubidium
6fa02955cd Cleanup: remove typedefs for non _t (u)int types and WChar
(cherry picked from commit 461b4b8861)
2024-01-07 17:20:41 +00:00
Jonathan G Rennison
97e6f3062e Adding of _t to (u)int types, and WChar to char32_t
See: eaae0bb5e
2024-01-07 17:20:41 +00:00
Jonathan G Rennison
55d78a23be Merge branch 'master' into jgrpp
# Conflicts:
#	src/3rdparty/squirrel/include/squirrel.h
#	src/blitter/32bpp_sse_func.hpp
#	src/bridge_map.h
#	src/clear_map.h
#	src/company_manager_face.h
#	src/console_func.h
#	src/core/bitmath_func.hpp
#	src/core/endian_func.hpp
#	src/core/random_func.hpp
#	src/depot_map.h
#	src/elrail_func.h
#	src/fontcache.h
#	src/industry_map.h
#	src/map_func.h
#	src/newgrf_spritegroup.h
#	src/object_map.h
#	src/rail.h
#	src/rail_map.h
#	src/road_func.h
#	src/road_map.h
#	src/saveload/saveload.h
#	src/saveload/saveload_error.hpp
#	src/settings_gui.cpp
#	src/sl/oldloader.h
#	src/sprite.h
#	src/spritecache.h
#	src/station_func.h
#	src/station_map.h
#	src/story_base.h
#	src/strings_func.h
#	src/tile_cmd.h
#	src/tile_map.h
#	src/tile_type.h
#	src/town.h
#	src/town_map.h
#	src/tree_map.h
#	src/tunnel_map.h
#	src/tunnelbridge_map.h
#	src/vehicle_func.h
#	src/viewport_func.h
#	src/void_map.h
#	src/water.h
#	src/water_map.h
#	src/widget_type.h
2024-01-07 15:00:16 +00:00
Tyler Trahan
1e56bd1e5a Change: Reorganize Settings menu items (#11683) 2024-01-07 08:44:50 -05:00
Jonathan G Rennison
8271813a47 Timetable window: Use checked items for extra/leave early dropdown 2024-01-06 19:22:09 +00:00
Jonathan G Rennison
592c038e42 Add setting for whether to show rail polyline tool 2024-01-06 19:10:43 +00:00
translators
0a8c0d62ee Update: Translations from eints
chinese (simplified): 103 changes by WenSimEHRP
latvian: 2 changes by lexuslatvia
2024-01-06 18:39:19 +00:00
Jonathan G Rennison
f24388c0b2 Fix string gender scan with SCC_INDUSTRY_NAME 2024-01-06 17:57:44 +00:00
Jonathan G Rennison
dcd71f5ab8 Strings: Exit early when scanning for gender data 2024-01-06 17:54:42 +00:00
Jonathan G Rennison
1100e83192 Date/time: Ensure clock-face conversions correct for negative TickMinutes 2024-01-06 17:37:09 +00:00
Jonathan G Rennison
9718c51ef4 Survey: Add clang and zstd 2024-01-06 17:37:09 +00:00
Jonathan G Rennison
5294f1d7f7 Debug: Change output format of scope_dumper::VehicleInfo 2024-01-06 16:04:02 +00:00
Rubidium
3a676a5af0 Codechange: replace static inline with static for non-class functions 2024-01-06 13:37:33 +01:00
Jonathan G Rennison
107b73c2b8 Merge branch 'master' into jgrpp 2024-01-05 22:57:15 +00:00
Jonathan G Rennison
a33544ee17 Fix narrowing warnings on MSVC 2024-01-05 22:51:25 +00:00
Jonathan G Rennison
b23077b08c Survey: Update to match upstream 2024-01-05 22:35:20 +00:00
Jonathan G Rennison
0460b820f3 Use std::string for LanguageMetadata::file 2024-01-05 22:35:20 +00:00
Jonathan G Rennison
a573d065e1 Add missing IsDefaultValue to SettingDesc, from upstream 2024-01-05 22:35:20 +00:00
Jonathan G Rennison
0ab4b8ea31 Add helper functions to get last path segment 2024-01-05 22:35:20 +00:00
Jonathan G Rennison
7fdcbced09 Add missing include to string_func.h 2024-01-05 22:35:20 +00:00
Peter Nelson
06a5fa6239 Codechange: Use CompanyMask to pass Companies to PopupMainCompanyToolbMenu().
It's like the type was designed for it.
2024-01-05 22:26:07 +00:00
Peter Nelson
6828b6014a Codechange: Use company group statistics to test for vehicles for drop down list state.
This avoids iterating full the vehicle pool to find out if a company has any vehicles of a particular type.
2024-01-05 22:26:07 +00:00
Jonathan G Rennison
b598abed3d Merge branch 'master' into jgrpp
# Conflicts:
#	src/CMakeLists.txt
#	src/network/network_server.cpp
#	src/network/network_survey.cpp
#	src/vehiclelist.cpp
2024-01-05 22:11:28 +00:00
SamuXarick
847f3f660d Fix #10511: Delay 'go to nearest depot' orders (#11548)
Delay the nearest depot order search for a day if the vehicle can't find its destination, which happens when it has already attempted to do so and failed to find a valid destination.
2024-01-05 21:23:01 +00:00
Jonathan G Rennison
f034714559 Use StringBuilder for GetString/GetStringWithArgs, as per upstream
Update dependent code as required
2024-01-05 21:12:54 +00:00
Peter Nelson
7a5106042f Codechange: Use CompanyMask and company group statistics for auto clean tests. (#11693)
This function does not need to know how many vehicles there are, only that there is at least one.
2024-01-05 20:58:24 +00:00
Peter Nelson
34e8c8e1c1 Codechange: Build station and depot vehicle lists from shared order lists. (#11676)
The brings some performance advantages:

* No need to iterate all vehicles and check for primary vehicle as only vehicles that can have orders are listed.
* Shared orders only need to be tested once instead of for each vehicle sharing them.
* Vehicle tests only need to be performed on the first shared vehicle instead of all.
2024-01-05 18:59:38 +00:00
Patric Stout
7788b68bbe Fix: don't unneededly block on transmitting survey on exit (#11687) 2024-01-05 18:54:00 +00:00
Patric Stout
28e2576589 Fix: race-condition when quitting the game with libcurl (#11688)
There could be a callback in _new_http_callbacks that is not
processed yet. All callbacks in _http_callbacks were cancelled,
but not the ones in _new_http_callbacks
2024-01-05 18:48:21 +00:00
translators
8bc473766b Update: Translations from eints
english (au): 2 changes by krysclarke
chinese (simplified): 6 changes by WenSimEHRP
russian: 2 changes by Ln-Wolf
finnish: 2 changes by hpiirai
dutch: 6 changes by Afoklala
portuguese: 5 changes by azulcosta
portuguese (brazilian): 2 changes by ericandradex
polish: 4 changes by pAter-exe
2024-01-05 18:38:36 +00:00
Jonathan G Rennison
1b7a5372ec Debug: Provide UserError, FatalError fmt macros 2024-01-05 18:30:18 +00:00
glx22
7bfc766f94 Fix: [Script] document return type of member GSIndustry::GetProductionLevel 2024-01-05 19:17:08 +01:00
glx22
707e8001be Fix #11689: properly close DOXYGEN_API block 2024-01-05 19:17:08 +01:00
glx22
4c1ddb1479 Change: [Script] detection of not properly closed DOXYGEN_API blocks 2024-01-05 19:17:08 +01:00
Jonathan G Rennison
8832ab8e5d Add StringBuilder class from upstream 2024-01-05 14:45:55 +00:00
Jonathan G Rennison
7f6b1d6b94 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/script/api/script_depotlist.cpp
#	src/script/api/script_roadtypelist.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
2024-01-05 13:37:52 +00:00
Peter Nelson
623df6b94f Codechange: Get count of road vehicles by summing company group statistics data in small UFO handler. (#11690)
This avoids needing to iterate the complete vehicle pool. Company group statistics are maintained elsewhere already.

The vehicle pool is still iterated later to find the nth random road vehicle.
2024-01-05 13:13:55 +00:00
Peter Nelson
91ea8e3fa6 Codechange: Use locals for company/deity mode during script loops. (#11686) 2024-01-05 08:32:43 +00:00
Peter Nelson
06050f7bb3 Fix: Pass townnameparts as parameter when testing townname based companyname. (#11685)
Length of returned string could vary and pass/fail the length check with a different
string than the final selection.
2024-01-04 23:10:54 +00:00
Peter Nelson
7482f71692 Change: Don't handle 'missing' string parameters as 0. (#11673)
If not enough parameters are supplied for a string, then a value of 0 was used, which could result in incorrect information being displayed.

Instead, throw an exception and include an error in the string.
2024-01-04 20:50:58 +00:00
translators
c44faf4eea Update: Translations from eints
english (us): 2 changes by 2TallTyler
chinese (simplified): 39 changes by WenSimEHRP
polish: 29 changes by pAter-exe
2024-01-04 18:39:48 +00:00