Commit Graph

58287 Commits

Author SHA1 Message Date
Jonathan G Rennison
c76a7f4349 Allow GetBitMaskSC to be used with mask size equal to type size 2024-06-19 01:17:07 +01:00
Jonathan G Rennison
0129b2c9d3 Use set bit iterator for drawing for viewport map vehicle dots
Change vehicle pixel cache vector value type
2024-06-18 23:07:58 +01:00
Jonathan G Rennison
fc6a7a12cf Fix signal blocks containing no-entry signals not being promoted to PBS 2024-06-18 18:45:00 +01:00
Jonathan G Rennison
320e402cfe Test: Use template tests for multiple value types in ring buffer tests
Test non-trivially copyable and move-only types
2024-06-18 18:17:31 +01:00
Jonathan G Rennison
7b4429dfed Ring buffer: Add input iterator pair constructor 2024-06-18 18:15:46 +01:00
Jonathan G Rennison
9fbdfaffa2 Ring buffer: Use memcpy when reallocating trivially copyable types 2024-06-18 18:01:25 +01:00
Jonathan G Rennison
09a70f6216 Adjust road waypoint check in CmdInsertOrderIntl 2024-06-18 17:28:35 +01:00
Jonathan G Rennison
a64a3541fd Debug: Show vehicle progress in vehicle debug info 2024-06-18 17:28:18 +01:00
Jonathan G Rennison
b416a41f8b Fix minor spelling errors 2024-06-17 17:55:45 +01:00
Jonathan G Rennison
ffbc5aff6d Fix various formatting and spelling issues 2024-06-13 21:47:36 +01:00
Jonathan G Rennison
de36e9545e Merge branch 'master' into jgrpp
# Conflicts:
#	src/cargopacket.h
#	src/cargotype.h
#	src/station_base.h
#	src/station_cmd.cpp
#	src/timer/timer_game_common.h
#	src/town.h
2024-06-13 20:44:49 +01:00
Peter Nelson
4b169426dc Fix #12764: Crash when opening Detailed performance rating window with no companies. (#12765)
(cherry picked from commit df1b6a933bc0208e4b62d6ee44359a15fa2354fe)
2024-06-13 20:10:14 +01:00
Jonathan G Rennison
fff46974fd Scheduled dispatch: Allow naming departure slot tags 2024-06-13 19:32:42 +01:00
Jonathan G Rennison
fe294403aa Add std::string_view variant of SetDParamStr 2024-06-13 19:28:22 +01:00
Jonathan G Rennison
ef91ed1dfb Scheduled dispatch: Fix string names for departure tag 2024-06-13 18:32:01 +01:00
Jonathan G Rennison
6a03992a03 Scheduled dispatch: Add dividers to management dropdowns 2024-06-13 18:11:38 +01:00
Jonathan G Rennison
c8ce89ff89 Fix stack alignment issues with 32 bit MinGW
Set incoming and preferred alignment to 4 bytes to match Win32 standard

See: #704
2024-06-12 13:23:30 +01:00
Jonathan G Rennison
c67f14dc88 Merge branch 'master' into jgrpp
# Conflicts:
#	src/fileio.cpp
#	src/fileio_func.h
#	src/industry_cmd.cpp
#	src/ini.cpp
#	src/openttd.cpp
#	src/os/windows/win32_main.cpp
#	src/settingsgen/settingsgen.cpp
#	src/strgen/strgen.cpp
#	src/strings.cpp
2024-06-10 22:38:23 +01:00
Jonathan G Rennison
79fe829e98 Allow road vehicle overtaking in road waypoint tiles 2024-06-10 20:44:54 +01:00
Jonathan G Rennison
102ba8932e Remove use of non-threadsafe strerror
Add helper class to use strerror_r or strerror_s
2024-06-10 20:16:08 +01:00
Jonathan G Rennison
81ba704477 Fix e53998ec0: Incorrect handling of changed path separators in strgen 2024-06-10 20:16:08 +01:00
Qwest8K
162015433e Update: Russian translation to ''af102d1'' commit (#703)
Update: Russian translation to ''af102d1''
2024-06-09 12:03:25 +01:00
Jonathan G Rennison
e53998ec01 Merge branch 'master' into jgrpp
# Conflicts:
#	src/cheat_gui.cpp
#	src/industry_gui.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/misc/getoptdata.h
#	src/music/dmusic.cpp
#	src/network/core/os_abstraction.cpp
#	src/newgrf_engine.cpp
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/os/windows/win32.cpp
#	src/pathfinder/npf/queue.cpp
#	src/smallmap_gui.cpp
#	src/strgen/strgen.cpp
2024-06-08 22:57:36 +01:00
Jonathan G Rennison
af102d123b Add button to toggle train purchase window dual pane mode 2024-06-06 00:29:19 +01:00
Jonathan G Rennison
8a134d0f94 Fix narrowing cast warning 2024-06-06 00:02:04 +01:00
Jonathan G Rennison
827146de00 Dirty settings window when using mode toggle in signal window 2024-06-05 23:53:53 +01:00
Jeremy Gao
bca37ef9e7 Change: correct punctuations in zh_CN 2024-06-05 23:41:29 +01:00
Jonathan G Rennison
fa9db4ed6d Debug: Fix missing newlines in multi-line vehicle flags 2024-06-05 21:14:17 +01:00
Jonathan G Rennison
f9b75ed304 Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/scripts/FindVersion.cmake
#	src/airport_gui.cpp
#	src/industry_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_class_func.h
#	src/newgrf_object.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/object_gui.cpp
#	src/rail_gui.cpp
#	src/road_cmd.h
#	src/road_gui.cpp
#	src/station_cmd.h
#	src/strings.cpp
#	src/waypoint_cmd.h
2024-06-05 21:13:55 +01:00
Jonathan G Rennison
2aefeec225 Fix infrastructure totals when removing canals in ForceClearWaterTile 2024-06-05 19:44:04 +01:00
Jonathan G Rennison
226c3d5d17 Apply limit train acceleration setting before acceleration scaling
See: #699
2024-06-05 19:04:49 +01:00
Jonathan G Rennison
c3829f5088 Show scheduled dispatch tag in order window 2024-06-05 18:38:54 +01:00
Jonathan G Rennison
9aca7ed2b4 Fix logging of game load times in crash and desync logs 2024-06-02 16:30:00 +01:00
Jonathan G Rennison
05915b2129 Fix handling of reservations when reserving at one way tunnel-bridge exit 2024-06-01 19:40:37 +01:00
Alistair Lynn
7ef8706ed2 Add: Setting to uniformly slow the acceleration and braking of realistic trains
This does not affect the maximum speed.
2024-05-31 23:46:59 +01:00
Jonathan G Rennison
0351734729 Fix narrowing warning using packet GetDeserialisationPosition 2024-05-31 23:19:55 +01:00
Jonathan G Rennison
7997430688 Add various missing includes 2024-05-31 23:09:19 +01:00
Jonathan G Rennison
f09f412c43 Add hash table index to EngineOverrideManager
Use for EngineOverrideManager::GetID lookups
2024-05-31 22:57:16 +01:00
Jonathan G Rennison
556722399a Move EngineOverrideManager to separate header 2024-05-31 22:57:16 +01:00
Jonathan G Rennison
b42d12deb2 Add do/while wrappers around grfmsg/GrfMsg 2024-05-31 22:57:16 +01:00
Jonathan G Rennison
32b8ec34ff Merge branch 'master' into jgrpp
# Conflicts:
#	src/autoreplace_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cheat_gui.cpp
#	src/company_gui.cpp
#	src/debug.cpp
#	src/engine_gui.h
#	src/error_gui.cpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/misc_gui.cpp
#	src/network/network_gui.cpp
#	src/newgrf.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_gui.cpp
#	src/order_gui.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/saveload/saveload.cpp
#	src/screenshot_gui.cpp
#	src/sound/win32_s.cpp
#	src/statusbar_gui.cpp
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/viewport.cpp
2024-05-31 22:57:16 +01:00
Jonathan G Rennison
c6c7191b16 Avoid unnecessary allocation of temporaries in layout line cache 2024-05-30 19:14:01 +01:00
Jonathan G Rennison
99e6b75337 Move NewGRF sprite dump declarations to new header file 2024-05-30 19:05:32 +01:00
Jonathan G Rennison
dc6ba9b9d8 Move NewGRF shadow copy groups into internal header 2024-05-30 18:56:30 +01:00
Jonathan G Rennison
56356bb761 Change container type for several uses of std::map/std::set 2024-05-30 18:16:13 +01:00
Jonathan G Rennison
853ed272be Merge branch 'master' into jgrpp
# Conflicts:
#	src/airport_gui.cpp
#	src/blitter/32bpp_optimized.cpp
#	src/blitter/32bpp_simple.cpp
#	src/blitter/32bpp_sse2.cpp
#	src/blitter/8bpp_optimized.cpp
#	src/blitter/8bpp_simple.cpp
#	src/blitter/null.cpp
#	src/build_vehicle_gui.cpp
#	src/company_gui.cpp
#	src/crashlog.cpp
#	src/dropdown.cpp
#	src/dropdown_type.h
#	src/genworld_gui.cpp
#	src/gfx.cpp
#	src/main_gui.cpp
#	src/newgrf_debug_gui.cpp
#	src/news_gui.cpp
#	src/news_type.h
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/signs.cpp
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/spriteloader/grf.cpp
#	src/texteff.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/opengl.cpp
#	src/viewport.cpp
#	src/waypoint_cmd.cpp
#	src/zoom_type.h
2024-05-30 17:54:01 +01:00
Jonathan G Rennison
cb1e41fc88 Remove use of memcmp in CheckCaches 2024-05-29 18:30:54 +01:00
Jonathan G Rennison
2b539a2d37 Fix water infrastructure total when changing owner of object on water 2024-05-28 20:33:35 +01:00
Jonathan G Rennison
1e9fb74451 Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/release-windows.yml
#	src/autoreplace_gui.cpp
#	src/cargotype.cpp
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/dropdown.cpp
#	src/dropdown_func.h
#	src/dropdown_type.h
#	src/game/game_gui.cpp
#	src/genworld.cpp
#	src/genworld_gui.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/house.h
#	src/industry_gui.cpp
#	src/network/network_client.cpp
#	src/network/network_server.cpp
#	src/network/network_type.h
#	src/newgrf_class_func.h
#	src/newgrf_house.cpp
#	src/newgrf_roadstop.h
#	src/openttd.cpp
#	src/order_gui.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/screenshot_gui.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/slider.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/stdafx.h
#	src/survey.cpp
#	src/tile_map.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/vehicle_gui_base.h
2024-05-28 20:33:35 +01:00
Jonathan G Rennison
cbea3b8b46 Add console command to merge two companies 2024-05-28 20:33:35 +01:00