4719 Commits

Author SHA1 Message Date
Ori Avtalion
eed8769412 GRIM: Fix typos in include guards 2014-02-14 16:21:42 +02:00
Pawel Kolodziejski
3008cade01 update credits 2014-02-13 23:30:11 +01:00
Dries Harnie
30e3f5b019 Merge pull request #822 from chkr-private/item-drawing-fixes
EMI: Rotation of (attached) actors
2014-02-12 00:13:41 +01:00
Dries Harnie
d54ddfe957 MYST3: Clamp cube textures in the ES2 renderer
This effectively implements GL_CLAMP_TO_EDGE in the shader
for 3D objects, solving the issue described in 61968c6.
2014-02-11 22:32:19 +01:00
Bastien Bouclet
61968c6341 MYST3: Explain the texture size workaround used in the ES2 renderer 2014-02-11 20:11:23 +01:00
Bastien Bouclet
2d37561276 Merge pull request #834 from Botje/myst-es2
MYST3: ES2 backend
2014-02-11 20:04:01 +01:00
Dries Harnie
32a232fd3e EMI: Update shader for actors and sprites [OpenGLS] 2014-02-11 02:30:29 +01:00
Dries Harnie
bd07459667 Merge pull request #825 from PoulpiFr/running-manny
ANDROID: Quick changement to the touchcontrols to let Manny run + Overlay buttons on screen
2014-02-09 23:02:21 +01:00
Dries Harnie
0c7d08cf1a MYST3: Reset viewport in menus 2014-02-08 18:39:57 +01:00
Bastien Bouclet
9d1cfd28c6 MYST3: Don't needlessly center the mouse when changing nodes 2014-02-08 16:48:51 +01:00
Bastien Bouclet
60c2765346 MYST3: Dialog movies are also localized 2014-02-08 16:42:04 +01:00
Dries Harnie
98d04e3516 MYST3: Support Text rendering [OpenGLS] 2014-02-08 11:40:21 +01:00
Dries Harnie
94882742d5 JANITORIAL: Remove g_ prefix from instance variables 2014-02-07 22:41:34 +01:00
Dries Harnie
ac913880be MYST3: Separate renderers into separate classes 2014-02-07 22:41:34 +01:00
Dries Harnie
c13a6613e6 GRAPHICS: Update system_headers.h for regular OpenGL 2014-02-06 18:56:11 +01:00
Dries Harnie
f5549e86a1 MYST3: Move OpenGLTexture into separate file 2014-02-06 18:56:11 +01:00
Dries Harnie
522ef90830 MYST3: Introduce shader-based renderer 2014-02-06 18:56:11 +01:00
Dries Harnie
3accc56e31 BUILD: Conditionally include shaders 2014-02-06 18:56:11 +01:00
Christian Krause
f12647cdca EMI: Fix position of attached actor
When attaching an actor to another one, set its local position
so that its final position (position of the parent actor + the
local position) remains the same as the final position before
it was attached.
2014-02-05 21:35:08 +01:00
Christian Krause
58d7bf116c EMI/GRIM: Fix rotation of attached actors
Use matrix multiplications to fix the rotation for attached actors:
- calculate the final transformation matrix recursively for attached
  actors (instead of using getWorldPos and getWorldRot)
- use a different order for building the quaternions out of the Euler
  angles
- changed handling of camera position (just apply the rotation of the
  camera, the (inverted) position of the camera and the position of the
  actor
- no functional changes for GRIM
- no changes for drawing in overworld

Code simplification for GRIM:
- no need to use _currentPos in calculations for GRIM since it is
always (0, 0, 0)

This fixes:
- the rotation of any items Guybrush is holding in his hands
- the handling of the pole when using the raft in the swamps
- getting the bananas with the banana picker
2014-02-05 21:35:02 +01:00
Joel Teichroeb
dbfd0efab6 GRIM: Don't bother checking if the value returned from new is nulll
It can never be null and will throw an exception if it can't allocate the
memory
2014-02-04 13:07:17 -08:00
Christian Krause
95bceeb216 EMI: Handling of invalid bone names
Two animations (guy_puton_cap, guy_holdstickystuff) contain bone names
which which don't match any joints. To avoid that the holding actor is
drawn with a wrong orientation, ingore the unknown bone names when
running the animations.

Skeleton::getJointNamed() will now return null for unknown names.
The original behaviour for Actor::getWorldPos and
Actor::getRotationQuat is kept.

This patch fixes the problem, that Guybrush is "lying down" once he
holds the bottle of glue.
2014-02-02 14:26:12 +01:00
Dries Harnie
e65d98801e ANDROID: Factor event pushing into pushEvent 2014-02-02 14:25:06 +01:00
Dries Harnie
24d679fa9d ANDROID: Remove unused htc_fail and shake_offset fields 2014-02-02 14:12:28 +01:00
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