Merge branch 'master' into mm

Conflicts: engines/access/access.cpp engines/access/asurface.h engines/access/bubble_box.cpp engines/access/bubble_box.h engines/access/martian/martian_game.cpp engines/access/player.cpp engines/access/player.h engines/access/resources.cpp engines/access/screen.cpp engines/access/screen.h engines/access/sound.cpp engines/access/sound.h
scummvm · Jul 22, 2015 · 6ec9c81 · 6ec9c81
2 parents 5ec05f6 + 4e5c8d3
commit 6ec9c81
Show file tree

Hide file tree

Showing 885 changed files with 76,273 additions and 29,154 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -259,8 +259,10 @@ ScummVM Team
        Einar Johan T. Somaaen
        Tobia Tesan
 
-    ZVision:
+    Z-Vision:
        Adrian Astley
+       Filippos Karapetis
+       Anton Yarcev
 
   Backend Teams
   -------------
@@ -483,7 +485,7 @@ Other contributions
 
     German:
        Simon Sawatzki
-       Lothar Serra Mari            - (retired)
+       Lothar Serra Mari
 
     Hungarian:
        Alex Bevilacqua
@@ -524,6 +526,12 @@ Other contributions
        Victor Gonzalez              - Soltys Spanish translation
        Alejandro Gomez de la Munoza - Soltys Spanish translation
 
+    CGE2:
+       Arnaud Boutonne              - Sfinx English translation
+       Thierry Crozat               - Sfinx English translation
+       Peter Bozso                  - Sfinx English translation editor
+       Ryan Clark                   - Sfinx English translation editor
+
     Drascula:
        Thierry Crozat               - Improve French translation
 
@@ -557,6 +565,7 @@ Other contributions
      Jeroen Janssen               - Numerous readability and bugfix patches
      Keith Kaisershot             - Several Pegasus Prime patches
      Andreas Karlsson             - Initial port for SymbianOS
+     Stefan Kristiansson          - Initial work on SDL2 support
      Claudio Matsuoka             - Daily Linux builds
      Thomas Mayer                 - PSP port contributions
      Sean Murray                  - ScummVM tools GUI application (GSoC 2007
@@ -661,7 +670,7 @@ Special thanks to
    Jimmi Thogersen   - For ScummRev, and much obscure code/documentation
    Tristan           - For additional work on the original MT-32 emulator
    James Woodcock    - Soundtrack enhancements
-   Anton Yartsev     - For the original re-implementation of the ZVision
+   Anton Yartsev     - For the original re-implementation of the Z-Vision
                        engine
 
    Tony Warriner and everyone at Revolution Software Ltd. for sharing with us

diff --git a/COPYRIGHT b/COPYRIGHT
@@ -1,5 +1,5 @@
 ScummVM
-Copyright (C) 2001-2014 by the following:
+Copyright (C) 2001-2015 by the following:
 
 If you have contributed to this project then you deserve to be on this
 list.  Contact us (see: AUTHORS) and we'll add you.

diff --git a/Makefile b/Makefile
@@ -91,6 +91,7 @@ ifeq "$(findstring config.mk,$(MAKEFILE_LIST))" "config.mk"
 	LDFLAGS="$(SAVED_LDFLAGS)" CXX="$(SAVED_CXX)" \
 			CXXFLAGS="$(SAVED_CXXFLAGS)" CPPFLAGS="$(SAVED_CPPFLAGS)" \
 			ASFLAGS="$(SAVED_ASFLAGS)" WINDRESFLAGS="$(SAVED_WINDRESFLAGS)" \
+			SDL_CONFIG="$(SAVED_SDL_CONFIG)" \
 			$(srcdir)/configure $(SAVED_CONFIGFLAGS)
 else
 	$(error You need to run $(srcdir)/configure before you can run make. Check $(srcdir)/configure --help for a list of parameters)

diff --git a/NEWS b/NEWS
@@ -3,15 +3,57 @@ For a more comprehensive changelog of the latest experimental code, see:
 
 1.8.0 (????-??-??)
  New Games:
+   - Added support for Rex Nebular and the Cosmic Gender Bender.
    - Added support for Sfinx.
+   - Added support for Zork Nemesis: The Forbidden Lands.
+   - Added support for Zork: Grand Inquisitor.
+
+ General:
+   - Updated Munt MT-32 emulation code to version 1.5.0.
+
+ 3 Skulls of the Toltecs:
+   - Improved AdLib music support.
+
+ AGI:
+   - It is now possible to disable mouse support (except for Amiga versions
+     and fanmade games, that require a mouse).
+   - Fix incorrect volume attenuation in PCjr sound code (bug #6858).
+
+ AGOS:
+   - Fixed arpeggio effect used in music of Amiga version of Elvira 1.
+   - Fixed loading and saving progress in the PC version of Waxworks.
+   - Fixed verb area been removed in Amiga versions of Simon the Sorcerer 1.
+   - Added Accolade AdLib & MT32 music drivers for the games:
+     Elvira 1, Elvira 2, Waxworks and Simon the Sorcerer 1 demo.
 
  Broken Sword 1:
-   - Fix speech endianness detection on big endian systems for the mac
+   - Fix speech endianness detection on big endian systems for the Macintosh
      version (bug #6720).
    - Fix crash when reloading a game from the Main Menu while in the bull's
      head scene (bug #6728). It may have been happening in other scenes as
      well.
 
+ MADE:
+   - Improved AdLib music support in Return to Zork.
+
+ SAGA:
+   - Improved AdLib music support.
+
+ SCI:
+   - Handling of music priority has been greatly improved.
+   - A lot of fixes for original game script bugs that also occurred when
+     using the original interpreter.
+     KQ6 (Dual Mode), LSL5, QfG1 (EGA), QfG1 (VGA), QfG2, QfG3, SQ1, SQ4 (CD)
+   - Restoring from the ScummVM in-game menu should now work all the time.
+   - Improve support for Japanese PC-9801 games.
+
+ SCUMM:
+   - It is now possible to play Maniac Mansion from within Day of the
+     Tentacle, with a few caveats. See README for details.
+
+ Tinsel:
+   - Improved AdLib music support in Discworld 1.
+
 1.7.0 (2014-07-21)
  New Games:
    - Added support for Chivalry is Not Dead.