Age | Commit message (Collapse) | Author |
|
|
|
|
|
accidentally merged
|
|
First merge screw up: I meant to comment these lines out (as they area
now -- in fact, these lines did not exist pre-merge at all, I moved the
-DRELEASE_BUILD additions manually to their own lines, so I could
comment them out, and then promptly forgot. *sigh*)
On the pro side, it was very easy to spot and correct this mistake!
|
|
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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This reduces the similarity in name to the otherwise mostly
unrelated DISABLE_TEXT_CONSOLE #define.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This combines the following Samsung TV port updates from master:
944e0be209f5ab47c3b903f258d2d41b990d80cb
dc1d07774fc8ab0554047115d319ef8c0a2c3f63
It also includes the parts touching this backend of:
69b1485a22dc2b8a2cfe0bd10edcbaad0da0cf6e
2fa63ca01586c4e5fda8eb12dca444d47a2375f1
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
This takes up a tiny little bit of extra binary size, but gets
rid of some awful #ifdef hackery.
|
|
|
|
branch-1-3-0
|
|
- Enable libmad
- Remove forced include of scummsys.h, it caused problems in the forbidden symbols code.
|
|
Replaces the formerly custom WinCE massadd function (CELauncherDialog::automaticScanDirectory) with the global one, which is better because it shows progress (massadd in combination with a uncached plugin build takes a very long time to complete and user thinks device has crashed when no progress is shown).
Also fixes the additional custom WinCE about dialog (text was cut off before).
|
|
Enables building of plugin .dlls without a custom Makefile.
Also removes generation of scummvm.exe.map from configure script.
|
|
|
|
|
|
We now delay the mouseup events for 50ms, rather than just delaying them for an additional couple of pollEvent (which doesn't work anymore due to changes in the eventhandling code elsewhere). This fixes #3018512.
|
|
We now delay the mouseup events for 50ms, rather than just delaying them for an additional couple of pollEvent (which doesn't work anymore due to changes in the eventhandling code elsewhere). This fixes #3018512.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Thanks to Ge0rG for the analysis
Cherry-picked from bfecb37501b6fdc35f2802216db5fb2b0e54b8ee
|
|
Thanks to Ge0rG for the analysis
|
|
This embeds all the engine data files from dists/engine-data into the
executable in case the engines using them are included statically.
Furthermore it includes the theme dist files in the executable.
|
|
If the user has only a N64 mouse plugged in and no controllers
this avoids fake clicks.
|
|
|
|
|