449 Commits

Author SHA1 Message Date
Joni Vähämäki
0bd258be1d EMI: Return the first costume that has a model component in Actor::getCurrentCostume. 2014-08-20 01:36:32 +03:00
Joel Teichroeb
e77f599f1c Merge pull request #1026 from Akz-/emi-sortorder-fix
EMI: Sort order fixes
2014-08-19 15:22:13 -07:00
Joseph Jezak
c0a598e7ad EMI: Remove clamping from prepareTextures. 2014-08-16 19:41:27 -04:00
Joel Teichroeb
d9597d1d36 Merge pull request #1007 from Akz-/emi-sound-position
GRIM/EMI: Positional sound tweaks
2014-08-14 19:02:58 -07:00
Joni Vähämäki
1a038315e4 EMI: Compare the camera-space Z coordinates of actors instead of their Euclidean distance to the camera. 2014-08-14 18:00:00 +03:00
Joni Vähämäki
ec6241fa00 EMI: Fixed implementation of UpdateSoundPosition. 2014-08-14 17:51:08 +03:00
Joni Vähämäki
029b57e3ab EMI: Remap volumes from the range 0-100 to the range 0-255 for the audio mixer. 2014-08-14 17:51:07 +03:00
Joni Vähämäki
d5355e6713 EMI: Fixed sound panning. 2014-08-14 17:51:06 +03:00
Joni Vähämäki
2b2b12cf1d EMI: Adjust attenuation of sounds to match the original game better. 2014-08-14 17:51:05 +03:00
Joni Vähämäki
896fd7cb42 EMI: Recalculate volume and balance for positioned sounds when the setup changes. Fixes #996 2014-08-14 17:50:58 +03:00
Christian Krause
cbbf60d155 EMI: Check another bit in the mesh face flags to enable blending.
Bit 0x40000 in the mesh face flags (set only in the intro) should
enable blending, too. This fix lets the various screens of the intro
fade into each other.
2014-08-14 03:01:12 +02:00
Christian Krause
4204b2649c EMI: clamp specialty textures
The specialty textures which are used in the intro need to be clamped
to avoid dark lines between the tiles.
2014-08-14 02:59:00 +02:00
Joel Teichroeb
64b0baa7a1 Merge pull request #1008 from Akz-/emi-monkeys-fix
EMI: Fix the brass monkeys
2014-08-12 20:47:51 -07:00
Joel Teichroeb
7bdb466eff Merge pull request #1006 from Akz-/emi-ships
EMI: Sprite and shadow fixes
2014-08-12 20:47:48 -07:00
Joni Vähämäki
a5745f1554 EMI: Sort actors by id if distance is equal. 2014-08-12 23:52:15 +03:00
Joni Vähämäki
8d3ef741cd EMI: Print information to debug channel if an unknown sprite or texture flag is encountered. 2014-08-12 17:46:51 +03:00
Joni Vähämäki
18df8a29f8 EMI: Disable lighting for actors that have lightMode == LightNone in OpenGLS. 2014-08-12 17:46:49 +03:00
Joni Vähämäki
055f742ccc EMI: Enable alpha blending if the mesh face flags has the 16th bit set.
This fixes drawing of the shadow mesh in the set unc when Guybrush is under the lights.
2014-08-12 17:46:43 +03:00
Joni Vähämäki
9a87fa5d51 EMI: Parse per-texture blending mode from model data. 2014-08-12 17:46:42 +03:00
Joni Vähämäki
c36f0b377b EMI: Return the effective sort order in GetActorSortOrder. 2014-08-12 17:46:41 +03:00
Joni Vähämäki
ffbba92e0e EMI: Enable drawing of mask sprites. 2014-08-12 17:46:41 +03:00
Joni Vähämäki
baa760d00a EMI: If sort orders are equal, compare distance to camera. 2014-08-12 17:46:40 +03:00
Joni Vähämäki
4797ba9594 EMI: Correctly wrap the animation time when the animation duration is exceeded. Fixes #987 2014-08-12 00:32:31 +03:00
Joni Vähämäki
0ef3d24e15 EMI: Use uint instead of float for animation time. 2014-08-12 00:31:11 +03:00
Joni Vähämäki
338a31ab26 EMI: Initialize _looping in SCXTrack. 2014-08-09 14:14:16 +03:00
Joni Vähämäki
40fd8016dc EMI: Accept .lab suffix when detecting MP3 music. 2014-08-09 14:14:16 +03:00
Joni Vähämäki
faee19636f EMI: Implement ImPause and ImResume. 2014-08-09 14:14:15 +03:00
Joni Vähämäki
c5954a2305 EMI: Make sure the music state id does not exceed the number of entries in the music table. 2014-08-09 14:14:14 +03:00
Paweł Kołodziejski
79354c42c4 Merge pull request #1001 from Akz-/emi-sounds-rebase
EMI: Remove MusicEntry constructors to fix C++98 compile error.
2014-08-07 19:31:59 +02:00
Joni Vähämäki
2264fd7c8e EMI: Remove MusicEntry constructors to fix C++98 compile error. 2014-08-07 13:03:54 +03:00
Joel Teichroeb
67440488ff Merge pull request #964 from JoseJX/FixTextPositions
EMI: Correct problems with text positions and word wrapping.
2014-08-06 09:51:58 -07:00
Joni Vähämäki
468e58b2e8 EMI: Pause loaded sounds also. 2014-08-06 19:43:30 +03:00
Joni Vähämäki
204aed2650 EMI: Save and restore sound track looping status. 2014-08-06 19:43:29 +03:00
Joni Vähämäki
b5e4aa4826 EMI: Refactor EMISound to get rid of the fixed number of channels. 2014-08-06 19:43:28 +03:00
Joni Vähämäki
e08141392e EMI: Replace assert with warning if EMISound runs out of channels. 2014-08-06 19:43:28 +03:00
Joni Vähämäki
9e482d1563 EMI: Initialize the fields of MusicEntry. 2014-08-06 19:43:27 +03:00
Joni Vähämäki
f31ac635a9 EMI: Implement SCXTrack::setLooping. 2014-08-06 19:43:26 +03:00
Joni Vähämäki
93140ed84a EMI: Do not dispose SCX tracks after playing. 2014-08-06 19:43:26 +03:00
Joni Vähämäki
81d00e041f EMI: If the new music track is the same as the previous one, keep playing the previous one. 2014-08-06 19:43:25 +03:00
Joni Vähämäki
685803cc83 EMI: Fix pop at the end of SCX playback. 2014-08-06 19:43:24 +03:00
Joni Vähämäki
5e8d3dad0c EMI: Implement seeking to start position for SCX tracks. 2014-08-06 19:43:24 +03:00
Joni Vähämäki
da2518bdb3 EMI: Add PS2 music table. 2014-08-06 19:43:23 +03:00
Joni Vähämäki
1da4de97ae EMI: Add comment about the mutex in EMISound. 2014-08-06 19:43:22 +03:00
Joni Vähämäki
f198433a69 EMI: Comment saved boolean value which indicates whether the sound channel is active or not. 2014-08-06 19:43:22 +03:00
Joni Vähämäki
25f688764a EMI: Make use of brackets consistent in EMISound::initTrack. 2014-08-06 19:43:21 +03:00
Joni Vähämäki
7c4e942253 EMI: Add comment about disposing of AIFF tracks. 2014-08-06 19:43:20 +03:00
Joni Vähämäki
1f8fe2a4aa EMI: Pass sound name as Common::String& to EMISound's methods. 2014-08-06 19:43:20 +03:00
Joni Vähämäki
f66f218832 EMI: Respect the loop flag passed as parameter to PlayLoadedSound. 2014-08-06 19:43:19 +03:00
Joni Vähämäki
923d33d37b EMI: Always fade in the new music if any previous music tracks are currently fading out. 2014-08-06 19:43:18 +03:00
Joni Vähämäki
5569953f5f EMI: Fix disposing of AIFF sound streams. 2014-08-06 19:43:17 +03:00