Merge remote branch 'upstream/master' into pegasus

.gitignore

@@ -23,6 +23,7 @@ lib*.a
 /.project
 /.cproject
 /.settings
+/Icon.*
 
 /build
 
@@ -71,9 +72,15 @@ lib*.a
 /dists/codeblocks/*.layout
 /dists/codeblocks/scummvm*
 
+#Ignore XCode user data and build files
+xcuserdata
+project.xcworkspace
 /dists/iphone/build
-/dists/iphone/scummvm.xcodeproj/*.mode1v3
-/dists/iphone/scummvm.xcodeproj/*.pbxuser
+/dists/iphone/scummvm.xcodeproj
+/dists/iphone/create_project
+/dists/macosx/build
+/dists/macosx/scummvm.xcodeproj
+/dists/macosx/create_project
 
 /dists/msvc*/[Dd]ebug*/
 /dists/msvc*/[Rr]elease*/

AUTHORS

@@ -49,52 +49,25 @@ ScummVM Team
        Oliver Kiehl          - (retired)
        Ludvig Strigeus       - (retired)
 
-    Beneath a Steel Sky:
-       Robert Goeffringmann  - (retired)
-       Oliver Kiehl          - (retired)
-       Joost Peters
-
-    Broken Sword:
-       Fabio Battaglia       - PSX version support
-       Thierry Crozat        - Mac version support
-       Robert Goeffringmann  - (retired)
-
-    Broken Sword II:
-       Torbjorn Andersson
-       Fabio Battaglia       - PSX version support
-       Jonathan Gray         - (retired)
-
-    Broken Sword 2.5:
-       Eugene Sandulenko
-       Filippos Karapetis
-       Max Horn
-       Paul Gilbert
-       Torbjorn Andersson
-
-    Cinematique evo 1:
+    Cine:
        Vincent Hamm          - (retired)
        Pawel Kolodziejski
        Gregory Montoir
        Kari Salminen
        Eugene Sandulenko
 
-    Cinematique evo 2:
+    CruisE:
        Paul Gilbert
        Vincent Hamm          - (retired)
 
-    Draci Historie:
+    Draci:
        Denis Kasak
        Robert Spalek
 
     Drascula:
        Filippos Karapetis
        Pawel Kolodziejski
 
-    Flight of the Amazon Queen:
-       David Eriksson        - (retired)
-       Gregory Montoir
-       Joost Peters
-
     Gob:
        Torbjorn Andersson
        Arnaud Boutonne
@@ -118,12 +91,12 @@ ScummVM Team
        Gregory Montoir
        Johannes Schickel
 
-    Last Express:
+    Lastexpress:
        Matthew Hoops
        Jordi Vilalta Prat
        Julien Templier
 
-    Lure of the Temptress:
+    Lure:
        Paul Gilbert
 
     M4:
@@ -147,6 +120,11 @@ ScummVM Team
     Parallaction:
        peres
 
+    Queen:
+       David Eriksson        - (retired)
+       Gregory Montoir
+       Joost Peters
+
     SAGA:
        Torbjorn Andersson
        Filippos Karapetis
@@ -164,7 +142,29 @@ ScummVM Team
        Jordi Vilalta Prat
        Lars Skovlund
 
-    Teen Agent:
+    Sky:
+       Robert Goeffringmann  - (retired)
+       Oliver Kiehl          - (retired)
+       Joost Peters
+
+    Sword1:
+       Fabio Battaglia       - PSX version support
+       Thierry Crozat        - Mac version support
+       Robert Goeffringmann  - (retired)
+
+    Sword2:
+       Torbjorn Andersson
+       Fabio Battaglia       - PSX version support
+       Jonathan Gray         - (retired)
+
+    Sword25:
+       Eugene Sandulenko
+       Filippos Karapetis
+       Max Horn
+       Paul Gilbert
+       Torbjorn Andersson
+
+    TeenAgent:
        Robert Megone         - Help with callback rewriting
        Vladimir Menshakov
 
@@ -222,7 +222,8 @@ ScummVM Team
 
     PocketPC / WinCE:
        Nicolas Bacca         - (retired)
-       Kostas Nakos
+       Ismail Khatib
+       Kostas Nakos         - (retired)
 
     PlayStation 2:
        Robert Goeffringmann  - (retired)

COPYING

@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
-
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

COPYRIGHT

@@ -40,10 +40,10 @@ Travis Howell
 Janne Huttunen
 Felix Jakschitsch
 Jeroen Janssen
-Willem Jan Palenstijn
 Florian Kagerer
 Filippos Karapetis
 Andreas Karlsson
+Ismail Khatib
 Oliver Kiehl
 Martin Kiewitz
 Pawel Kolodziejski
@@ -58,6 +58,7 @@ Gregory Montoir
 Kostas Nakos
 Mikesch Nepomuk
 Nicolas Noble
+Willem Jan Palenstijn
 Lars Persson
 Joost Peters
 Tim Phillips

NEWS

@@ -5,7 +5,7 @@ For a more comprehensive changelog of the latest experimental code, see:
  SDL ports:
    - Added support for OpenGL (GSoC Task).
 
-1.3.0 (????-??-??)
+1.3.0 (2011-05-28)
  New Games:
    - Added support for Backyard Baseball.
    - Added support for Backyard Baseball 2001.
@@ -1123,7 +1123,7 @@ For a more comprehensive changelog of the latest experimental code, see:
    - Added MMX i386 assembler versions of the HQ2x and HQ3x scalers.
    - Added 'Extra Path' option allows for a searching an additional datafile
      location (for reencoded cutscenes and the like).
-   - Disabled Alt-x and Ctrl-z quit keys in favour of Ctrl-q on unix like
+   - Disabled Alt-x and Ctrl-z quit keys in favor of Ctrl-q on unix like
      operating systems, like Linux (exception: Mac OS X still uses Cmd-q).
    - Separate smaller font for the console, allowing for more visible
      information, for example in the SCUMM debugger.

README

@@ -2052,8 +2052,7 @@ compiler. Several compilers, including GCC, mingw and recent versions of
 Microsoft Visual C++ are supported. If you wish to use MP3-compressed CD
 tracks or .SOU files, you will need to install the MAD library; likewise
 you will need the appropriate libraries for Ogg Vorbis and FLAC
-compressed sound. For MPEG2 support, libmpeg2 is required. For
-compressed save states, zlib is required.
+compressed sound. For compressed save states, zlib is required.
 
 Some parts of ScummVM, particularly scalers, have highly optimized
 versions written in assembler. If you wish to use this option, you will
@@ -2137,7 +2136,7 @@ debug messages (see http://www.sysinternals.com/ntw2k/freeware/debugview.shtml).
 
   Maemo:
     * Get Scratchbox environment with Maemo 2.2 rootstrap (2.2 is for 770 and up)
-    * Install libmad, Tremor, FLAC, libmpeg2 from source
+    * Install libmad, Tremor, FLAC from source
     * patch scummvm source (some stuff is currently too dirty to be in svn directly)
       patch -p1 < backends/platform/maemo/scummvm-[currentversion]-maemo.patch
     * update debian/changelog

audio/audiostream.cpp

@@ -30,6 +30,7 @@
 #include "audio/audiostream.h"
 #include "audio/decoders/flac.h"
 #include "audio/decoders/mp3.h"
+#include "audio/decoders/quicktime.h"
 #include "audio/decoders/raw.h"
 #include "audio/decoders/vorbis.h"
 
@@ -48,7 +49,7 @@ struct StreamFileFormat {
 };
 
 static const StreamFileFormat STREAM_FILEFORMATS[] = {
-	/* decoderName,  fileExt, openStreamFuntion */
+	/* decoderName,  fileExt, openStreamFunction */
 #ifdef USE_FLAC
 	{ "FLAC",         ".flac", makeFLACStream },
 	{ "FLAC",         ".fla",  makeFLACStream },
@@ -59,6 +60,7 @@ static const StreamFileFormat STREAM_FILEFORMATS[] = {
 #ifdef USE_MAD
 	{ "MPEG Layer 3", ".mp3",  makeMP3Stream },
 #endif
+	{ "MPEG-4 Audio",   ".m4a",  makeQuickTimeStream },
 
 	{ NULL, NULL, NULL } // Terminator
 };