Age | Commit message (Collapse) | Author |
|
This fixes two minor issues when trying to cross-compile to Android on
Win32 using the Win32 Android SDK/NDK and MinGW shell.
However, this is still no working as DX and APKBUILDER are batch files
in the Win32 SDK (which then call the real Java tools) and these fail
to run in shell. However, using "cmd /C" also fails as the paths in the
parameters have unix, rather than native separators. Unsure how to fix.
|
|
This parameter overrides any user choice in the GUI or config file,
which is not good UX design (and is making it hard to debug loading
issues associated with theme files).
If we want to set this to default to Modern, we should do this in
a different way i.e. do this by ConfMan.loadDefaultConfigFile()
This is probably related to the Android issue with the backend init
running before main() is called, rather than after...
|
|
|
|
From pull request #285.
|
|
|
|
ANDROID: disable compression for zip-file assets
|
|
|
|
OSYSTEM: Use void buffers for screen/overlay/mouse buffers and proper pitch values for overlay code
|
|
pitch values.
This is a first step to get rid of OverlayColor, which is a requirement for
proper 4Bpp overlay support.
|
|
This is mainly for consistency with OSystem::copyRectToScreen.
|
|
*" as buffer.
This removes the need to convert the parameter to copyRectToScreen to
"const byte *", which is commonly used in games, which use Graphics::Surface
to store their graphics data.
|
|
Did not adapt bada or ps2 backends as I'm not sure how they should be handled
|
|
logic.
All uses of the old target scale API actually wanted to disallow scaling of
the mouse cursor. This commit adapts our API to this and thus simplifies
backend implementations.
Some backends, most notable the Wii and Android, did some implementation of
the cursor target scale, which I didn't adapt yet. I added a TODO for the
porters there.
|
|
zip-files before adding them as assets to the apk
|
|
|
|
|
|
|
|
This adds an artificial delay for mouse up events to make engines
like Gob work, similar to the iPhone fix in b3062b5e.
|
|
|
|
|
|
LordHoto).
|
|
This makes the name match with the name of the STL function with the same
behavior.
|
|
Not sure how this went missing from the commit.
(cherry picked from commit fed26146a855fc79784c3df0ae3a1bf068fc2722)
|
|
|
|
(If that fails, fall back to a readable app-specific directory.)
|
|
|
|
Android 3.1 changed the default behaviour for broadcasts so that it
doens't wake up non-running receivers, so we need to override that.
|
|
If we leave it for OSystem, the DefaultTimerManager destructor tries
constructing a StackLock which, predictably, calls a pure virtual
function, because OSystem_Android's destructor is finished.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
accidentally merged
|
|
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
|
|
|
|
|
|
Thanks to Ge0rG for the analysis
Cherry-picked from bfecb37501b6fdc35f2802216db5fb2b0e54b8ee
|
|
Thanks to Ge0rG for the analysis
|
|
|
|
|
|
|
|
Only on the stable branch, since this is unfinished and might wipe
savegames of the user.
|
|
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16
Conflicts:
graphics/png.cpp
|
|
|
|
|