Pawel Kolodziejski
1a07a23294
ALL: synced with ScummVM
2014-08-18 05:21:52 +02:00
Joseph Jezak
c0a598e7ad
EMI: Remove clamping from prepareTextures.
2014-08-16 19:41:27 -04:00
Stefano Musumeci
23385b3a4a
TINYGL: Fixed compiler warnings.
2014-08-16 16:04:20 +02:00
Stefano Musumeci
957fa20c30
GRIM: Replaced magic value with constant.
2014-08-16 16:04:00 +02:00
Stefano Musumeci
2cf70d6d76
Merge branch 'master' into tinygl-dirty-rects-fixed
...
Conflicts:
graphics/tinygl/ztriangle.cpp
2014-08-16 16:03:27 +02:00
Paweł Kołodziejski
1eebd1139f
Merge pull request #1024 from JoseJX/FixTinyGLFont
...
EMI: Fix font rendering with TinyGL.
2014-08-15 16:28:28 +02:00
Joseph Jezak
4a02e3af42
EMI: Fix font rendering with TinyGL.
2014-08-15 10:06:08 -04:00
Pawel Kolodziejski
e539b27af8
MATH: improve type support for viewport argument
2014-08-15 12:25:48 +02:00
Joel Teichroeb
361eb89e57
Merge pull request #1025 from JoseJX/FixESCAtSave
...
EMI: Fix segfault when cancelling a save.
2014-08-14 19:04:59 -07: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
Bastien Bouclet
db2b418569
MYST3: Fix the inventory item count not being saved
2014-08-14 20:56:03 +02:00
Joel Teichroeb
2bf1340a25
Merge pull request #1023 from chkr-private/intro-fixes
...
Intro fixes
2014-08-14 09:27:52 -07: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
b8ab52d06f
GRIM/EMI: Do not do 3D positioning for voices.
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
Joseph Jezak
1e6018dd1f
EMI: Fix segfault when cancelling a save.
2014-08-14 10:49:25 -04:00
Pawel Kolodziejski
f1c29914cf
GRIM: fixed entries of polygon creation
2014-08-14 07:51:13 +02: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
Bastien Bouclet
d6f88cb46f
MYST3: Make sure the script for loops reach their bounds
...
Fixes slightly wrong gauge value for the voltaic valves puzzle
2014-08-13 22:25:16 +02:00
Stefano Musumeci
8969247730
TINYGL: Fixed minor style issues.
2014-08-13 21:00:18 +02:00
Stefano Musumeci
d0ce4482f9
GRIM: Changed the way strings are rendered.
2014-08-13 15:39:03 +02:00
Stefano Musumeci
8abb5b008c
Merge branch 'master' into tinygl-dirty-rects
...
Conflicts:
graphics/tinygl/zbuffer.cpp
graphics/tinygl/zbuffer.h
2014-08-13 14:06:34 +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
40f5f7360f
EMI: Fix alpha test in OpenGLS.
2014-08-12 17:46:50 +03:00
Joni Vähämäki
1de77d8625
EMI: Fix matrix concatenation order when drawing sprites in OpenGLS.
2014-08-12 17:46:49 +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
09b062acdd
EMI: Parse light name from shadow data.
2014-08-12 17:46:47 +03:00
Joni Vähämäki
3df07c384e
EMI: Fix parsing of sprite flags. Fixes #960
2014-08-12 17:46:47 +03:00
Joni Vähämäki
6b7b6fa6e5
EMI: Do not disable writing to color buffer if an actor's sort order is >= 100.
...
Fixes invisible Guybrush in the set unc.
2014-08-12 17:46:46 +03:00
Joni Vähämäki
398f2afa98
EMI: Always write sprites to the depth buffer.
2014-08-12 17:46:45 +03:00
Joni Vähämäki
ee24b2c12f
EMI: Parse sprite Z offset.
2014-08-12 17:46:44 +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
de049e0eaf
EMI: If a sort order is specified for an actor that is attached to another, use the specified sort order instead of the parent's one.
2014-08-12 17:46:36 +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
Pawel Kolodziejski
eee0d30886
MYST3: use number of components 3 for TinyGL
2014-08-11 20:14:24 +02:00
Joel Teichroeb
9b0429042e
Merge pull request #1003 from Akz-/emi-sounds-rebase
...
EMI: Fix demo crashes
2014-08-10 21:35:22 -07:00
Stefano Musumeci
a59c1de0ff
TINYGL: Fixed misspelt function name.
2014-08-10 19:05:32 +02:00
Joni Vähämäki
963ce52902
EMI: Only update sector sort order if the actor is following walkboxes.
2014-08-10 18:51:37 +03:00