Commit Graph

56255 Commits (b80e2dff19322658676a1d7bb5fe2d75f76bf5dc)
 

Author SHA1 Message Date
Jonathan G Rennison cd2a368d77 Fix #11307: Incorrect GroupStatistics after selling leading wagon
When this results in a countable consist
1 year ago
Jonathan G Rennison f5d1b1d8f8 Change window close/deallocation to match upstream 1 year ago
Jonathan G Rennison 79cfc3e8bd Merge branch 'master' into jgrpp 1 year ago
translators 30eba33f1e Update: Translations from eints
english (us): 20 changes by 2TallTyler
1 year ago
Jonathan G Rennison a18f3274b4 Rename close window functions to match upstream 1 year ago
Jonathan G Rennison ed1b842ad3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console.cpp
#	src/console_func.h
#	src/network/network_server.cpp
#	src/os/unix/unix.cpp
#	src/spritecache.cpp
#	src/viewport.cpp
1 year ago
frosch c6f5b57f13
Fix #11297, 4e9a871: SCC_GENDER_LIST tried to determine the gender from the wrong sub-string. (#11299) 1 year ago
Patric Stout 39ef4b503f
Fix: also apply cargo filters on shared groups in vehicle listing (#11294) 1 year ago
translators 8d90448153 Update: Translations from eints
romanian: 18 changes by bnegrut
turkish: 22 changes by densxd
dutch: 20 changes by Afoklala
portuguese: 21 changes by azulcosta
1 year ago
Jonathan G Rennison 42170e6c2b Codechange: Rename RoadType parameter of MakeRoadDepot
See: #9642
1 year ago
frosch a3f661cb66
Fix: compilation failed on gcc 10.2 due to missing include. (#11300)
'_exit' is defined in 'unistd.h'.
1 year ago
translators ba51a34b4c Update: Translations from eints
english (au): 20 changes by krysclarke
korean: 25 changes by telk5093
russian: 20 changes by Ln-Wolf
finnish: 20 changes by hpiirai
french: 20 changes by glx22
portuguese (brazilian): 20 changes by pasantoro
1 year ago
Patric Stout 37e2f99c09
Change: store crash logs in JSON format (#11232) 1 year ago
Loïc Guilloux cb5a132b0c Fix: marked text was not updated during text deletion (#11293)
(cherry picked from commit b4ff06b6ef)
1 year ago
Loïc Guilloux 4c4fe8cf64 Fix: IConsoleWindow:GetTextBoundingRect() is incorrect (#11292)
(cherry picked from commit 220f93f552)
1 year ago
Peter Nelson a0353af223 Codechange: Shuffle Depot members to reduce padding. 1 year ago
Peter Nelson 2fdc22e7ea Codechange: Shuffle CargoPayment members to reduce padding. 1 year ago
PeterN a3c70ee6fb
Codechange: Pass by reference and use emplace-at-end for CargoSummary. (#11296) 1 year ago
PeterN 289d6ebc43
Doc: Replace plain URLs to OpenGFX/SFX/MSX with Markdown links. (#11295) 1 year ago
Loïc Guilloux b4ff06b6ef
Fix: marked text was not updated during text deletion (#11293) 1 year ago
translators fca62c245f Update: Translations from eints 1 year ago
Loïc Guilloux 220f93f552
Fix: IConsoleWindow:GetTextBoundingRect() is incorrect (#11292) 1 year ago
Daniel Robinson 71c2878799
Fix #10600: 'Replace Vehicles' didn't show numbers >999 (#10680) 1 year ago
Patric Stout 9c49a61249
Fix: base cargo payment on load/unload tile, instead of station sign location (#11281) 1 year ago
Patric Stout ba67f39db6
Codechange: vendor the nlohmann-json library (#11290) 1 year ago
Niels Martin Hansen 41de0d46f3 Feature: Help and manuals access window 1 year ago
Niels Martin Hansen 2cff43251e Add: Install additional documentation files with the game
Also include it in Emscripten packages
1 year ago
Niels Martin Hansen 4765d0f8c2 Change: Text Layouter support querying all lines for character at pixel 1 year ago
Patric Stout d1a0ca67be
Codechange: simplify splitting of CargoPacket (#11286) 1 year ago
Jonathan G Rennison 6be4708131 cpp-btreee: Fix alloc/dealloc size mismatch (struct padding)
Between new_leaf_node and delete_leaf_node
This is mostly harmless, but triggers AddressSanitizer

When alignof(value_type) is less than alignof(base_fields)
and kNodeValues * sizeof(value_type) is not an integral multiple
of alignof(base_fields), such that leaf_fields has padding
1 year ago
Jonathan G Rennison c8817d7f4e Merge branch 'master' into jgrpp
# Conflicts:
#	os/macosx/notarize.sh
#	src/3rdparty/CMakeLists.txt
#	src/3rdparty/squirrel/squirrel/sqcompiler.cpp
#	src/3rdparty/squirrel/squirrel/sqdebug.cpp
#	src/3rdparty/squirrel/squirrel/sqvm.cpp
#	src/console_cmds.cpp
#	src/core/span_type.hpp
#	src/crashlog.cpp
#	src/currency.h
#	src/date_gui.cpp
#	src/driver.cpp
#	src/fios.cpp
#	src/genworld_gui.cpp
#	src/hotkeys.cpp
#	src/misc_gui.cpp
#	src/music/os2_m.cpp
#	src/network/core/os_abstraction.h
#	src/network/network_server.cpp
#	src/newgrf.cpp
#	src/newgrf_config.h
#	src/newgrf_text.cpp
#	src/openttd.cpp
#	src/os/macosx/font_osx.cpp
#	src/os/macosx/misc_osx.cpp
#	src/os/os2/CMakeLists.txt
#	src/os/os2/os2.cpp
#	src/os/unix/CMakeLists.txt
#	src/os/windows/font_win32.cpp
#	src/os/windows/win32_main.cpp
#	src/saveload/saveload.cpp
#	src/script/api/script_text.cpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/stdafx.h
#	src/strings.cpp
#	src/timetable_gui.cpp
#	src/town_gui.cpp
#	src/train_cmd.cpp
#	src/video/dedicated_v.cpp
#	src/video/video_driver.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/waypoint_gui.cpp
#	src/widgets/dropdown_type.h
#	src/window.cpp
#	src/window_gui.h
1 year ago
translators a16aa3ef7d Update: Translations from eints
swedish: 1 change by joeax910
1 year ago
Jonathan G Rennison 3e3e083770 Merge branch 'master' into jgrpp
Hostile takeover feature

# Conflicts:
#	src/company_base.h
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/economy.cpp
#	src/script/api/script_event_types.cpp
1 year ago
Jonathan G Rennison 1b61dfabe3 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_gui.cpp
#	src/core/math_func.hpp
#	src/highscore.cpp
#	src/tests/math_func.cpp
1 year ago
Jonathan G Rennison 627eb1effc Fix multiplayer desync when adding a track piece of a different railtype
Undoing a CMD_CONVERT_RAIL did not undo changes to the
infrastructure totals
Defer CMD_CONVERT_RAIL until all checks have succeeded instead

In the case where:
* The addition would have resulted in the tile changing railtype
* The addition fails because of slope restrictions, a train is present,
  or auto-removing signals fails
* The command test did not fail (e.g. because the train has moved)
1 year ago
Jonathan G Rennison 56ecbb5574 Add missing flags in build/remove rail command comments 1 year ago
Patric Stout b389d45d55
Doc: Add more hyperlinks within the included documentation (#11288)
Co-authored-by: Niels Martin Hansen <nielsm@indvikleren.dk>
1 year ago
translators 3fd50c2949 Update: Translations from eints
swedish: 2 changes by optiedev
vietnamese: 11 changes by KhoiCanDev
romanian: 5 changes by bnegrut
danish: 2 changes by bscargo
dutch: 2 changes by Afoklala
portuguese: 2 changes by azulcosta
polish: 15 changes by pAter-exe
1 year ago
PeterN acd7d3c913
Codechange: Rename *Railtype* to *RailType* for consistency. (#11287) 1 year ago
PeterN a0b2f28f9c
Codechange: Use std::copy/fill pattern to initialize rail and road specs. (#11285)
This avoids use of lengthof and array indices.
1 year ago
Patric Stout 7e3cdbaf62 Fix: mark next_station as INVALID_STATION when loading from older savegames 1 year ago
Patric Stout 9e3763cfb3 Fix b0e73277: save/load next_station for CargoPacket again 1 year ago
Patric Stout 1243c331b6 Fix: don't compare next_station when trying to merge CargoPackets
For vehicle packets they shouldn't be compared, and for station
packets they are already in a bucket per next_station.
1 year ago
Patric Stout 9f8c1ea552 Codechange: rename next_station to next_hop to avoid confusing with another next_station 1 year ago
Patric Stout a0f6983be4 Codechange: remove parameter from VehicleCargoList::Reassign that is always INVALID_STATION 1 year ago
PeterN 89b84222d3 Fix: NewGRF house class mappings were not reset between games. (#11279)
(cherry picked from commit 6643c010bd)
1 year ago
Michael Lutz 1637f6f6b0 Feature: [NewGRF] Related Act2 objects for airports and airport tiles.
Airports are similar two stations and industries, both of which have the town as related object.
Airport tiles are similar to industry tiles, which have the industry as related object.
This seems a sensible structure, so let's make it Airport Tile -> Airport -> Town.

(cherry picked from commit 1c620b349f)
1 year ago
Michael Lutz 5cc623cb3c Add: [NewGRF] Inspection window for airports.
As as the station window combines all station types, accessing the
debug view is via the parent of the airport tile only.

(cherry picked from commit a6f2f3c042)
1 year ago
PeterN 6643c010bd
Fix: NewGRF house class mappings were not reset between games. (#11279) 1 year ago
Michael Lutz 1c620b349f Feature: [NewGRF] Related Act2 objects for airports and airport tiles.
Airports are similar two stations and industries, both of which have the town as related object.
Airport tiles are similar to industry tiles, which have the industry as related object.
This seems a sensible structure, so let's make it Airport Tile -> Airport -> Town.
1 year ago