dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
57,611 Commits 1 Branch 0 Tags
5098c77c380bf2fd1da87aa906c4a334e589ca5c
Commit Graph

57611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jonathan G Rennison
cd2a368d77 Fix #11307: Incorrect GroupStatistics after selling leading wagon 
When this results in a countable consist
 2023-09-17 17:40:32 +01:00
Peter Nelson
14bcfff6f5 Codechange: Rename INVALID_CARGO to INVALID_CARGO_BITNUM 
... to avoid future ambiguity.
 2023-09-17 16:56:07 +01:00
Peter Nelson
9d1b131c44 Codechange: Use correct constant for invalid cargo type. 2023-09-17 16:56:07 +01:00
Rubidium
7ef22af2bb Codechange: introduce and use function to raise and dirty a set of widgets when they are lowered 2023-09-17 16:03:01 +02:00
Jonathan G Rennison
f5d1b1d8f8 Change window close/deallocation to match upstream 2023-09-17 13:10:21 +01:00
Jonathan G Rennison
79cfc3e8bd Merge branch 'master' into jgrpp 2023-09-17 13:09:48 +01:00
PeterN
6580ff1adb Fix #11230: Widget layout also failed for group-less vehicle list window. (#11310) 2023-09-17 10:03:24 +00:00
Rubidium
4cf88e068a Remove: unused include of cstdarg/stdarg.h 2023-09-16 23:09:53 +02:00
Rubidium
8ab0936491 Codechange: use parameter pack/folding instead of va_arg macros for widget states 2023-09-16 23:09:53 +02:00
translators
30eba33f1e Update: Translations from eints 
english (us): 20 changes by 2TallTyler
 2023-09-16 18:37:38 +00:00
Jonathan G Rennison
a18f3274b4 Rename close window functions to match upstream 2023-09-15 21:17:25 +01:00
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
 2023-09-15 20:44:22 +01:00
frosch
c6f5b57f13 Fix #11297, 4e9a871: SCC_GENDER_LIST tried to determine the gender from the wrong sub-string. (#11299) 2023-09-15 15:25:25 -04:00
Patric Stout
39ef4b503f Fix: also apply cargo filters on shared groups in vehicle listing (#11294) 2023-09-15 21:22:58 +02:00
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
 2023-09-15 18:37:57 +00:00
Jonathan G Rennison
42170e6c2b Codechange: Rename RoadType parameter of MakeRoadDepot 
See: #9642
 2023-09-15 18:21:12 +02:00
frosch
a3f661cb66 Fix: compilation failed on gcc 10.2 due to missing include. (#11300) 
'_exit' is defined in 'unistd.h'.
 2023-09-15 09:26:03 +01:00
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
 2023-09-14 18:37:08 +00:00
Patric Stout
37e2f99c09 Change: store crash logs in JSON format (#11232) 2023-09-14 20:13:27 +02:00
Loïc Guilloux
cb5a132b0c Fix: marked text was not updated during text deletion (#11293) 
(cherry picked from commit b4ff06b6ef)
 2023-09-14 18:35:40 +01:00
Loïc Guilloux
4c4fe8cf64 Fix: IConsoleWindow:GetTextBoundingRect() is incorrect (#11292) 
(cherry picked from commit 220f93f552)
 2023-09-14 18:35:20 +01:00
Peter Nelson
a0353af223 Codechange: Shuffle Depot members to reduce padding. 2023-09-14 09:50:58 +01:00
Peter Nelson
2fdc22e7ea Codechange: Shuffle CargoPayment members to reduce padding. 2023-09-14 09:50:58 +01:00
PeterN
a3c70ee6fb Codechange: Pass by reference and use emplace-at-end for CargoSummary. (#11296) 2023-09-14 08:41:33 +00:00
PeterN
289d6ebc43 Doc: Replace plain URLs to OpenGFX/SFX/MSX with Markdown links. (#11295) 2023-09-14 00:17:08 +01:00
Loïc Guilloux
b4ff06b6ef Fix: marked text was not updated during text deletion (#11293) 2023-09-13 20:59:34 +00:00
translators
fca62c245f Update: Translations from eints 2023-09-13 18:38:58 +00:00
Loïc Guilloux
220f93f552 Fix: IConsoleWindow:GetTextBoundingRect() is incorrect (#11292) 2023-09-13 16:07:55 +00:00
Daniel Robinson
71c2878799 Fix #10600: 'Replace Vehicles' didn't show numbers >999 (#10680) 2023-09-13 15:19:44 +00:00
Patric Stout
9c49a61249 Fix: base cargo payment on load/unload tile, instead of station sign location (#11281) 2023-09-13 14:41:09 +00:00
Patric Stout
ba67f39db6 Codechange: vendor the nlohmann-json library (#11290) 2023-09-13 16:11:34 +02:00
Niels Martin Hansen
41de0d46f3 Feature: Help and manuals access window 2023-09-13 16:11:08 +02:00
Niels Martin Hansen
2cff43251e Add: Install additional documentation files with the game 
Also include it in Emscripten packages
 2023-09-13 16:11:08 +02:00
Niels Martin Hansen
4765d0f8c2 Change: Text Layouter support querying all lines for character at pixel 2023-09-13 16:11:08 +02:00
Patric Stout
d1a0ca67be Codechange: simplify splitting of CargoPacket (#11286) 2023-09-13 09:40:01 -04:00
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
 2023-09-12 23:25:14 +01:00
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
 2023-09-12 20:06:47 +01:00
translators
a16aa3ef7d Update: Translations from eints 
swedish: 1 change by joeax910
 2023-09-12 18:38:00 +00:00
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
 2023-09-12 19:04:03 +01:00
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
 2023-09-12 18:25:49 +01:00
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)
 2023-09-11 23:40:34 +01:00
Jonathan G Rennison
56ecbb5574 Add missing flags in build/remove rail command comments 2023-09-11 23:09:27 +01:00
Patric Stout
b389d45d55 Doc: Add more hyperlinks within the included documentation (#11288) 
Co-authored-by: Niels Martin Hansen <nielsm@indvikleren.dk>
 2023-09-11 18:55:23 +00:00
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
 2023-09-11 18:38:29 +00:00
PeterN
acd7d3c913 Codechange: Rename *Railtype* to *RailType* for consistency. (#11287) 2023-09-11 08:55:12 +00:00
PeterN
a0b2f28f9c Codechange: Use std::copy/fill pattern to initialize rail and road specs. (#11285) 
This avoids use of lengthof and array indices.
 2023-09-10 23:01:08 +00:00
Patric Stout
7e3cdbaf62 Fix: mark next_station as INVALID_STATION when loading from older savegames 2023-09-11 00:25:47 +02:00
Patric Stout
9e3763cfb3 Fix b0e73277: save/load next_station for CargoPacket again 2023-09-11 00:25:47 +02:00
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.
 2023-09-11 00:25:47 +02:00
Patric Stout
9f8c1ea552 Codechange: rename next_station to next_hop to avoid confusing with another next_station 2023-09-11 00:25:47 +02:00