Merge remote-tracking branch 'upstream/master' into zvision

Conflicts:
	engines/zvision/animation/rlf_animation.cpp
	engines/zvision/animation_control.h
	engines/zvision/core/console.cpp
	engines/zvision/core/events.cpp
	engines/zvision/cursors/cursor.cpp
	engines/zvision/cursors/cursor_manager.cpp
	engines/zvision/cursors/cursor_manager.h
	engines/zvision/fonts/truetype_font.cpp
	engines/zvision/graphics/render_manager.cpp
	engines/zvision/graphics/render_manager.h
	engines/zvision/inventory/inventory_manager.h
	engines/zvision/inventory_manager.h
	engines/zvision/meta_animation.h
	engines/zvision/module.mk
	engines/zvision/scripting/actions.cpp
	engines/zvision/scripting/control.h
	engines/zvision/scripting/controls/animation_control.cpp
	engines/zvision/scripting/controls/animation_control.h
	engines/zvision/scripting/controls/input_control.cpp
	engines/zvision/scripting/controls/lever_control.cpp
	engines/zvision/scripting/controls/timer_node.cpp
	engines/zvision/scripting/controls/timer_node.h
	engines/zvision/scripting/puzzle.h
	engines/zvision/scripting/scr_file_handling.cpp
	engines/zvision/scripting/script_manager.cpp
	engines/zvision/scripting/script_manager.h
	engines/zvision/sidefx.cpp
	engines/zvision/sound/zork_raw.cpp
	engines/zvision/sound/zork_raw.h
	engines/zvision/video/video.cpp
	engines/zvision/video/zork_avi_decoder.h
	engines/zvision/zvision.cpp
	engines/zvision/zvision.h

1 files changed, 67 insertions, 2 deletions

diff --git a/README b/README
index a6c3d9773a..a6070e4a34 100644
--- a/README
+++ b/README
@@ -33,7 +33,8 @@ Table of Contents:
  * 3.17 Winnie the Pooh notes
  * 3.18 Troll's Tale notes
  * 3.19 Dragon History notes
- * 3.20 Known Problems
+ * 3.20 Simultaneous speech and subtitles in Sierra SCI games
+ * 3.21 Known Problems
 4.0) Supported Platforms
 5.0) Running ScummVM
  * 5.1 Command Line Options
@@ -815,7 +816,55 @@ All game files and the walkthrough can be downloaded from
 http://www.ucw.cz/draci-historie/index-en.html
 
 
-3.20) Known Problems:
+3.20) Simultaneous speech and subtitles in Sierra SCI games:
+----- ------------------------------------------------------
+Certain CD versions of Sierra SCI games had both speech and text
+resources. Some have an option to toggle between the two, but there are
+some cases where there wasn't any option to enable both simultaneously.
+In ScummVM, it is possible to enjoy a combined mode, where both speech
+and text are shown at the same time. This mode can be toggled in the
+ScummVM audio options, but each game has different behavior in-game
+regarding speech and text toggling.
+
+The CD games where speech and subtitles can be shown simultaneously
+are:
+  EcoQuest 1 CD
+  Freddy Pharkas CD
+  King's Quest 6 CD
+  Laura Bow 2 CD
+  Leisure Suit Larry 6 CD
+  Space Quest 4 CD
+
+EcoQuest 1 CD:
+    Speech and text can be toggled via the game's "Mode" option in the
+    options dialog, or via ScummVM's audio options.
+
+Freddy Pharkas CD:
+    There is no in-game option to toggle speech and text. Only ScummVM's
+    audio options can be used to toggle this feature. Note that some
+    spoken dialog is missing from the game texts.
+
+King's Quest 6 CD:
+    Speech and text can be toggled via the "Mode" button in the options
+    dialog (with an extra "Dual" setting added in ScummVM), or via
+    ScummVM's audio options.
+
+Laura Bow 2 CD:
+    Speech and text can be toggled via the "Mode" button in the options
+    dialog (with an extra "Dual" setting added in ScummVM), or via
+    ScummVM's audio options.
+
+Leisure Suit Larry 6 CD:
+    Either speech only or speech and text can be selected. There is no
+    in-game option to toggle text only. Only ScummVM's audio options can
+    be used to enable the text only mode.
+
+Space Quest 4 CD:
+    Speech and text can be toggled via the "Display Mode" button in the
+    options dialog, or via ScummVM's audio options.
+
+
+3.21) Known Problems:
 ----- ---------------
 This release has the following known problems. There is no need to
 report them, although patches to fix them are welcome. If you discover a
@@ -2110,6 +2159,9 @@ Flight of the Amazon Queen adds the following non-standard keywords:
     music_mute         bool     If true, music is muted
     sfx_mute           bool     If true, sound effects are muted
 
+Hopkins FBI adds the following non-standard keyword:
+    enable_gore        bool     If true, enable some optional gore content in the game
+
 Jones in the Fast Lane adds the following non-standard keyword:
 
     music_mute         bool     If true, CD audio is used, if available,
@@ -2143,6 +2195,9 @@ Simon the Sorcerer 1 and 2 add the following non-standard keywords:
     music_mute         bool     If true, music is muted
     sfx_mute           bool     If true, sound effects are muted
 
+Soltys adds the following non-standard keyword:
+    enable_color_blind bool     If true, original colors are replaced by a set of greys
+
 The Legend of Kyrandia adds the following non-standard keyword:
 
     walkspeed          number   The walk speed (0-4)
@@ -2164,6 +2219,16 @@ keywords:
     helium_mode        bool     If true, people sound like they've inhaled
                                 Helium
 
+The Neverhood adds the following non-standard keywords:
+
+    originalsaveload   bool     If true, the original save/load screens are
+                                used instead of the enhanced ScummVM ones
+    skiphallofrecordsscenes     bool
+                                If true, allows the player to skip
+                                past the Hall of Records storyboard scenes
+    scalemakingofvideos  bool   If true, the making of videos are scaled, so that
+                                they use the whole screen
+
 The 7th Guest adds the following non-standard keyword:
 
     fast_movie_speed   bool     If true, movies are played at an increased