Commit Graph

58327 Commits (28c115fc33be3a0075e21b54c2023860ba013994)
 

Author SHA1 Message Date
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
3 months ago
Peter Nelson 4b169426dc Fix #12764: Crash when opening Detailed performance rating window with no companies. (#12765)
(cherry picked from commit df1b6a933b)
3 months ago
Jonathan G Rennison fff46974fd Scheduled dispatch: Allow naming departure slot tags 3 months ago
Jonathan G Rennison fe294403aa Add std::string_view variant of SetDParamStr 3 months ago
Jonathan G Rennison ef91ed1dfb Scheduled dispatch: Fix string names for departure tag 3 months ago
Jonathan G Rennison 6a03992a03 Scheduled dispatch: Add dividers to management dropdowns 3 months ago
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
3 months ago
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
3 months ago
Jonathan G Rennison 79fe829e98 Allow road vehicle overtaking in road waypoint tiles 3 months ago
Jonathan G Rennison 102ba8932e Remove use of non-threadsafe strerror
Add helper class to use strerror_r or strerror_s
3 months ago
Jonathan G Rennison 81ba704477 Fix e53998ec0: Incorrect handling of changed path separators in strgen 3 months ago
Qwest8K 162015433e
Update: Russian translation to ''af102d1'' commit (#703)
Update: Russian translation to ''af102d1''
4 months ago
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
4 months ago
Jonathan G Rennison af102d123b Add button to toggle train purchase window dual pane mode 4 months ago
Jonathan G Rennison 8a134d0f94 Fix narrowing cast warning 4 months ago
Jonathan G Rennison 827146de00 Dirty settings window when using mode toggle in signal window 4 months ago
Jeremy Gao bca37ef9e7 Change: correct punctuations in zh_CN 4 months ago
Jonathan G Rennison fa9db4ed6d Debug: Fix missing newlines in multi-line vehicle flags 4 months ago
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
4 months ago
Jonathan G Rennison 2aefeec225 Fix infrastructure totals when removing canals in ForceClearWaterTile 4 months ago
Jonathan G Rennison 226c3d5d17 Apply limit train acceleration setting before acceleration scaling
See: #699
4 months ago
Jonathan G Rennison c3829f5088 Show scheduled dispatch tag in order window 4 months ago
Jonathan G Rennison 9aca7ed2b4 Fix logging of game load times in crash and desync logs 4 months ago
Jonathan G Rennison 05915b2129 Fix handling of reservations when reserving at one way tunnel-bridge exit 4 months ago
Alistair Lynn 7ef8706ed2 Add: Setting to uniformly slow the acceleration and braking of realistic trains
This does not affect the maximum speed.
4 months ago
Jonathan G Rennison 0351734729 Fix narrowing warning using packet GetDeserialisationPosition 4 months ago
Jonathan G Rennison 7997430688 Add various missing includes 4 months ago
Jonathan G Rennison f09f412c43 Add hash table index to EngineOverrideManager
Use for EngineOverrideManager::GetID lookups
4 months ago
Jonathan G Rennison 556722399a Move EngineOverrideManager to separate header 4 months ago
Jonathan G Rennison b42d12deb2 Add do/while wrappers around grfmsg/GrfMsg 4 months ago
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
4 months ago
Jonathan G Rennison c6c7191b16 Avoid unnecessary allocation of temporaries in layout line cache 4 months ago
Jonathan G Rennison 99e6b75337 Move NewGRF sprite dump declarations to new header file 4 months ago
Jonathan G Rennison dc6ba9b9d8 Move NewGRF shadow copy groups into internal header 4 months ago
Jonathan G Rennison 56356bb761 Change container type for several uses of std::map/std::set 4 months ago
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
4 months ago
Jonathan G Rennison cb1e41fc88 Remove use of memcmp in CheckCaches 4 months ago
Jonathan G Rennison 2b539a2d37 Fix water infrastructure total when changing owner of object on water 4 months ago
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
4 months ago
Jonathan G Rennison cbea3b8b46 Add console command to merge two companies 4 months ago
Jonathan G Rennison f2f8692fb2 Add setting to allow track editing to ignore realistic braking restrictions 4 months ago
Jonathan G Rennison 7874fb7a12 Add public key auth support for settings_access console command 4 months ago
Jonathan G Rennison 84a0dd326f Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/network/core/config.h
#	src/network/core/packet.h
#	src/network/core/tcp.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/tcp_game.h
#	src/network/network_client.cpp
#	src/network/network_client.h
#	src/network/network_gui.h
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/table/settings/network_secrets_settings.ini
4 months ago
Jonathan G Rennison effaf6acc4 Allow removing reservation boundary signal in realistic braking
All other operations were permitted so only disallowing removal
was not useful and could be trivially bypassed
4 months ago
Jonathan G Rennison 431a6a1262 Allow sorting by average order occupancy in shared order group mode
See: #698
4 months ago
Jonathan G Rennison d39bdd352b Merge PR #700 into jgrpp 4 months ago
pvillaverde dc465000f7 🌐 Update Galician Translations 2024-05-26 4 months ago
Jonathan G Rennison 1d70c781c6 Fix vehicle window showing profit last year in wallclock timekeeping mode 4 months ago
Qwest8K 6dfe5c4da9
Update: Russian translation (#695)
Russian localization update
4 months ago
Jonathan G Rennison a8d830aa3e Fix signal side when using both sides signal style with no-entry signals 4 months ago