Commit graph

265 commits

Author SHA1 Message Date
Eugene Sandulenko
b01aa4141e ANDROID: Set version code to 16. 15 was 1.8.1 2016-05-31 17:13:33 +02:00
Alyssa Milburn
a32c53f936 ANDROID: Build against android-23 platform.
We seem to need this for the new manifest elements.
2016-05-23 09:33:11 +02:00
Matthew Garrett
832d7bb289 ANDROID: Add support for ScummVM menu on Android TV devices
Android TV devices don't have menu buttons. Remotes should have a play/pause
button (which may send individual play and pause events rather than a
combined event) and gamepads should have a Y button. Use these to open the
menu.
2016-05-22 15:23:44 -07:00
Matthew Garrett
497859ad90 ANDROID: Add support for Leanback Launcher on Android TV
Android TV needs some modifications to the manifest and a new icon in order
for apps to appear in the launcher.
2016-05-22 15:23:44 -07:00
Alexandre Detiste
6c298e964f JANITORIAL: Typos detected with lintian & grep 2016-02-15 18:27:02 +01:00
Alyssa Milburn
cac7be425a ANDROID: Remove plugins/unpacker from makefile. 2015-01-18 12:04:15 +01:00
Joel Teichroeb
59934881a1 ANDROID: Remove unpacker and fix support for non arm 2015-01-05 20:18:31 -08:00
Eugene Sandulenko
f92e569570 Merge pull request #425 from klusark/android
ANDROID: Modernize build system
2015-01-04 19:53:41 +01:00
Matthew Hoops
b577da29b5 ANDROID: Delay deleting a local ref until it's no longer used
Should fix bug #6741
2014-11-15 09:21:36 -05:00
Joel Teichroeb
563d837013 ANDROID: Modernize build system
Written originally by @Botje for ResidualVM
2014-07-22 16:57:30 -07:00
Marcus Comstedt
0adb9e7d9b ANDROID: Reinstate overscan margin resource for OUYA/GoogleTV
This reverts commits 51cb7557 and 2648062d.

Please note that Android SDK Platform Tools r06 or later is needed
to build ScummVM.
2014-07-01 22:14:57 +02:00
David Turner
cb596113a7 Merge pull request #461 from digitall/vkeybdFix
Add trigger for Virtual Keyboard on long press of Middle Mouse Button
2014-06-28 14:59:08 +01:00
Marcus Comstedt
0e45979634 ANDROID: Allow build with non-ancient SDK 2014-06-18 21:40:13 +02:00
Marcus Comstedt
e395343064 ANDROID: Hide system mouse pointer on OUYA 2014-06-18 18:22:41 +02:00
Matthew Hoops
21626c4ab4 ANDROID: Fix casting away const 2014-06-07 10:18:16 -04:00
D G Turner
37c46fecbf ANDROID: Fix correct keycode in keymapper for virtual keyboard trigger.
As the virtual keyboard trigger has been moved to CTRL-F7, the previous
code which generates a unmodified F7 event to do this will not work.

However, due to the complexity of this code, directly calling the
virtual keyboard trigger event could have side effects, so have instead
just added the CTRL modifier to fix this.

This should be fixed if possible to use EVENT_VIRTUAL_KEYBOARD.
2014-05-05 05:21:23 +01:00
Johannes Schickel
98867825ba ANDROID: Make transparent cursor pixels all 0 in 16bit cursor mode.
Since the Android backend uses glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA)
we need to make the transparent cursor pixels all 0 otherwise we might get
artifacts from blending.
2014-03-31 19:04:53 +02:00
Johannes Schickel
9fab467d58 ANDROID: Fix color key handling for 16bit mouse cursors.
This should fix a issue similarly to bug #6108:
"WII: Zak FM-TOWNS mouse cursor encased in blue box".
2014-03-26 00:43:38 +01:00
D G Turner
cbf085287c ANDROID: Fix Android pre3.1 compatibility.
This was broken by a50ede203b.
2014-02-27 10:44:55 +00:00
Johannes Schickel
d6a90f610f ANDROID: Slight formatting fix. 2014-02-22 19:47:15 +01:00
D G Turner
0def54a60d ANDROID: Fix runtime failure on earlier versions of Android.
getAxisValue() is only present from Android 3.1 onwards and
usage causes a runtime failure on earlier versions of Android.

This bug was introduced by a50ede20 with addition of OUYA support.

This solution is as recommended on the Android developer portal.
2014-02-21 16:29:23 +00:00
Johannes Schickel
5c2dac59be ANDROID: Make GPL headers consistent in themselves. 2014-02-18 02:39:32 +01:00
Joel Teichroeb
2d903d9668 ANDROID: Fix a race condition
setSurface is done in a different thread than the one that starts
the scummvm main. The main thread would then wait until the setSurface
thread notifies. The setSurface thread would notify before it actually
calls setSurface, meaning if the thread is preemted before calling
setSurface, initSurface will assert, causing the app to crash.
2014-01-27 18:29:00 -08:00
Alyssa Milburn
6927e570bb ANDROID: Add 32bpp support.
We still prefer 16bpp for performance reasons.
2014-01-23 23:00:00 +01:00
Marcus Comstedt
dd84867997 ANDROID: Set correct blending function
Overlays with alpha channel in ScummVM use pre-multiplied alpha.
Thus, is it necessary to set the source blend function to ONE, not
SOURCE_ALPHA.

While there is no firm decision on the texture format to be used to
cursors, make sure to set the key color to R=G=B=A=0.0, so that it
can be used with either pre-multiplied or non-pre-multiplied blending.
2014-01-10 20:05:32 +01:00
D G Turner
51cb755726 ANDROID: Really fix compilation.
The vanilla android toolchain even is unhappy when unknown folders are
present in the resources directory, so have moved the ouya specific
resources out to another directory.
2013-10-09 23:26:58 +01:00
D G Turner
2648062dcf ANDROID: Fix compilation.
The aapt throws an "invalid resource directory name" if the
resource directory name is not known to the tools. Unfortunately,
"values-television" is an OUYA specific addition and thus breaks
with the standard vanilla Android toolchain.
2013-10-09 06:53:53 +01:00
David Turner
d4d90b3f07 Merge pull request #372 from zeldin/ouya
Basic OUYA support
2013-10-08 18:26:49 -07:00
Marcus Comstedt
7a1ffe8c59 ANDROID: Add some margins when screen is a TV 2013-08-18 15:21:18 +02:00
Marcus Comstedt
bb39cbcba4 ANDROID: Enter main menu on middle mouse press 2013-08-08 15:16:06 +02:00
Marcus Comstedt
a50ede203b ANDROID: Add support for joystick motion 2013-08-08 14:53:36 +02:00
Marcus Comstedt
1b69f8aede ANDROID: Add gamepad button support 2013-08-08 14:08:30 +02:00
Marcus Comstedt
9a888ed1c8 ANDROID: Add OUYA icon and intent 2013-08-07 17:19:24 +02:00
Johannes Schickel
d9b90d67d3 ANDROID: Do not access Surface::pixels directly. 2013-08-06 03:51:12 +02:00
Eugene Sandulenko
49210a803a Merge pull request #331 from sev-/gsoc2012-eventsrecorder
GSoC2012: Event Recorder (reworked)
2013-07-04 04:58:54 -07:00
Eugene Sandulenko
f59512c47e RECORDER: Implement Events Recorder 2013-05-17 00:18:09 +03:00
Alyssa Milburn
400763390e ANDROID: Disable parachute slot 0 saves. 2013-05-16 13:01:32 +02:00
Alyssa Milburn
8d488f9f70 ANDROID: Force htc_fail for all Android devices, for now. 2013-05-16 12:57:21 +02:00
Alyssa Milburn
c96b75e1f7 ANDROID: Ignore subdirectories of asset archives. 2013-05-16 12:56:41 +02:00
Alyssa Milburn
89d9a624d9 ANDROID: Delete local JNI references to asset data/classes. 2013-05-16 12:55:06 +02:00
D G Turner
21ea60f604 ANDROID: Minor fixes to build-specific makefile.
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.
2012-12-28 00:54:00 +00:00
D G Turner
0e5bfb66f0 ANDROID: Remove parameter forcing use of Modern theme.
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...
2012-12-24 16:45:49 +00:00
Lauri Härsilä
fc15e1c207 ANDROID: Fixed tapping touchpad not sending left clicks 2012-10-21 06:29:36 +03:00
Lauri Härsilä
2109317564 ANDROID: Mouse and stylus support
From pull request #285.
2012-10-19 22:50:09 +02:00
Alyssa Milburn
9c561c0287 ANDROID: Remove unused GL_OES_draw_texture code. 2012-08-15 10:00:51 +02:00
Johannes Schickel
2d92259b70 Merge pull request #235 from tobigun/android-theme
ANDROID: disable compression for zip-file assets
2012-07-06 13:19:00 -07:00
Johannes Schickel
0a26f7084f ANDROID: Fix compilation broken with changes to grabOverlay. 2012-06-20 17:31:10 +02:00
Johannes Schickel
4fb9bceabc Merge pull request #246 from lordhoto/osystem-void-buffers
OSYSTEM: Use void buffers for screen/overlay/mouse buffers and proper pitch values for overlay code
2012-06-20 08:02:26 -07:00
Johannes Schickel
aec9b9e22a ALL: Let overlay related methods in OSystem take a void * and use a proper pitch values.
This is a first step to get rid of OverlayColor, which is a requirement for
proper 4Bpp overlay support.
2012-06-16 04:17:14 +02:00
Johannes Schickel
d27d951d0b BACKENDS: Make OSystem::setMouseCursor take a "const void *" buffer.
This is mainly for consistency with OSystem::copyRectToScreen.
2012-06-16 03:28:42 +02:00