5100 Commits

Author SHA1 Message Date
Joni Vähämäki
f733939a38 EMI: Update _curMusicState also when state 0 is requested. 2014-08-06 19:16:59 +03:00
Joni Vähämäki
358e840817 EMI: Lock when channel state is modified from the game thread. 2014-08-06 19:16:58 +03:00
Joni Vähämäki
d9137d0ad3 EMI: Do not expose the sound handle in SoundTrack. 2014-08-06 19:16:58 +03:00
Joni Vähämäki
e3c6c1d66f EMI: Replace asserts with warning when trying to change parameters of a sound track that doesn't exist. 2014-08-06 19:16:57 +03:00
Joni Vähämäki
f3c5b3619e EMI: Free the sound channel immediately if sound track initialization fails. 2014-08-06 19:16:56 +03:00
Joni Vähämäki
0cd248a9a0 EMI: Move initialization of sound effects to EMISound. 2014-08-06 19:16:56 +03:00
Joni Vähämäki
26779a6206 EMI: Free channels that have finished playing. 2014-08-06 19:16:55 +03:00
Joni Vähämäki
a03a06b0f6 EMI: Initialize EMISound instead of iMuse at engine startup. 2014-08-06 19:16:54 +03:00
Joni Vähämäki
a8d48e2545 EMI: Pass a file path string instead of a file stream to SoundTrack::openSound. 2014-08-06 19:16:53 +03:00
Joni Vähämäki
c4decc05c5 EMI: Parse the first parameter of ImPushState.
This fixes the credits music not playing in the main menu.
2014-08-06 19:16:53 +03:00
Joni Vähämäki
4670ee3508 EMI: Push also the iMuse state number to the state stack. 2014-08-06 19:16:52 +03:00
Joni Vähämäki
b93add8a81 EMI: Music sync value 0 means no synching. 2014-08-06 19:16:51 +03:00
Joni Vähämäki
22413bde1b EMI: Do not cross-fade music if no music track was previously playing. 2014-08-06 19:16:51 +03:00
Joni Vähämäki
b3e1ae41de EMI: Implement fading of sound tracks. 2014-08-06 19:16:50 +03:00
Joni Vähämäki
5e91f17ee0 EMI: Implement synching of music tracks. 2014-08-06 19:16:49 +03:00
Joni Vähämäki
13360aac62 EMI: Parse loop and start cues from .jmm files. 2014-08-06 19:16:49 +03:00
Joel Teichroeb
2eb4e7ebcc Merge pull request #1000 from JoseJX/FixGRIMSave
GRIM: Stop a segfault when saving.
2014-08-06 07:51:43 -07:00
Joseph Jezak
5c6b30adde GRIM: Stop a segfault when saving. 2014-08-06 09:08:17 -04:00
Joel Teichroeb
9d913a83bb EMI: Make sure that all cases are handled in setChoreAndCostume 2014-08-04 22:25:55 -07:00
Joel Teichroeb
9d29a8c966 Merge pull request #998 from Akz-/emi-lighting-fix
EMI: Save and restore light falloff ranges
2014-08-04 14:55:33 -07:00
Joni Vähämäki
a7a79aeb4e EMI: Save and restore light falloff ranges. Fixes #997 2014-08-05 00:44:04 +03:00
Joni Vähämäki
fe87ce80cf EMI: Initialize fields in Light and SetShadow. 2014-08-05 00:42:59 +03:00
Pawel Kolodziejski
39cf2f5586 ALL: Synced with ScummVM 2014-08-04 21:55:19 +02:00
Joel Teichroeb
12f2ef5154 Merge pull request #994 from Akz-/emi-turnactor-fix
EMI: Use getWorldPos instead of getPos in TurnActorTo. Fixes #986
2014-08-03 10:13:18 -07:00
Joni Vähämäki
090e9e266c EMI: Use getWorldPos instead of getPos in TurnActorTo. Fixes #986 2014-08-03 20:07:30 +03:00
Joel Teichroeb
3168f06f43 Merge pull request #991 from Akz-/emi-stopchore-fix
EMI: Ignore fade times longer than 0.6 seconds in StopChore. Fixes #988
2014-08-03 07:41:45 -07:00
Joni Vähämäki
7f3ce45b1c EMI: Ignore fade times longer than 0.6 seconds in StopChore. Fixes #988 2014-08-03 16:46:26 +03:00
Joel Teichroeb
fdf7be33c3 Merge pull request #980 from Akz-/emi-shadows-fix
EMI: Save and restore SetShadow data.
2014-08-02 12:03:47 -07:00
Joel Teichroeb
8eccef7579 Merge pull request #984 from Akz-/emi-chore-fix
EMI: Return false in IsChorePlaying if the chore is paused. Fixes #983
2014-08-02 12:03:28 -07:00
Joni Vähämäki
bc6492a9c2 EMI: Return false in IsChorePlaying if the chore is paused. Fixes #983 2014-08-02 21:59:55 +03:00
Joni Vähämäki
8b754b0de5 EMI: Save and restore SetShadow data. 2014-08-02 20:43:02 +03:00
Joel Teichroeb
3c564db1e3 GRIM: Lower the scope of a lua_beginblock call
In EMI, every time you restore a save game it would begin a new
block, but never close it. If you were to save and load the game
enough times lua throws an error that there are too many blocks
open.
2014-08-01 22:04:53 -07:00
Dries Harnie
1c1b5dde73 EMI: Bump SaveGame MINOR_VERSION to 18
As noted in #977 and #956.
2014-07-31 13:08:41 +02:00
Joel Teichroeb
ae0ddcf171 Merge pull request #976 from JoseJX/FixBoundingBoxes
EMI: Only use the wear chore for finding the screen bounding box.
2014-07-30 21:17:33 -07:00
Joseph Jezak
f0b2c54a56 EMI: Only use the wear chore to find the actor's bounding box. 2014-07-30 20:56:14 -04:00
Joseph Jezak
60fa48490e EMI/GRIM: Rename getBoundingBoxPos to getScreenBoundingBox to better describe the behavior. 2014-07-30 15:23:53 -04:00
Joel Teichroeb
bed29f07b3 EMI: Stub SetReplayMode 2014-07-29 14:53:18 -07:00
Joni Vähämäki
970fa79382 EMI: Read unknown bytes after shadow name. 2014-07-29 13:52:46 -07:00
Joni Vähämäki
91b37f43f1 EMI: Allow PlayLoadedSound with invalid sound id. 2014-07-29 13:38:06 -07:00
Joni Vähämäki
2e3cf9ac2d EMI: Implement WalkActorVector. 2014-07-29 13:37:44 -07:00
Joseph Jezak
44dc44dd58 EMI: Fix shadows on Big Endian machines. 2014-07-29 10:01:08 -07:00
Joseph Jezak
474de51888 EMI: Fix actor lighting on Big Endian machines. 2014-07-29 10:01:00 -07:00
Joel Teichroeb
265f62d3b3 GRIM: Fix build with GLES2 2014-07-28 15:20:57 -07:00
Joel Teichroeb
bfb6b4b5f7 Merge pull request #928 from klusark/fulldemo
GRIM: Fix going to fullscreen in the demo
2014-07-28 10:52:29 -07:00
Joel Teichroeb
61405d6570 Merge pull request #973 from klusark/debug
GRIM: Add a few useful debugger commands.
2014-07-28 10:50:13 -07:00
Joel Teichroeb
dce4203afe Merge pull request #968 from JoseJX/OptimizeTextSetup
EMI: Skip setting up the text when it will be repositioned later.
2014-07-28 10:49:23 -07:00
Joel Teichroeb
b1dd70cb01 GRIM: Add save and load commands 2014-07-28 10:46:55 -07:00
Joel Teichroeb
4654cedc8c GRIM: Add a swap_renderer command 2014-07-28 10:44:32 -07:00
Bastien Bouclet
af44ec1ed3 GRIM: Fix build 2014-07-27 11:49:26 +02:00
Pawel Kolodziejski
8cd68919be MYST3: allow game run in fullscreen 2014-07-24 23:38:06 +02:00