Einar Johan Trøan Sømåen
cc2cc0fdf8
GRIM: Fix broken overriding functions play and loadFile in NullPlayer
2014-02-02 04:12:48 +01:00
Ingo van Lil
8a0a264c29
Merge pull request #818 from inguin/emi-new-game
...
EMI: Fix crash when restarting the game
2014-02-01 16:11:49 -08:00
Joel Teichroeb
bbff5487f3
Merge pull request #831 from inguin/emi-attached-sort-order
...
EMI: Use parent sort order for attached actors
2014-02-01 16:04:13 -08:00
Ingo van Lil
549225964a
EMI: Use parent sort order for attached actors
...
When drawing attached actors the engine uses the parent's sort order
plus one. This offset can move the attached actor behind a background
plane, for instance the chess board in the Lucre docks or Guybrush when
riding the manatee.
2014-02-02 00:51:47 +01:00
Dries Harnie
dfccc03eeb
Merge pull request #828 from Botje/framebuffer-stencil
...
GRAPHICS: Also add a stencil attachment to framebuffers
2014-01-30 14:35:29 -08:00
Joel Teichroeb
b6363dc4b7
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-28 22:50:39 -08:00
Joel Teichroeb
bd13199ca6
Merge pull request #827 from klusark/gui
...
Remove some ScummVM stuff from the GUI
2014-01-28 22:42:07 -08:00
Joel Teichroeb
b9fb2742aa
Merge pull request #829 from klusark/assets
...
ANDROID: Update the asset archive code to use AAssets
2014-01-27 12:20:41 -08:00
Joel Teichroeb
01459a674f
ANDROID: Update the asset archive code to use AAssets
2014-01-27 12:09:18 -08:00
Joel Teichroeb
f5e97bc411
GUI: Disable platform selection
2014-01-27 10:35:38 -08:00
Joel Teichroeb
91667132f5
ANDROID: Use custom_rules.xml instead of build.xml
...
The build.xml was getting ignored, so we need to actually override rules
2014-01-27 10:13:25 -08:00
Joel Teichroeb
c88b9b6268
ANDROID: Remove old reference to removed ResidualVMApplication
2014-01-26 10:28:05 -08:00
Dries Harnie
ef1c2f5a67
GRAPHICS: Also add a stencil attachment to framebuffers
...
Note that this does require the GL_OES_packed_depth_stencil extension on
ES2. iOS supports it, and so do modern Android devices.
2014-01-26 12:27:08 +01:00
Bastien Bouclet
0d194bd8ba
BINK: Use the new audio track selection API
2014-01-26 09:43:21 +01:00
Joel Teichroeb
cf642e9a3b
Merge pull request #826 from klusark/unpacker
...
ANDROID: Remove Unpacker and plugin related things
2014-01-25 16:43:31 -08:00
Pawel Kolodziejski
9098dfe9a2
ALL: sync with scummvm
2014-01-25 22:16:57 +01:00
poulpi
fb4135e505
ANDROID: Add an emulatedKeypress function in the main Activity
2014-01-25 18:19:41 +01:00
Joel Teichroeb
9a5e693d79
GUI: Hide midi and mt-32
2014-01-25 08:37:11 -08:00
poulpi
b4dea2d617
ANDROID: Add resources
2014-01-25 16:19:31 +01:00
poulpi
a50bf59195
ANDROID: Add control buttons on the Android screen
...
ANDROID: Removing some logging
2014-01-25 15:29:45 +01:00
poulpi
5cdebf9a01
ANDROID: Modify the touchscreen controls to make Manny run
2014-01-25 15:29:44 +01:00
Joel Teichroeb
0afc2b8e0b
ANDROID: Remove Unpacker and plugin related things
...
Also remove the splash screen that happend during unpacking.
2014-01-24 11:51:20 -08:00
Dries Harnie
841d08db2e
GRAPHICS: Distinguish between texture size and viewport size in Graphics::FrameBuffer
2014-01-23 21:51:54 +01:00
Joel Teichroeb
748eb94a65
ANDROID: Remove proguard files
...
These are for obfuscation, which we don't need
2014-01-23 11:57:17 -08:00
Dries Harnie
ccc845110b
Merge pull request #824 from Botje/grim-shadows
...
OpenGLS: Support shadows in Grim
2014-01-23 11:21:24 -08:00
Dries Harnie
ca20357bd5
GRAPHICS: Add shadow mode to grim actors [OpenGLS]
2014-01-23 20:03:22 +01:00
Dries Harnie
6c8a35e53b
GRAPHICS: Transpose view/model matrices correctly
2014-01-23 20:03:21 +01:00
Dries Harnie
f618b90d31
GRAPHICS: Stencil for grim shadows [OpenGLS]
2014-01-23 20:03:21 +01:00
Joel Teichroeb
7cf3f2f99c
GRIM: Add a constructor for Shadow
...
This lets us get rid of the loop in Actor and lets us ensure
that Shadow is initizlied even if constructed elsewhere.
2014-01-23 10:22:44 -08:00
Joel Teichroeb
38c22e3c70
ANDROID: Don't install source files to apk
...
If ant is let loose on backends/platform/android it copies everything it can into the final apk file, which we obviously don't want. This changes it so that it will only see the java files which it compiles puts the results into the apk.
2014-01-23 10:08:13 -08:00
Joel Teichroeb
362a3c91fd
ANDROID: Update the NDK toolchain to 15
2014-01-22 12:37:13 -08:00
Joel Teichroeb
f8ab2183a5
ANDROID: Install to internal by default
...
Remove android:installLocation="preferExternal" as it is not needed for such a small app.
2014-01-22 09:10:00 -08:00
Joel Teichroeb
9742d97b68
ANDROID: Remove old feature requirements
...
These don't seem to work as intended as they cause the play store to limit us to 23 devices.
2014-01-22 09:08:59 -08:00
Joel Teichroeb
f279e38e24
Merge pull request #823 from klusark/androidbuild
...
ANDROID: Make androidrelease use ant release
2014-01-20 14:34:33 -08:00
Joel Teichroeb
465c91a8b4
ANDROID: Make androidrelease use ant release
2014-01-20 14:17:57 -08:00
Joel Teichroeb
e782168092
ANDROID: Remove INTERNET permission
2014-01-20 12:10:06 -08:00
Joel Teichroeb
deddad3ef0
Merge pull request #821 from klusark/fixcrash
...
GRIM: Add a vertex buffer object for blast text drawing
2014-01-17 11:19:18 -08:00
Joel Teichroeb
91f4e2681b
GRIM: Add a vertex buffer object for blast text drawing
...
This makes it so that we don't have to destroy the VBO
that a blast text object uses. This fixes what is probably
a driver bug with the windows nvidia drivers.
2014-01-17 09:48:09 -08:00
Joel Teichroeb
4af2b19577
GRIM: Initialize _userData in BitmapData and Mesh
2014-01-15 09:16:02 -08:00
Dries Harnie
a59b46e153
MISC: Fix typo in README
2014-01-15 00:03:50 +01:00
Christian Krause
71a44ba28a
Merge pull request #797 from chkr-private/collision-fixes
...
Collision fixes
2014-01-14 14:48:52 -08:00
Joel Teichroeb
9d4ba85cd9
Merge pull request #815 from chkr-private/costume-fixes
...
EMI: Fix costume unloading
2014-01-14 14:41:57 -08:00
Dries Harnie
5d89639f27
Merge pull request #800 from Botje/android-rfc
...
RFC: New OpenGL renderer.
2014-01-14 12:40:54 -08:00
Dries Harnie
13c673af3f
MISC: Mention file integrity check in README
...
As suggested by topolinik in the forums.
2014-01-14 10:10:05 +01:00
Dries Harnie
3ab4fa601f
GRAPHICS: Support Irises [OpenGLS]
2014-01-14 00:26:47 +01:00
Dries Harnie
85c94be5b5
JANITORIAL: Fix signed-unsigned warnings
2014-01-14 00:26:47 +01:00
Dries Harnie
583eafc2d6
GRAPHICS: Remove duplicate EBO [OpenGLS]
2014-01-14 00:26:44 +01:00
Dries Harnie
f4626819ce
GRAPHICS: Disable lighting for now [OpenGLS]
2014-01-14 00:26:43 +01:00
Dries Harnie
3a9af2dabc
GRAPHICS: Add support for Grim primitives [OpenGLS]
2014-01-14 00:26:43 +01:00
Dries Harnie
132508b683
GRAPHICS: Add boolean flag to Shader::use
2014-01-14 00:26:43 +01:00