Commit Graph

2621 Commits

Author SHA1 Message Date
Joni Vähämäki
a180b3b562 EMI: Chore fading fixes.
Fading out chores remain in playing state until they have completely faded out. Also using StopChore on a fading out chore will actually stop the chore, unlike in Grim where the chore will keep fading out.
2014-05-31 03:05:17 +03:00
Joni Vähämäki
4acfb933e9 EMI: Implemented rest of animation component keys. 2014-05-31 02:51:54 +03:00
Joni Vähämäki
c0c80e0624 EMI: Fixed talk chore index 0 being ignored by SetActorTalkChore. 2014-05-31 02:51:53 +03:00
Joni Vähämäki
ab1631e6ef EMI: Fade talk chores. 2014-05-31 02:51:46 +03:00
Joni Vähämäki
f151ce8e2d EMI: Fade chores if PlayChore/StopChore specifies a fade time. 2014-05-31 02:51:45 +03:00
Joni Vähämäki
4ece29c91e EMI: Never stop the rest chore. 2014-05-31 02:51:44 +03:00
Joni Vähämäki
47aa1ace87 EMI: Added support for animation priorities and implemented blending. 2014-05-31 02:50:06 +03:00
Dries Harnie
4ac3885224 EMI: Use Lua debug channel for luavar debug prints 2014-05-29 14:08:51 +02:00
Dries Harnie
5c0d145509 EMI: Fix dark lines in the intro
Taken from #854 and #735.
2014-05-29 13:58:51 +02:00
Einar Johan Trøan Sømåen
a7b78f72f7 Merge pull request #852 from JoseJX/DemoMovieSkip
EMI: Allow the user to skip the intro movie in the EMI Demo.
2014-05-28 00:49:08 +02:00
Joseph Jezak josejx@gentoo.org
e021febdce EMI: Makes ESC the only active key during movies. 2014-05-27 10:49:10 -04:00
Joel Teichroeb
d2b8ff5a61 Merge pull request #884 from JoseJX/AddActorStopMoving
EMI: Add a stopWalking() call to ActorStopMoving. Fixes #880.
2014-05-25 18:05:55 -07:00
Joseph Jezak josejx@gentoo.org
d98282e6cc EMI: Add a stopWalking() call to ActorStopMoving. Fixes #880. 2014-05-25 21:00:42 -04:00
Pawel Kolodziejski
2f1a4f7b7b ALL: synced with ScummVM 2014-05-25 07:13:28 +02:00
Joel Teichroeb
f3400181f8 Merge pull request #882 from JoseJX/FixMissingBackgroundSegfault
EMI: Load default image when missing a background bitmap. Fixes #881
2014-05-22 19:26:05 -07:00
Joseph Jezak josejx@gentoo.org
190dbfacb2 EMI: Load default room image when missing a background bitmap. Fixes #881. 2014-05-22 22:24:39 -04:00
Joseph Jezak josejx@gentoo.org
6951b5c0ee EMI: Remove setYaw. 2014-05-19 15:40:24 -07:00
Dries Harnie
9ec4a897ee MISC: Fix typo in comment 2014-05-05 15:00:39 +02:00
Bastien Bouclet
2284c5c9ed MYST3: Movies need to be drawn in reverse add order
This fixes MATO7 and MALL18
2014-05-03 08:49:36 +02:00
Christian Krause
6fb485f382 Merge pull request #864 from chkr-private/texture-fixes
EMI: Change drawing order of faces
2014-05-03 00:28:50 +02:00
Christian Krause
47251c0c09 EMI: Change drawing order of faces
If multiple faces of one model are referring to the same triangles, let
them overwrite each other so that the latest one will be visible. For
this purpose glDepthFunc is changed from GL_LESS to GL_LEQUAL so
that subsequent drawing attempts for the same triangle are not ignored by
the depth test.

This fixes the issue of the colored leg of the monkey bot in the end
scenes: the leg is drawn using color maps by the first face and using
textures by a following face.
2014-05-03 00:22:35 +02:00
Bastien Bouclet
1246353ee2 MYST3: Fix spotitems not being undrawn in areas without water effect 2014-05-02 20:44:05 +02:00
Bastien Bouclet
51e9f5be3f MYST3: Add the lava effect 2014-05-01 07:15:10 +02:00
Bastien Bouclet
149c6c58ae MYST3: Define the variables used by the lava effect 2014-05-01 07:15:10 +02:00
Joel Teichroeb
e40efc5dfd EMI: Add the NTSC PS2 artMel.m4b md5
It seems that this one file differs between editions.
2014-04-24 17:25:58 -07:00
Pawel Kolodziejski
1745f0caad EMI: fix compiler warnings 2014-04-19 06:58:59 +02:00
Pawel Kolodziejski
b82e7a20f9 MYST3: fix compiler warning 2014-04-19 06:51:55 +02:00
egetesla
1f8b0263c3 GRIM: Merge iMuse and EMI sound warnings into a new "Sound" channel 2014-04-12 17:16:08 +02:00
Joseph Jezak josejx@gentoo.org
ed44e64369 EMI: Allow actors to be hidden by a call to set_wear_chore(nil). 2014-04-06 17:50:31 -04:00
Joel Teichroeb
1aa417fac6 Merge pull request #857 from JoseJX/FixActorAttach
EMI: Swap actors to remove the sign when calculating the position.
2014-04-05 12:51:12 -07:00
Pawel Kolodziejski
8759900b6a ALL: synced with ScummVM 2014-04-05 18:18:42 +02:00
Joseph Jezak josejx@gentoo.org
3ed29bf92c EMI: Swap actors to remove the sign when calculating the position. 2014-04-05 00:36:57 -04:00
Joel Teichroeb
d1f1e26812 Merge pull request #853 from JoseJX/FixActorAttach
EMI: Fix the attached actor's position when attaching two actors.
2014-04-04 18:18:27 -07:00
Joseph Jezak josejx@gentoo.org
3feeeb124e EMI: Fix the attached actor's position coordinates. 2014-04-03 06:41:21 -04:00
Dries Harnie
b0fd0d3edc GRAPHICS: Image format must match internalformat for ES2 2014-04-02 20:38:15 +02:00
Dries Harnie
5dcf795fd7 GRAPHICS: Remove use of glMapBuffer (extension) 2014-04-02 20:38:15 +02:00
Joel Teichroeb
cf44a26ff9 GRIM: Instead of using a assignment operator, just steal the data
This avoids potential memory leaks.
2014-03-30 15:33:27 -07:00
Joel Teichroeb
a010e06bec GRIM: Make data in MeshFace private 2014-03-30 14:38:52 -07:00
Joel Teichroeb
2b90b75f87 GRIM: Make copyMeshFace an assignment operator 2014-03-30 14:20:47 -07:00
Joel Teichroeb
06546bd96d GRIM: Clean up the MeshFace code 2014-03-30 14:02:32 -07:00
Joni Vähämäki
e7f895e248 EMI: Allow StopChore without fade time parameter. 2014-03-26 18:52:02 +02:00
Joni Vähämäki
13c86cc8af EMI: Implement keys for the animation component.
Key 3 seems to control whether the animation loops or not. If key 3 is not
set, the animation plays once and then deactivates. If the key is set, the
animation will repeat until the chore is stopped.
2014-03-26 18:51:51 +02:00
Joni Vähämäki
5a95dfd48d EMI: Fixed interpolation between animations and cleaned up the related code. 2014-03-26 14:08:36 +02:00
Ingo van Lil
51c59ab6ed EMI: Display subtitles with TinyGL
In EMI the screen is dimmed while playing movies. The blit() function in
TinyGL is required to work in that case so that movie subtitles are
displayed.
2014-03-22 10:37:40 -07:00
Ingo van Lil
4a87ea3962 EMI: Hide subtitle when stopping movie playback 2014-03-22 10:37:31 -07:00
Joel Teichroeb
1891f4c9a4 Merge pull request #840 from klusark/ActionChore
GRIM: Rename Actor::Chore to Actor::ActionChore
2014-03-22 10:34:51 -07:00
Bastien Bouclet
c25069b110 MYST3: Implement the resonance rings effect 2014-03-15 10:51:07 +01:00
Bastien Bouclet
d495731508 MYST3: Add the update phase of the resonance rings effect 2014-03-15 10:51:07 +01:00
Bastien Bouclet
59e8a4de41 MYST3: Implement retreiving the elapsed time for looping sounds 2014-03-15 10:51:07 +01:00
Bastien Bouclet
60276d6ba7 MYST3: Implement the volume settings 2014-03-15 10:51:07 +01:00