[Scummvm-git-logs] scummvm master -> bc623697f702ff7796dc05bbaf582570f866a513

[dreammaster]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
95cf7654aa README: Add TITANIC DE saved game notes
0c1aaf8f1d README: Add TITANIC function key controls
bc623697f7 Merge pull request #1108 from dafioram/TITANIC_readmeAdditions


Commit: 95cf7654aaaf669771a9aa53a07fc01f40917221
    https://github.com/scummvm/scummvm/commit/95cf7654aaaf669771a9aa53a07fc01f40917221
Author: David Fioramonti (dafioram at gmail.com)
Date: 2018-01-06T06:42:59-08:00

Commit Message:
README: Add TITANIC DE saved game notes

Changed paths:
    README


diff --git a/README b/README
index 09cad02..e10ab9e 100644
--- a/README
+++ b/README
@@ -1947,7 +1947,9 @@ versions.
     - Rename the saved game to 'simon2.xxx'
 
   Starship Titanic
-    - Rename the saved game to 'titanic-win.xxx'
+    - Rename the saved game to 'titanic-win.xxx' for saves from the English 
+      version and 'titanic-win-de.xxx' for saves from the German version
+    - Saved games between different languages are not interchangeable
 
   The Feeble Files
     - Rename the saved game to 'feeble.xxx'


Commit: 0c1aaf8f1dee82eed834e2932013637827733dfb
    https://github.com/scummvm/scummvm/commit/0c1aaf8f1dee82eed834e2932013637827733dfb
Author: David Fioramonti (dafioram at gmail.com)
Date: 2018-01-06T06:43:03-08:00

Commit Message:
README: Add TITANIC function key controls

Changed paths:
    README


diff --git a/README b/README
index e10ab9e..03415a4 100644
--- a/README
+++ b/README
@@ -964,6 +964,15 @@ Mouse Wheel: Scroll through items (inventory, etc) and conversation log
 Arrow Keys: Movement. Down arrow/back is only available if the
     given view explicitly has a backwards movement available.
 
+Function Keys:
+F1: Switch to Chat-O-Mat
+F2: Switch to Personal Baggage
+F3: Switch to Remote Thingummy
+F4: Switch to Designer Room Numbers (chevron list)
+F5: GMM save menu
+F6: Switch to Real Life
+F7: GMM restore menu
+
 Controls for the Starfield Puzzle at the end of the game:
 Tab: Toggle between starmap and skyscape
 Mouse Click: skyscape star selection and


Commit: bc623697f702ff7796dc05bbaf582570f866a513
    https://github.com/scummvm/scummvm/commit/bc623697f702ff7796dc05bbaf582570f866a513
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-01-13T10:50:05-05:00

Commit Message:
Merge pull request #1108 from dafioram/TITANIC_readmeAdditions

TITANIC: Readme additions

Changed paths:
    README