ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
276 Commits
Author SHA1 Message Date
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
Johannes Schickel 31880186e1 BACKENDS: Let copyRectToScreen take a "const void *" instead of "const byte *" 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.
 2012-06-16 02:18:01 +02:00
Matthew Hoops b2f5721e58 COMMON: Add tm_wday to our TimeDate struct 
Did not adapt bada or ps2 backends as I'm not sure how they should be handled
 2012-06-09 20:21:48 -04:00
Johannes Schickel a401f0a19e ALL: Replace cursorTargetScale in OSystem API with a simple "do not scale" 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.
 2012-06-03 02:02:57 +02:00
Tobias Gunkel 201336367b ANDROID: disable compression for zip-file assets and recompress uncompressed zip-files before adding them as assets to the apk 2012-04-29 17:23:07 +02:00
Tarek Soliman 6afac4e01e KEYMAPPER: Rename HardwareKey to HardwareInput 2012-02-27 13:00:56 -06:00
Tarek Soliman aa42d78658 KEYMAPPER: Remove automapping dead code 2012-02-21 08:20:40 -06:00
Tarek Soliman edc5249772 JANITORIAL: Fix template definition whitespace 2012-02-10 21:17:27 -06:00
Alyssa Milburn 4763b2c51b ANDROID: Add faked input delay. 
This adds an artificial delay for mouse up events to make engines
like Gob work, similar to the iPhone fix in b3062b5e.
 2012-02-03 12:36:03 +01:00
Tarek Soliman d143872be6 KEYMAPPER: Constantify global keymap name 2012-01-07 21:20:29 -06:00
Alyssa Milburn c780b58e88 ANDROID: Fix assert in JavaInputStream (thanks clone2727). 2011-12-13 18:44:58 +01:00
Alyssa Milburn 6c790ea6a7 ANDROID: Fix compilation by adapting to latest Archive changes (thanks LordHoto). 2011-12-13 18:37:33 +01:00
Johannes Schickel 61795739f8 COMMON: Rename Common::set_to to Common::fill. 
This makes the name match with the name of the STL function with the same
behavior.
 2011-11-16 18:06:30 +01:00
Alyssa Milburn dc649a13a7 ANDROID: Actually create the savegame directory. 
Not sure how this went missing from the commit.
(cherry picked from commit fed26146a8)
 2011-10-28 12:11:50 +02:00
Alyssa Milburn 764ffff578 ANDROID: Match versions when checking for plugins. 2011-10-25 23:08:29 +02:00
Alyssa Milburn 80e55c5e78 ANDROID: Point the default savepath to external storage. 
(If that fails, fall back to a readable app-specific directory.)
 2011-10-25 23:04:42 +02:00
Alyssa Milburn 44b7f3aed5 ANDROID: Move from org.inodes.gus to org.scummvm. 2011-10-25 21:18:42 +02:00
Alyssa Milburn ff3f4d9493 ANDROID: Fix plugins on Android 3.1+. 
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.
 2011-10-22 20:45:15 +02:00
Alyssa Milburn c382c0c195 ANDROID: Delete _timerManager in OSystem_Android's destructor. 
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.
 2011-10-21 14:28:02 +02:00
Christoph Mallon 23a0f5318c JANITORIAL: Remove trailing empty lines. 2011-08-07 13:53:33 +02:00
Littleboy eecd61e33d ANDROID: Allow use of abort() in JNI class 2011-06-23 11:31:54 -04:00
Alyssa Milburn 0d025153e0 ANDROID: Fix kFeatureCursorPalette. 2011-06-18 10:30:21 +02:00
Max Horn fce7f90a94 BACKENDS: Shuffle backends class hierarchy and module initialization 2011-06-08 14:29:22 +02:00
Max Horn 896e7e23b4 ANDROID: Use OSystem's 'slots' for timer/savefile manager & fsfactory 2011-06-07 14:57:56 +02:00
Max Horn afb06b51cc BACKENDS: Unify AudioCD manager instantiation 2011-06-06 15:02:33 +02:00
Alyssa Milburn 6842227ac2 COMMON: Add kInfo LogMessageType. 2011-06-06 12:26:01 +02:00
Max Horn ce32745d9c BACKENDS: Replace OSystem::disableCursorPalette by setFeatureState calls 2011-06-04 11:55:56 +02:00
Max Horn 91b889e2d3 COMMON: Rename kFeatureCursorHasPalette -> kFeatureCursorPalette 2011-06-04 11:55:56 +02:00
Max Horn 29ed72115e ANDROID: Revert stable-only changes from commit cf41ac0f which I accidentally merged 2011-06-01 16:45:18 +02:00
Max Horn a4610df482 Merge branch 'branch-1-3-0' into master 
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
 2011-06-01 15:15:31 +02:00
Matthew Hoops 9539017ee3 ALL: initialise -> initialize 2011-05-25 11:17:11 -04:00
strangerke 69b1485a22 GIT: Clean up: Suppress SVN tags, now useless 2011-05-12 01:16:22 +02:00
dhewg 16f0dcc00b ANDROID: Get rid of Fn->ALT metakey mapping 
Thanks to Ge0rG for the analysis

Cherry-picked from bfecb37501
 2011-05-07 20:08:29 +02:00
dhewg bfecb37501 ANDROID: Get rid of Fn->ALT metakey mapping 
Thanks to Ge0rG for the analysis
 2011-05-07 19:44:21 +02:00
Max Horn a50c36d138 ANDROID: Fix various forbidden symbol clashes 2011-05-03 14:29:01 +02:00
Max Horn 3d4e9fe674 BACKENDS: Allow various files to use stuff from time.h 2011-05-03 11:27:44 +02:00
dhewg ea547ca3fd ANDROID: Style fix 2011-05-02 18:41:04 +02:00
dhewg cf41ac0fec ANDROID: Disable the savegame parachute 
Only on the stable branch, since this is unfinished and might wipe
savegames of the user.
 2011-05-01 18:07:27 +02:00
Johannes Schickel 71bdb86e02 Merge pull request #16 "Add a PixelFormat to Graphics::Surface.". 
For further discussion check here:
https://github.com/scummvm/scummvm/pull/16

Conflicts:
	graphics/png.cpp
 2011-05-01 16:54:45 +02:00
dhewg 8feac89bc7 ANDROID: Fix compilation some more 2011-04-28 20:02:01 +02:00