Commit Graph

54089 Commits (5b490b243dace3323bd27e5ef2d1c6207e6a1f44)
 

Author SHA1 Message Date
Jonathan G Rennison 5b490b243d Merge branch 'master' into jgrpp
# Conflicts:
#	src/industry_cmd.cpp
#	src/landscape.cpp
#	src/object_cmd.cpp
#	src/rail_cmd.cpp
#	src/script/api/script_tile.cpp
#	src/table/settings/difficulty_settings.ini
#	src/table/settings/world_settings.ini
#	src/terraform_cmd.cpp
#	src/tilearea_type.h
#	src/tree_cmd.cpp
#	src/tree_cmd.h
#	src/tree_gui.cpp
#	src/water_cmd.cpp
1 year ago
Jonathan G Rennison 6b9f387a68 Fix UpdateAllBlockSignals with signalled tunnel/bridges and no infra sharing
See: #473
1 year ago
Tyler Trahan 07fba75238
Fix: Various Wide River issues (#10348) 2 years ago
Tyler Trahan 2206c73156
Feature: Set a custom number of industries in map generation window (#10340) 2 years ago
Tyler Trahan 5c64cdcb79
Feature: Press Ctrl to build a diagonal area of trees (#10342) 2 years ago
Rubidium b951332def Codechange: use smart pointers when creating StringIterators 2 years ago
Rubidium b35c791d05 Codechange: use smart pointers when cloning iterators 2 years ago
Rubidium f667a831a5 Codechange: unify creation of diagonal/orthogonal iterator using smart pointers 2 years ago
PeterN 6a0d1c7c19
Fix: Link variants to parents when finalising engines. (#10346)
This ensures that definition-order of engines within the NewGRF does not matter.
2 years ago
Jonathan G Rennison 3e33be7b10 Fix day length changes with scheduled dispatch and timetable start times
When time is in minutes

See: #472
2 years ago
Jonathan G Rennison 23dbd6b166 Fix wrong date/tick conversion for manual set timetable start command 2 years ago
Jonathan G Rennison adf2210bc8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/genworld_gui.cpp
#	src/lang/afrikaans.txt
#	src/lang/arabic_egypt.txt
#	src/lang/basque.txt
#	src/lang/belarusian.txt
#	src/lang/brazilian_portuguese.txt
#	src/lang/bulgarian.txt
#	src/lang/catalan.txt
#	src/lang/croatian.txt
#	src/lang/czech.txt
#	src/lang/danish.txt
#	src/lang/dutch.txt
#	src/lang/english.txt
#	src/lang/english_AU.txt
#	src/lang/english_US.txt
#	src/lang/esperanto.txt
#	src/lang/estonian.txt
#	src/lang/faroese.txt
#	src/lang/finnish.txt
#	src/lang/french.txt
#	src/lang/frisian.txt
#	src/lang/gaelic.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/lang/greek.txt
#	src/lang/hebrew.txt
#	src/lang/hungarian.txt
#	src/lang/icelandic.txt
#	src/lang/indonesian.txt
#	src/lang/irish.txt
#	src/lang/italian.txt
#	src/lang/japanese.txt
#	src/lang/korean.txt
#	src/lang/latin.txt
#	src/lang/latvian.txt
#	src/lang/lithuanian.txt
#	src/lang/luxembourgish.txt
#	src/lang/malay.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/norwegian_nynorsk.txt
#	src/lang/persian.txt
#	src/lang/polish.txt
#	src/lang/portuguese.txt
#	src/lang/romanian.txt
#	src/lang/russian.txt
#	src/lang/serbian.txt
#	src/lang/simplified_chinese.txt
#	src/lang/slovak.txt
#	src/lang/slovenian.txt
#	src/lang/spanish.txt
#	src/lang/spanish_MX.txt
#	src/lang/swedish.txt
#	src/lang/tamil.txt
#	src/lang/thai.txt
#	src/lang/traditional_chinese.txt
#	src/lang/turkish.txt
#	src/lang/ukrainian.txt
#	src/lang/vietnamese.txt
#	src/lang/welsh.txt
#	src/saveload/afterload.cpp
2 years ago
Tyler Trahan dced2d8c30
Fix #10333, c53f29d: Only show industry prospecting errors to local company (#10338) 2 years ago
translators b05c21203a Update: Translations from eints
arabic (egypt): 20 changes by AviationGamerX
2 years ago
Tyler Trahan 5a2907a99f
Change: Remove land generator setting from World Generation GUI (#10093) 2 years ago
translators 80322b85c2 Update: Translations from eints
swedish: 7 changes by joeax910
japanese: 17 changes by scabtert
luxembourgish: 14 changes by phreeze83
lithuanian: 80 changes by devastatorius
2 years ago
PeterN 09a32f2ce1
Fix #10335: Set initial scrollbar count for object GUI. (#10336)
This previously happened when the window was resized by itself which was fixed by #10196. Explicitly set the count instead.
2 years ago
translators 70157b2ad5 Update: Translations from eints
luxembourgish: 3 changes by phreeze83
hebrew: 125 changes by haimlm
2 years ago
translators 9d13213c61 Update: Translations from eints
spanish (mexican): 3 changes by absay
2 years ago
translators 81c5c16477 Update: Translations from eints
galician: 1 change by NicoSGF64
romanian: 8 changes by ALEX11BR
2 years ago
PeterN c18a171028
Fix #10331: Starting new company during load must happen after AI start. (#10332)
This situation occurs when loading a savegame in single-player which only
has AI companies.
2 years ago
translators 7460fdb298 Update: Translations from eints
chinese (simplified): 7 changes by HansKaffee
turkish: 13 changes by rustoocas
2 years ago
blschachte 6b68de1f3e
Doc: Fix typo in COMPILING.md (#10329) 2 years ago
Rubidium 46dfb309bc Fix #10309: [SDL] Uninitialized width and height when turning off full screen 2 years ago
Jonathan G Rennison d3e1c2695e Fix freight weight multiplier not being applied in train build window 2 years ago
Jonathan G Rennison 9cff3666ae Fix artic engines with no capacity on leading part in build window
Engines were being shown as not having any capacity overall
2 years ago
Jonathan G Rennison e816c2416a Debug: Show more road vehicle engine fields in debug window 2 years ago
Jonathan G Rennison 62d524eaef Merge branch 'master' into jgrpp
# Conflicts:
#	src/saveload/station_sl.cpp
#	src/saveload/town_sl.cpp
#	src/spritecache.cpp
#	src/timetable_gui.cpp
2 years ago
translators 29af0f8c7b Update: Translations from eints
swedish: 18 changes by joeax910
chinese (simplified): 2 changes by HansKaffee
romanian: 3 changes by ALEX11BR
slovak: 15 changes by legitalk
tamil: 21 changes by Aswn
2 years ago
Rubidium 0251786f46 Fix: virtual call from constructor
That fills an instance variable that is only read from the Game Options window
and that is overwritten when the video driver is started. Since you cannot get
into the Game Options window without starting the video driver, it is just
pointless and wrong code that would never be noticed by the end user.
2 years ago
Rubidium c1ff471c77 Fix: bad oddness checks
Modulo on a signed number returns negative values for negative values, so
i % 2 == 1 will only return true for positive odd numbers, whereas i % 2 != 0
returns true for both positive and negative odd numbers.
2 years ago
Rubidium f7af9a299a Codechange: prevent suspicious pointer scaling 2 years ago
Rubidium 170f37d07f Codechange: silence some potentially uninitialized local variable errors
In these cases technically they are false positives, however dismissing the
alerts when the underlying code may make them true positives does not seem
like the safest solution.
2 years ago
Rubidium 496ec1f012 Fix: use reference and array indexing to prevent suspicious pointer scaling 2 years ago
Rubidium fbd0f5ad7d Fix: inconsistent allocation error handling
Mix-and-matching std::bad_alloc exception handling with nullptr checks
2 years ago
Rubidium 3c54344825 Fix: comparison of narrow type with wide type in loop condition
Technically this can't be triggered with the currently returned values though.
2 years ago
Charles Pigott e00996a18a
Change: Big UFO disaster targets current location of a random train (#10290) 2 years ago
PeterN 1b1aa682a6
Fix: Don't assume engclass 2 should be elrail. (#10315)
When disabling/enabling elrail, there is an assumption that `engclass` of 2
means the engine will run on elrail. While this holds for default engines,
NewGRFs can do other things.

To resolve this we store the intended railtype so that toggling elrail will
restore to the correct type.
2 years ago
Jonathan G Rennison 0310fb0cdc Merge branch 'master' into jgrpp
# Conflicts:
#	src/lang/czech.txt
#	src/lang/galician.txt
#	src/lang/german.txt
#	src/order_cmd.cpp
#	src/saveload/afterload.cpp
#	src/ship.h
#	src/vehicle.cpp
2 years ago
Loïc Guilloux 8f350c9ae6
Fix: [Actions] preview_build failure due to git upgrade (#10323) 2 years ago
Michael Lutz c98a5c37d3 Remove: SmallMatrix be gone.
(cherry picked from commit 6dd8a4d670f921ee685d1a6326d304da6e9fc245)
2 years ago
Jonathan G Rennison 8f123589ec Linkgraph: Use sparse storage format for edge annotations
Copy relevant parts of base edge into edge annotation
2 years ago
Rubidium 51049946d1 Fix: prevent corrupted GRF files to allocate stupid amounts of memory 2 years ago
translators 58068883f8 Update: Translations from eints
swedish: 33 changes by joeax910
arabic (egypt): 11 changes by AviationGamerX
luxembourgish: 3 changes by Gubius
greek: 85 changes by SStelioss
indonesian: 55 changes by indrabagus, 20 changes by K4smun1
serbian: 527 changes by nkrs
latvian: 82 changes by lexuslatvia
polish: 2 changes by pAter-exe
2 years ago
Jonathan G Rennison 55473bc730 Linkgraph: Split demand annotations from edge flow annotations
Use sparse storage format for demand annotations
2 years ago
Rubidium 752cd5c0da Cleanup 84b71f7: remove G5 detector as it's not referenced anymore
The last supported Mac OS X for G5 is 10.5.8 and support for < 10.7 has already been removed.
2 years ago
Rubidium 375a5b8e3f Codechange: refactor FindClosestDepot to not use pointers, but return a struct 2 years ago
Jonathan G Rennison 9bc5f69a19 Debug: Deduplicate child groups for randomised sprite groups in sprite dump 2 years ago
Jonathan G Rennison 4275c8e96b VarAction2: Ignore callback failure groups when finding callback results 2 years ago
translators b3907b1359 Update: Translations from eints
swedish: 39 changes by DonaldDuck313, 9 changes by joeax910
chinese (traditional): 62 changes by wpi3
greek: 8 changes by SStelioss
indonesian: 29 changes by indrabagus
serbian: 528 changes by nkrs
ukrainian: 82 changes by StepanIvasyn
turkish: 4 changes by jnmbk
french: 19 changes by glx22
2 years ago