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
Ori Avtalion
52c0b2e28c
ANDROID: Another attempt at compilation fix
2011-04-28 20:53:01 +03:00
Ori Avtalion
1b681e85a8
ANDROID: Fix compilation
2011-04-28 20:05:01 +03:00
Johannes Schickel
da734a4af0
ALL/GRAPHICS: Remove Surface::bytesPerPixel.
2011-04-17 21:27:34 +02:00
Johannes Schickel
877004dbdd
BACKENDS: Adapt various backends code to set up Surface::format correctly.
...
Note that this change is not tested at all (not even compile wise!).
2011-04-17 21:14:19 +02:00
dhewg
6c0bca8aae
ANDROID: Add missing mkdir
2011-04-10 11:12:40 +02:00
dhewg
b0351e1b85
ANDROID: Automate the Manifest's versionCode
2011-04-09 18:40:04 +02:00
dhewg
90f47c7b1d
ANDOID: Replace mkmanifest.pl with sh/sed code
...
Removes build dependencies like perl and its XML modules
2011-04-09 18:39:35 +02:00
dhewg
4f09018b00
ANDROID: Allow linear texture filtering on the cursor
2011-04-06 21:15:15 +02:00
dhewg
a565e63c48
ANDROID: Add multitouch support
2011-04-06 18:27:15 +02:00
dhewg
b45640c47b
ANDROID: Fix off-by-one when clipping mouse coords
2011-04-06 15:21:31 +02:00
dhewg
430c462031
Revert "ANDROID: Temporarily enable GL error checks"
...
This reverts commit 1c8fc05388
.
Commit d50e7af7
confirmed as fix, so it wasn't a GL issue at all
2011-04-06 11:31:20 +02:00
dhewg
811b1fcc2a
ANDROID: Use the manufacturer string for workarounds
...
Some fingerprints don't contain it, so this should be more reliable.
2011-04-05 19:10:35 +02:00
dhewg
507bff8233
ANDROID: Log device manufacturer, model and brand
2011-04-05 19:06:59 +02:00
dhewg
d50e7af797
ANDROID: Fix endless loop in AndroidAssetArchive
...
Can happen on empty member filenames, seen on some Samsung firmwares.
2011-04-05 18:25:37 +02:00
dhewg
0adfe72966
ANDROID: Remove commented workarounds for Nexus 1
...
Reports suggest that its working and not required
2011-04-05 15:16:07 +02:00
dhewg
4440aa4310
ANDROID: Remove code for paletted textures
...
Unused now, because the performance isn't good enough on weak GLES
drivers.
2011-04-05 15:09:46 +02:00
dhewg
ea253ff26d
ANDROID: Use a faked paletted texture for CLUT cursors
...
Same change as for the game screen, reduces CPU usage a little
2011-04-05 15:07:07 +02:00
dhewg
1c8fc05388
ANDROID: Temporarily enable GL error checks
...
There's a black screen issue on Samsung devices running 2.2.1 which I
can not reproduce. Hopefully this helps hunting it down.
2011-04-05 13:57:09 +02:00
Alyssa Milburn
449e9cf339
ANDROID: Fix non-fullscreen corruption on HTC devices.
...
HTC's drivers don't preserve the color buffer between frames (as allowed
by the spec, apparently), so we have to force-clear it every frame when
we're not rendering a texture over the whole screen.
2011-04-04 12:23:12 +02:00
dhewg
ea4223d941
ANDROID: Always use the surface size for the overlay
...
When coming back from standby, there might be an indermediate surface
change
2011-04-03 20:34:24 +02:00
dhewg
fba1c6360c
ANDROID: Ignore unrelated surface changes
2011-04-03 20:34:19 +02:00
dhewg
1692605b08
ANDROID: Helper define to debug hanging GLES calls
2011-04-03 20:34:14 +02:00
dhewg
801f576f9c
ANDROID: Log the ScummVM version
2011-04-03 16:39:56 +02:00
dhewg
bceab2656b
ANDROID: Attempt at working around some HTC fail
2011-04-02 13:32:03 +02:00
dhewg
dd1c52fd82
ANDROID: Map right click to Camera/Search
2011-03-30 23:39:34 +02:00
dhewg
68908773ac
ANDROID: Use 'our' ASCII codes for special keys
...
Fixes stuff like enter key on SCI games with text input
2011-03-25 19:52:33 +01:00
dhewg
b4a6c89662
ANDROID: Always set the surface properties
...
Didn't happen on the shortcut, which led to wrong properties and
surface functions scribbling over memory
2011-03-25 00:41:01 +01:00
dhewg
19c407ca69
ANDROID: Fix texture double release
2011-03-24 22:04:03 +01:00
dhewg
e6080087c8
ANDROID: Fix cursor's keycolor
...
Don't wipe the RGB bits, fixes wrong colors on BASS cursors
2011-03-24 18:56:59 +01:00
dhewg
397fd31a17
ANDROID: Cleanup
2011-03-24 18:56:54 +01:00
dhewg
5f96dc6867
ANDROID: Fix timer frequency to match SDL
2011-03-22 21:02:42 +01:00
dhewg
c77e7f75a6
ANDROID: Trust ASCII kbd codes on unknown keys
2011-03-20 13:29:21 +01:00
dhewg
0e9af50d48
ANDROID: Add port specific README
...
First version, just describing the controls and related hacks
2011-03-19 19:52:01 +01:00
dhewg
0d9a852f46
ANDROID: Implement OSystem::getSystemLanguage()
2011-03-19 12:36:27 +01:00
dhewg
69e271225f
ANDROID: Log some system properties
2011-03-19 12:17:43 +01:00
dhewg
3e3619feb8
ANDROID: Cleanup
2011-03-18 22:14:54 +01:00