Commit Graph

55900 Commits (a18f3274b4c63d59c78a0ba57980962e2c94ce6c)
 

Author SHA1 Message Date
Jonathan G Rennison a18f3274b4 Rename close window functions to match upstream 9 months 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
9 months ago
Loïc Guilloux cb5a132b0c Fix: marked text was not updated during text deletion (#11293)
(cherry picked from commit b4ff06b6ef)
9 months ago
Loïc Guilloux 4c4fe8cf64 Fix: IConsoleWindow:GetTextBoundingRect() is incorrect (#11292)
(cherry picked from commit 220f93f552)
9 months 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
9 months 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
9 months 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
9 months 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
9 months 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)
9 months ago
Jonathan G Rennison 56ecbb5574 Add missing flags in build/remove rail command comments 9 months ago
PeterN 89b84222d3 Fix: NewGRF house class mappings were not reset between games. (#11279)
(cherry picked from commit 6643c010bd)
9 months 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)
9 months 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)
9 months ago
Jonathan G Rennison f6eadf19c6 Replace vehicle tile hash
Use robin hood hash of TileIndex
Retain linked list of vehicles on the same tile
9 months ago
Jonathan G Rennison b09894db4f Show total cargo packets in dump_cpdp_stats console command output 9 months ago
Jonathan G Rennison c6ce9ce687 Add road vehicle flags for whether any part is on level crossing 9 months ago
Jonathan G Rennison 18a40df10e Adjust types in EnumCheckRoadVehClose 9 months ago
Peter Nelson 7cc1ed9594 Codechange: Allow using more than 65536 NewGRF string IDs.
NewGRF string allocation allowed up to 524288 strings, however stringid was passed as uint16_t which limits to 2^16.

(cherry picked from commit e4613fc04c)
9 months ago
Peter Nelson 2178ff1e80 Change: Replace fixed length _grf_text array with vector.
Additionally reshuffle GRFTextEntry for better alignment.

This removes a mostly-unused static 20MB allocation.

(cherry picked from commit 3e762af2d1)
9 months ago
Jonathan G Rennison 85b20068a8 Merge PR #595 into jgrpp 9 months ago
Jonathan G Rennison 6f75465800 Fix 2f692a79: Dest ptr not advanced for BM_BLACK_REMAP in 32bpp optimised blitter 9 months ago
pvillaverde f4ad08200e 🌐 Update Galician Translations up to 0.55.1 9 months ago
Jonathan G Rennison d0fb85a5db Version: Committing version data for tag: jgrpp-0.55.1 9 months ago
Jonathan G Rennison a48a3ac07b Fix 87911bdf: Fix FindLastBit for unsigned long long (uint64 on Windows)
See: #594
9 months ago
Jonathan G Rennison 20ece8025e Test: Add tests for FindLastBit function 9 months ago
Jonathan G Rennison 94cffc0aea Fix autorenew ship purchase cost not being applied for multi-cargo ships 9 months ago
Jonathan G Rennison 891874a145 TBTR: Remove unused variable 9 months ago
Jonathan G Rennison 8481fb4b7b Fix compiler warnings on Windows ARM64 9 months ago
Jonathan G Rennison 44d4d4944c Version: Committing version data for tag: jgrpp-0.55.0 9 months ago
Jonathan G Rennison f51d51de40 Fix compiler warning in BuildReplacementMultiPartShip 9 months ago
Jonathan G Rennison 0e6decbdfb Fix compiler warning on Windows ARM64 9 months ago
Jonathan G Rennison 3856891467 Strgen: Fix compiler warning in LangString constructor 9 months ago
Jonathan G Rennison 597382e989 Build: Fix MacOS compilation 9 months ago
Jonathan G Rennison ed0ee16bf9 Build: Fix MinGW compilation 9 months ago
Jonathan G Rennison be13d8d970 Update low level changes document 9 months ago
Jonathan G Rennison 80fa53bc58 Allow unpausing upstream savegames using PM_COMMAND_DURING_PAUSE 9 months ago
Jonathan G Rennison 428e1c364e Enable picker tool for rail signals 9 months ago
Jonathan G Rennison bd378a2842 Reorder struct CargoPacket
Reduce size from 40 bytes to 32 bytes.
See: https://github.com/OpenTTD/OpenTTD/pull/11201
9 months ago
Jonathan G Rennison fabe507b08 Fix 2ae4e5bd: Wrong upstream save/load version for RV path cache 9 months ago
Jonathan G Rennison c0598d34bf Merge branch 'master' into jgrpp
# Conflicts:
#	src/console.cpp
#	src/os/os2/os2.cpp
#	src/os/unix/font_unix.cpp
#	src/strgen/strgen.h
#	src/strgen/strgen_base.cpp
#	src/table/settings/gui_settings.ini
9 months ago
Michael Lutz fb6d85dbe5 Add: [Script] Custom news message text for industry SetProductionLevel.
(cherry picked from commit 0089323542)
9 months ago
Michael Lutz 4c6ed36b6a Add: [Script] Game script control of industry production level.
(cherry picked from commit 1c56991213)
9 months ago
Andy 7839a71d7e Add: [Script] GSIndustry.GetConstructionDate() method (#11145)
(cherry picked from commit ce9305a5ee)
9 months ago
mrmbernardi 74c0678015 Feature: [GS] Goal destination can be updated (#10817)
(cherry picked from commit 35ef6c1723)
9 months ago
Patric Stout 6550f3a049 Fix 3effb893: mention GSAsyncMode in changelog (#10924)
(cherry picked from commit 6b1c38e303)
9 months ago
TELK e7010972b7 Update: Korean translation 9 months ago
frosch 6e96482230 Fix #11230: Group list widget layout failed, if dropdown widgets were higher than the font height. (#11231)
(cherry picked from commit 236ec41fa2)
9 months ago
Jonathan G Rennison 7c28ee0213 Autoreplace: Add support for multi-cargo ships 9 months ago
Jonathan G Rennison 69b2ca9983 Fix da35e7bb: Wrong engine ID in Vehicle::NeedsServicing() 9 months ago
Jonathan G Rennison da35e7bb35 Autoreplace: Handle trivial replacements of mixed cargo articulated engines 9 months ago