With the recent v7/v8 changes in the SCUMM engine, trying to run a v7/v8
SCUMM game is not a nice user experience anymore, because the game just
won't fit in the limited default memory available on Dreamcast anymore.
This is also a problem for some other engines on this platform, but the
SCUMM engine being one of the most popular engines, quite a lot of users
end up burning a toast CD-R on their Dreamcast until they figure out
that only SCUMMv6 and earlier still work nowadays (with some limitations
too). Disabling v7/v8 from the SCUMM engine plugin should also free up
some memory for a better experience with earlier SCUMM titles.
I manually resolved all conflicts, and inspected every single change.
Many were due to the version string mismatch and thus easily resolved.
The MSVC project files add in the 1-3-0 branch were not merged,
neither where the changes to gui/themes/translations.dat.
Conflicts:
NEWS
backends/base-backend.cpp
backends/graphics/samsungtvsdl/samsungtvsdl-graphics.cpp
backends/module.mk
backends/platform/ds/arm9/makefile
backends/platform/psp/README.PSP
backends/platform/samsungtv/main.cpp
backends/platform/samsungtv/samsungtv.cpp
backends/saves/posix/posix-saves.cpp
base/commandLine.cpp
base/internal_version.h
base/main.cpp
common/array.h
configure
devtools/create_project/create_project.cpp
dists/android/AndroidManifest.xml
dists/android/plugin-manifest.xml
dists/iphone/Info.plist
dists/irix/scummvm.spec
dists/macosx/Info.plist
dists/redhat/scummvm-tools.spec
dists/redhat/scummvm.spec
dists/scummvm.rc
dists/slackware/scummvm.SlackBuild
dists/wii/meta.xml
engines/sci/parser/vocabulary.cpp
engines/tinsel/handle.cpp
gui/themes/translations.dat
