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
The "dcdist" target creates the directory dcdist/scummvm and copies
relevant files from the nightly build into it. This is is they do
not have to be enumerated in the buildbot configuration.
Display the names of the plugins being loaded, and display amount
of free memory while doing so. This should make it easier to spot
the case that too many engine plugins have been placed on the boot
medium.
It seems unlikely that git will ever be able to produce a $(VER_REV)
of 6 characters or less (the requirement for the version field in
IP.BIN), so don't even try to use it.
Add an object with an empty .ctors and .dtors section to the build
of each plugin. This ensures that there will be an output section
.ctors and one .dtors in the output file (they could be empty though).
If these output sections were to be removed, the symbols defined inside
by the linker script could disappear as well, and we don't want that.
svn-id: r55149
If a game CD has a scummvm.ini file with at least one game domain in
it, the normal autodetection is now bypassed and a menu of only the
games in the .ini file is presented instead. The descriptions of the
games are taken from the .ini file, but icons are still scanned for
in the old fashion.
Note that previously ScummVM would read global options from the
scummvm.ini file on the boot disc (if present), but now global options
are instead taken from the scummvm.ini on the game disc (in case of
a disc swap).
svn-id: r51480
Implement platform-specific variants of createConfigReadStream()
and createConfigWriteStream(), instead of inheriting the BaseBackend
definitions. Nonstandard behavious is as follows:
* createConfigWriteStream() always returns 0 (read-only filesystem)
* createConfigReadStream() returns an empty MemoryReadStream instead
of NULL if scummvm.ini does not exist. This is to make sure that
loadDefaultConfigFile() always clears out any old config data, as
I'll want to restart config parsing from scratch after a disc
swap.
svn-id: r51478
This should help avoid situations where MODULE_DIRS is not set to a
complete list of build dirs (which causes troubles with the automatic
header dependency detection logic).
On the long run, we should replace the relevant code by a macro or also
use rules.mk for this (with yet another if/else case add to it).
svn-id: r51467
Max Horn
Matthew Hoops
strangerke
Johannes Schickel
Marcus Comstedt
Ori Avtalion
dhewg
Jordi Vilalta Prat
Marcus Comstedt
Torbjörn Andersson