Merge branch 'master' into jgrpp

2 years ago · 1e7ca9f71a
parent 496ec7f642 57fa8690df
commit 1e7ca9f71a
5 changed files with 22 additions and 57 deletions
--- a/.github/stale.yml
+++ b/.github/stale.yml
@ -1,34 +0,0 @@
-daysUntilClose: 7
-staleLabel: stale
-closeComment: false
-exemptMilestones: true
-exemptAssignees: true
-
-issues:
-  daysUntilStale: 60
-  exemptLabels:
-  - pinned
-  - security
-  - "good first issue"
-  - regression
-  markComment: >
-    This issue has been automatically marked as stale because it has not had any activity in the last two months.
-
-    If you believe the issue is still relevant, please test on the latest nightly and report back.
-
-    It will be closed if no further activity occurs within 7 days.
-
-    Thank you for your contributions.
-
-pulls:
-  daysUntilStale: 30
-  exemptLabels:
-  - pinned
-  markComment: >
-    This pull request has been automatically marked as stale because it has not had any activity in the last month.
-
-    Please feel free to give a status update now, ping for review, or re-open when it's ready.
-
-    It will be closed if no further activity occurs within 7 days.
-
-    Thank you for your contributions.
--- a/CREDITS.md
+++ b/CREDITS.md
@ -1,31 +1,31 @@
 ### The OpenTTD team (in alphabetical order):

- Grzegorz Duczyński (adf88) - General coding (since 1.7.2)
- Albert Hofkamp (Alberth) - GUI expert (since 0.7)
 - Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3)
- Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3)
 - Christoph Elsenhans (frosch) - General coding (since 0.6)
- Loïc Guilloux (glx) - Windows Expert (since 0.4.5)
+- Loïc Guilloux (glx) - General / Windows Expert (since 0.4.5)
 - Charles Pigott (LordAro) - General / Correctness police (since 1.9)
- Michael Lutz (michi_cc) - Path based signals (since 0.7)
+- Michael Lutz (michi_cc) - General / Path based signals (since 0.7)
 - Niels Martin Hansen (nielsm) - Music system, general coding (since 1.9)
 - Owen Rudge (orudge) - Forum host, OS/2 port (since 0.1)
 - Peter Nelson (peter1138) - Spiritual descendant from newGRF gods (since 0.4.5)
- Ingo von Borstel (planetmaker) - General coding, Support (since 1.1)
- Remko Bijker (Rubidium) - Lead coder and way more (since 0.4.5)
- José Soler (Terkhen) - General coding (since 1.0)
+- Remko Bijker (Rubidium) - Coder and way more (since 0.4.5)
+- Patric Stout (TrueBrain) - NoProgrammer (since 0.3), sys op

 ### Inactive Developers:

+- Grzegorz Duczyński (adf88) - General coding (1.7 - 1.8)
+- Albert Hofkamp (Alberth) - GUI expert (0.7 - 1.9)
 - Jean-François Claeys (Belugas) - GUI, newindustries and more (0.4.5 - 1.0)
 - Bjarni Corfitzen (Bjarni) - macOS port, coder and vehicles (0.3 - 0.7)
 - Victor Fischer (Celestar) - Programming everywhere you need him to (0.3 - 0.6)
+- Ulf Hermann (fonsinchen) - Cargo Distribution (1.3 - 1.6)
 - Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;) (0.4.5 - 0.6)
 - Jonathan Coome (Maedhros) - High priest of the NewGRF Temple (0.5 - 0.6)
- Attila Bán (MiHaMiX) - WebTranslator 1 and 2 (0.3 - 0.5)
+- Attila Bán (MiHaMiX) - Developer WebTranslator 1 and 2 (0.3 - 0.5)
+- Ingo von Borstel (planetmaker) - General coding, Support (1.1 - 1.9)
 - Zdeněk Sojka (SmatZ) - Bug finder and fixer (0.6 - 1.3)
+- José Soler (Terkhen) - General coding (1.0 - 1.4)
 - Christoph Mallon (Tron) - Programmer, code correctness police (0.3 - 0.5)
- Patric Stout (TrueBrain) - NoProgrammer (0.3 - 1.2), sys op (active)
 - Thijs Marinussen (Yexo) - AI Framework, General (0.6 - 1.3)
 - Leif Linse (Zuu) - AI/Game Script (1.2 - 1.6)

@ -33,11 +33,11 @@

 - Tamás Faragó (Darkvater) - Ex-Lead coder (0.3 - 0.5)
 - Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3 - 0.3)
- Emil Djupfeld (egladil) - macOS port (0.4 - 0.6)
+- Emil Djupfeld (egladil) - macOS port (0.4.5 - 0.6)
 - Simon Sasburg (HackyKid) - Bug fixer (0.4 - 0.4.5)
 - Ludvig Strigeus (ludde) - Original author of OpenTTD, main coder (0.1 - 0.3)
 - Cian Duffy (MYOB) - BeOS port / manual writing (0.1 - 0.3)
- Petr Baudiš (pasky) - Many patches, newgrf support, etc. (0.3 - 0.3)
+- Petr Baudiš (pasky) - Many patches, newgrf support (0.3 - 0.3)
 - Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker (0.6 - 0.7)
 - Serge Paquet (vurlix) - 2nd contributor after ludde (0.1 - 0.3)

@ -52,7 +52,7 @@
 - Alberto Demichelis - Squirrel scripting language
 - L. Peter Deutsch - MD5 implementation
 - Michael Blunck - For revolutionizing TTD with awesome graphics
- George - Canal graphics
+- George - Canal/Lock graphics
 - Andrew Parkhouse (andythenorth) - River graphics
 - David Dallaston (Pikka) - Tram tracks
 - All Translators - For their support to make OpenTTD a truly international game
--- a/src/lang/dutch.txt
+++ b/src/lang/dutch.txt
@ -2382,7 +2382,7 @@ STR_NETWORK_CLIENT_LIST_NEW_COMPANY                             :(Nieuw bedrijf)
 STR_NETWORK_CLIENT_LIST_NEW_COMPANY_TOOLTIP                     :{BLACK}Een nieuw bedrijf maken en meedoen
 STR_NETWORK_CLIENT_LIST_PLAYER_ICON_SELF_TOOLTIP                :{BLACK}Dit ben jij
 STR_NETWORK_CLIENT_LIST_PLAYER_ICON_HOST_TOOLTIP                :{BLACK}Dit is de host van het spel
-STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT                    :{BLACK}{NUM} klant{P "" en} / {NUM} bedrij{P f ven}
+STR_NETWORK_CLIENT_LIST_CLIENT_COMPANY_COUNT                    :{BLACK}{NUM} speler{P "" s} / {NUM} bedrij{P f ven}

 # Matches ConnectionType
 ###length 5
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@ -446,10 +446,7 @@ static const char * const _credits[] = {
 	u8"Original graphics by Simon Foster",
 	u8"",
 	u8"The OpenTTD team (in alphabetical order):",
-	u8"  Grzegorz Duczy\u0144ski (adf88) - General coding (since 1.7.2)",
-	u8"  Albert Hofkamp (Alberth) - GUI expert (since 0.7)",
 	u8"  Matthijs Kooijman (blathijs) - Pathfinder-guru, Debian port (since 0.3)",
-	u8"  Ulf Hermann (fonsinchen) - Cargo Distribution (since 1.3)",
 	u8"  Christoph Elsenhans (frosch) - General coding (since 0.6)",
 	u8"  Lo\u00efc Guilloux (glx) - General / Windows Expert (since 0.4.5)",
 	u8"  Charles Pigott (LordAro) - General / Correctness police (since 1.9)",
@ -457,20 +454,23 @@ static const char * const _credits[] = {
 	u8"  Niels Martin Hansen (nielsm) - Music system, general coding (since 1.9)",
 	u8"  Owen Rudge (orudge) - Forum host, OS/2 port (since 0.1)",
 	u8"  Peter Nelson (peter1138) - Spiritual descendant from NewGRF gods (since 0.4.5)",
-	u8"  Ingo von Borstel (planetmaker) - General, Support (since 1.1)",
-	u8"  Remko Bijker (Rubidium) - Lead coder and way more (since 0.4.5)",
-	u8"  Jos\u00e9 Soler (Terkhen) - General coding (since 1.0)",
+	u8"  Remko Bijker (Rubidium) - Coder and way more (since 0.4.5)",
+	u8"  Patric Stout (TrueBrain) - NoProgrammer (since 0.3), sys op",
 	u8"",
 	u8"Inactive Developers:",
+	u8"  Grzegorz Duczy\u0144ski (adf88) - General coding (1.7 - 1.8)",
+	u8"  Albert Hofkamp (Alberth) - GUI expert (0.7 - 1.9)",
 	u8"  Jean-Fran\u00e7ois Claeys (Belugas) - GUI, NewGRF and more (0.4.5 - 1.0)",
 	u8"  Bjarni Corfitzen (Bjarni) - MacOSX port, coder and vehicles (0.3 - 0.7)",
 	u8"  Victor Fischer (Celestar) - Programming everywhere you need him to (0.3 - 0.6)",
+	u8"  Ulf Hermann (fonsinchen) - Cargo Distribution (1.3 - 1.6)",
 	u8"  Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;) (0.4.5 - 0.6)",
 	u8"  Jonathan Coome (Maedhros) - High priest of the NewGRF Temple (0.5 - 0.6)",
 	u8"  Attila B\u00e1n (MiHaMiX) - Developer WebTranslator 1 and 2 (0.3 - 0.5)",
+	u8"  Ingo von Borstel (planetmaker) - General coding, Support (1.1 - 1.9)",
 	u8"  Zden\u011bk Sojka (SmatZ) - Bug finder and fixer (0.6 - 1.3)",
+	u8"  Jos\u00e9 Soler (Terkhen) - General coding (1.0 - 1.4)",
 	u8"  Christoph Mallon (Tron) - Programmer, code correctness police (0.3 - 0.5)",
-	u8"  Patric Stout (TrueBrain) - NoAI, NoGo, Network (0.3 - 1.2), sys op (active)",
 	u8"  Thijs Marinussen (Yexo) - AI Framework, General (0.6 - 1.3)",
 	u8"  Leif Linse (Zuu) - AI/Game Script (1.2 - 1.6)",
 	u8"",
@ -492,7 +492,6 @@ static const char * const _credits[] = {
 	u8"  Mike Ragsdale - OpenTTD installer",
 	u8"  Christian Rosentreter (tokai) - MorphOS / AmigaOS port",
 	u8"  Richard Kempton (richK) - additional airports, initial TGP implementation",
-	u8"",
 	u8"  Alberto Demichelis - Squirrel scripting language \u00a9 2003-2008",
 	u8"  L. Peter Deutsch - MD5 implementation \u00a9 1999, 2000, 2002",
 	u8"  Michael Blunck - Pre-signals and semaphores \u00a9 2003",
--- a/src/newgrf_station.cpp
+++ b/src/newgrf_station.cpp
@ -962,7 +962,7 @@ void TriggerStationAnimation(BaseStation *st, TileIndex trigger_tile, StationAni
 				} else {
 					cargo = ss->grf_prop.grffile->cargo_map[cargo_type];
 				}
-				StationAnimationBase::ChangeAnimationFrame(CBID_STATION_ANIM_START_STOP, ss, st, tile, (random_bits << 16) | Random(), (uint8)trigger | (cargo << 8));
+				StationAnimationBase::ChangeAnimationFrame(CBID_STATION_ANIM_START_STOP, ss, st, tile, (random_bits << 16) | GB(Random(), 0, 16), (uint8)trigger | (cargo << 8));
 			}
 		}
 	}