From 9f61ade4d169bc3f363165f7fe97ed1345bb2091 Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 30 Nov 2015 04:00:18 +0000 Subject: [PATCH 1/4] Merge Localisation/master into OpenRCT2/develop. --- data/language/dutch.txt | 3 ++- data/language/english_us.txt | 5 +++-- data/language/german.txt | 7 ++++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/data/language/dutch.txt b/data/language/dutch.txt index 27cc379f91..f2410ff207 100644 --- a/data/language/dutch.txt +++ b/data/language/dutch.txt @@ -3893,7 +3893,7 @@ STR_5557 :Verbinding behouden na desynchronisatie (multiplayer) STR_5558 :Om deze instelling van kracht te laten worden is een herstart vereist. STR_5559 :Elke 10 min. inspect. STR_5560 :{SMALLFONT}{BLACK}Stelt het inspectieinterval van alle attracties in op 'Elke 10 minuten'. -STR_5561 :Kon taalbestand niet laden +STR_5561 :Kon taal niet laden STR_5562 :WAARSCHUWING: STR_5563 :Deze functie is momenteel niet helemaal stabiel, wees voorzichtig. STR_5564 :Ongeldig element invoegen @@ -3912,6 +3912,7 @@ STR_5576 :Poort: STR_5577 :Zuid-Koreaanse won (W) STR_5578 :Russische roebel (R) STR_5579 :Vergrotingsfactor: +STR_5580 :Tsjechische kroon (Kc) ############# # Scenarios # diff --git a/data/language/english_us.txt b/data/language/english_us.txt index 4fda09c04a..5e25bea092 100644 --- a/data/language/english_us.txt +++ b/data/language/english_us.txt @@ -2294,7 +2294,7 @@ STR_2286 :Designing STR_2287 :Completing design STR_2288 :Unknown STR_2289 :{STRINGID} {STRINGID} -STR_2290 :{SMALLFONT}{BLACK}{STRINGID} {STRINGID} +STR_2290 : STR_2291 :Select scenario for new game STR_2292 :{WINDOW_COLOUR_2}Rides been on: STR_2293 :{BLACK} Nothing @@ -3901,7 +3901,7 @@ STR_5557 :Stay connected after desynchronization (Multiplayer) STR_5558 :A restart is required for this setting to take effect STR_5559 :10 min. inspections STR_5560 :{SMALLFONT}{BLACK}Sets the inspection time to 'Every 10 minutes' on all rides -STR_5561 :Failed to load language file +STR_5561 :Failed to load language STR_5562 :WARNING! STR_5563 :This feature is currently unstable, take extra caution. STR_5564 :Insert Corrupt Element @@ -3920,6 +3920,7 @@ STR_5576 :Port: STR_5577 :South Korean Won (W) STR_5578 :Russian Ruble (R) STR_5579 :Window scale factor: +STR_5580 :Czech koruna (Kc) ######### # Rides # diff --git a/data/language/german.txt b/data/language/german.txt index afa61bc290..0a20a28754 100644 --- a/data/language/german.txt +++ b/data/language/german.txt @@ -2291,7 +2291,7 @@ STR_2286 :Design STR_2287 :Abschluss des Designs STR_2288 :Unbekannt STR_2289 :{STRINGID} {STRINGID} -STR_2290 :{SMALLFONT}{BLACK}{STRINGID} {STRINGID} +STR_2290 : STR_2291 :Szenario für neues Spiel auswählen STR_2292 :{WINDOW_COLOUR_2}Fahrten auf: STR_2293 :{BLACK} Nichts @@ -3894,7 +3894,7 @@ STR_5557 :Nach Desync. verbunden bleiben (Mehrspieler) STR_5558 :Damit diese Einstellung wirksam wird, ist ein Neustart erforderlich STR_5559 :10 Min. Inspektionen STR_5560 :{SMALLFONT}{BLACK}Setzt die Inspektionszeit aller Bahnen{NEWLINE}auf 'Alle 10 Minuten' -STR_5561 :Sprachdatei konnte nicht geladen werden +STR_5561 :Sprache konnte nicht geladen werden STR_5562 :WARNUNG! STR_5563 :Diese Funktion ist derzeit instabil und mit erhöhter Vorsicht zu verwenden. STR_5564 :Fehlerhaftes Element einf. @@ -3912,7 +3912,8 @@ STR_5575 :Max. Spieler: STR_5576 :Port: STR_5577 :Südkoreanischer Won (W) STR_5578 :Russischer Rubel (R) -STR_5579 :Fensterskalierungsfaktor: +STR_5579 :Skalierungsfaktor: +STR_5580 :Tschechische Krone (Kc) ####################### # Bahnen/Attraktionen # From df37433d52dfbb8bd0ef0f35c5e15a418cfad208 Mon Sep 17 00:00:00 2001 From: e-foley Date: Sun, 29 Nov 2015 21:35:51 -0800 Subject: [PATCH 2/4] mention additional changes to original game --- distribution/changelog.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 3e0d7cd52c..e43f4166f2 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -40,6 +40,7 @@ - Feature: Option to ignore invalid checksums on loaded parks. - Feature: Option to scale game display for better compatibility with high DPI screens. - Alteration: Autosave is now measured in real-time rather than in-game date. +- Alteration: On-ride photos are now factored into the calculations of a ride's income and profit per hour. - Technical: DirectDraw, DirectInput, DirectPlay and DirectSound dependencies are no longer used. - Removed: Six Flags branding and limitations. - Removed: Infogrames disclaimer. @@ -55,6 +56,10 @@ - Fix: TD4 River Rapids will now have the correct seat colour (original bug). - Fix: Message sound will no longer play in the editor modes (original bug). - Fix: Scenarios created with the Scenario Editor will now have the correct initial temperature for their climate (original bug). +- Fix: Financial information can no longer be accessed from the rides/attractions menu in parks that don't use money (original bug). +- Fix: Launched freefalls in downward launch mode no longer use launch speed setting to determine ratings (original bug). +- Fix: The path tool and tracked-ride construction tool no longer interfere with one another in certain situations (original bug). +- Fix: Building a flat ride partially out of park boundaries will no longer trigger a spurious "too high for supports" message (original bug). 0.0.2-beta (2015-06-21) ------------------------------------------------------------------------ From 88b245e099ea75ce21ba495ed119385adaef13d4 Mon Sep 17 00:00:00 2001 From: e-foley Date: Mon, 30 Nov 2015 00:38:40 -0800 Subject: [PATCH 3/4] add note on staff uniform colors --- distribution/changelog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e43f4166f2..d8cf21e142 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -60,6 +60,7 @@ - Fix: Launched freefalls in downward launch mode no longer use launch speed setting to determine ratings (original bug). - Fix: The path tool and tracked-ride construction tool no longer interfere with one another in certain situations (original bug). - Fix: Building a flat ride partially out of park boundaries will no longer trigger a spurious "too high for supports" message (original bug). +- Fix: Parks created in the Scenario Editor now select the standard staff uniform colors by default (original bug). 0.0.2-beta (2015-06-21) ------------------------------------------------------------------------ From 115a924e5ab2b0c63ac8627707b61957fb5d24e2 Mon Sep 17 00:00:00 2001 From: e-foley Date: Mon, 30 Nov 2015 07:42:29 -0800 Subject: [PATCH 4/4] misc proposed log changes --- distribution/changelog.txt | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index d8cf21e142..1c935a1d3f 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -21,7 +21,6 @@ - Feature: Console commands for fixing 'Name already in use' and banner count errors. - Feature: Scenario and object descriptions are now translatable. - Feature: UI stays responsive in pause mode. -- Feature: Hacked rides no longer have their reliability set to 0. - Feature: Marketing campaign can now be run for up to 12 weeks. - Feature: Day/night cycle. - Feature: Added ability to save (over last file) as opposed to save as. @@ -40,7 +39,7 @@ - Feature: Option to ignore invalid checksums on loaded parks. - Feature: Option to scale game display for better compatibility with high DPI screens. - Alteration: Autosave is now measured in real-time rather than in-game date. -- Alteration: On-ride photos are now factored into the calculations of a ride's income and profit per hour. +- Alteration: Hacked rides no longer have their reliability set to 0. - Technical: DirectDraw, DirectInput, DirectPlay and DirectSound dependencies are no longer used. - Removed: Six Flags branding and limitations. - Removed: Infogrames disclaimer. @@ -48,19 +47,19 @@ - Fix: Grouping vehicles by track type no longer interferes with research. - Fix: Fix corrupt map elements when loading a game. - Fix: Fix corrupt peep counter when loading a game. +- Fix: Parks created in the Scenario Editor now select the standard staff uniform colours by default. - Fix: Launched TD4 rides will now always use the RCT1 launch mode (that doesn't pass the station) (original bug). - Fix: Guests will no longer ignore no entry signs if the tile contains more than one fence (original bug). - Fix: Right-clicking a piece of launched lift will no longer crash the game (original bug). -- Fix: Underflow in Heartline Twister ratings (original bug). -- Fix: Map window now display the usable map size, not the technical one (original bug). +- Fix: Fix bugs in calculation of Heartline Twister and Launched Freefall ratings (original bugs). +- Fix: Map window now displays the usable map size, not the technical one (original bug). - Fix: TD4 River Rapids will now have the correct seat colour (original bug). - Fix: Message sound will no longer play in the editor modes (original bug). - Fix: Scenarios created with the Scenario Editor will now have the correct initial temperature for their climate (original bug). - Fix: Financial information can no longer be accessed from the rides/attractions menu in parks that don't use money (original bug). -- Fix: Launched freefalls in downward launch mode no longer use launch speed setting to determine ratings (original bug). - Fix: The path tool and tracked-ride construction tool no longer interfere with one another in certain situations (original bug). -- Fix: Building a flat ride partially out of park boundaries will no longer trigger a spurious "too high for supports" message (original bug). -- Fix: Parks created in the Scenario Editor now select the standard staff uniform colors by default (original bug). +- Fix: Building a flat ride partially out of park boundaries will no longer trigger a misleading "too high for supports" message (original bug). +- Fix: On-ride photos are now factored into the calculations of a ride's income and profit per hour (original bug). 0.0.2-beta (2015-06-21) ------------------------------------------------------------------------