5816 Commits

Author SHA1 Message Date
Pawel Kolodziejski
11b457122b ALL: synced with ScummVM 2015-08-16 08:49:02 +02:00
Matthew Hoops
fc33643a38 MYST3: Fix ambient table offsets for the 1.0 binaries 2015-08-16 08:00:49 +02:00
Bastien Bouclet
f4a585b4a3 MATH: Make it clear what Line3d::intersectLine2d does 2015-08-10 21:34:47 +02:00
Bastien Bouclet
aa316b9435 MYST3: Fix some warnings with clang
- Missing override qualifiers
- Unimplemented method declarations
2015-08-10 21:30:06 +02:00
Bastien Bouclet
fc05b87dc9 Merge pull request #1205 from bgK/intersect-line-2d
MATH: Fix Line3d::intersectLine2d to do a line segment intersection test
2015-08-10 21:29:43 +02:00
Bastien Bouclet
f3f4275ad1 MATH: Fix Line3d::intersectLine2d to perform a segment intersection test
It was previously doing a line vs line segment intersection test
2015-08-09 19:19:32 +02:00
Bastien Bouclet
58f8e6426a MYST3: Disable detection for the PS2 versions
The PS2 versions are not working at all. Furthermore,
the detection entries caused AdvancedMetaEngine to output
a misleading error message when the game executable cannot
be found.
2015-07-12 19:55:59 +02:00
Kirben
0872f730eb GRIM: Add Italian Windows demo of Grin Fandango 2015-07-08 16:12:22 +10:00
Kirben
3c08924136 GRIM: Add Spanish Windows demo of Escape from Monkey Island. 2015-07-06 14:59:40 +10:00
Kirben
15654d99a7 GRIM: Add Spanish Windows demo of Grim Fandango. 2015-07-06 13:57:22 +10:00
Bastien Bouclet
4d53b3945a Merge pull request #1200 from Botje/move-opengl
GRAPHICS: Move common OpenGL files to graphics/opengl
2015-06-05 21:16:04 +02:00
Dries Harnie
f843190f69 GRAPHICS: Convert images to RGBA in Graphics::Texture 2015-06-05 09:56:41 +02:00
Dries Harnie
2ff40c4260 Merge pull request #1129 from klusark/devtools
DEVTOOLS: Allways enable langauge extentions for MSVC
2015-05-31 13:23:46 +02:00
Dries Harnie
36c8b3d2d5 GRAPHICS: Move common OpenGL files into graphics/opengl 2015-05-27 10:08:25 +02:00
Dries Harnie
bc80a12978 GRAPHICS: Inherit FrameBuffer from Texture 2015-05-27 10:06:16 +02:00
Dries Harnie
3bbdc2ea06 GRAPHICS: Implement Graphics::Texture class for OpenGL 2015-05-27 10:06:16 +02:00
Bastien Bouclet
8e54a010b4 MYST3: Remove usage of Desktop specific GL features in GLES2 mode
- GL_UNPACK_ROW_LENGTH can only be used when extension GL_EXT_unpack_subimage is available
- GL_UNSIGNED_INT_8_8_8_8_REV does not exist in GLES2
2015-05-26 21:25:01 +02:00
Bastien Bouclet
317cdc55a7 Merge branch 'myst3-xbox' 2015-05-26 21:03:51 +02:00
Bastien Bouclet
23b40041ad MYST3: Filter save files accoring to the platform 2015-05-26 21:03:43 +02:00
Bastien Bouclet
ea3fcdd96f MYST3: Implement dragging using the gamepad
Used in the Xbox version menus
2015-05-26 21:03:43 +02:00
Bastien Bouclet
402517fbee MYST3: Turn some platform checks into generic checks 2015-05-26 21:03:43 +02:00
Bastien Bouclet
b900deb530 MYST3: Play the Xbox version introduction videos 2015-05-26 21:03:36 +02:00
Dries Harnie
e0716bbd96 GRAPHICS: Test for SDL_BACKEND in compatShaders 2015-05-22 13:51:18 +02:00
Christian Krause
c4282b96dd Merge pull request #1194 from chkr-private/emi-chore-fixes
EMI: Keep time of chores and animations in sync
2015-05-19 22:28:03 +02:00
Christian Krause
bbc0e53837 Merge pull request #1189 from chkr-private/animation-fixes
EMI: Start animation when "Loop" key is set
2015-05-19 21:48:22 +02:00
Dries Harnie
43297e6d61 Merge pull request #1197 from chkr-private/layer-fixes
EMI: Fix wrap around of Layers/Frames
2015-05-19 10:22:31 +02:00
Christian Krause
b186c21f85 EMI: Fix wrap around of Layers/Frames
This patch makes sure, that Layer::_frame is smaller than numLayers
of the bitmap in order to prevent out-of-bounds access to
BitmapData::_layers.
2015-05-16 10:39:08 +02:00
Christian Krause
d8ef15acc2 EMI: Keep time of chores and animations in sync
Both the animation components/tracks and the chores itself keep track of
the current time independently:

animation component:
- AnimationStateEmi::_time
- initialized with 0
- after the first update() call, _time is advanced by the frametime

chores:
- Costume::_currTime
- initialized with -1
- during the first update() call, _currTime is set first to 0
- during the next update() call, _currTime is advanced by the frametime

EMICostume::update() updates first the chore and then all components
with the same frame time. This has the effect, that the internal time
base of the chore and the animation has always an initial offset (the
value of the frametime of the first update() call).

For some costumes, the chore will pause the animation by setting the
according key for that animation at the end of the animation. However,
since the animation component has a different time base, it has already
reached that point and may have already disabled itself entirely
(instead of just being paused by the chore).

This bug fix let the animation set _time to 0 in the first update() call, too.
Any consecutive update() call will advance the time by the frametime.
This will keep the two time bases of the chore and the animation component
in sync.
2015-05-15 21:26:01 +02:00
Dries Harnie
52010ff229 GRAPHICS: Silence multiple-definition warnings
Reported by eriktorbjorn on IRC.
2015-05-12 20:56:31 +02:00
Dries Harnie
fb3bd8139a JANITORIAL: Fix Coverity warnings
Fixes coverity warnings 1267220, 1256936, 1229470, 1224097, 1219766,
1054364, 1009896.
2015-05-12 08:49:19 +02:00
Dries Harnie
5c813a8b64 GRAPHICS: Only manually pull pointers if USE_GLEW not defined 2015-05-11 16:57:05 +02:00
Dries Harnie
9e1b0f1516 BUILD: Promote GLEW to configure option
# Conflicts:
#	backends/graphics/surfacesdl/surfacesdl-graphics.cpp
2015-05-11 16:56:56 +02:00
Joel Teichroeb
f0098e268f Merge pull request #1193 from chkr-private/textobject-draw-order-fixes
EMI: Correct draw order of textobjects
2015-05-11 07:22:14 -07:00
Christian Krause
be771ab454 EMI: Correct draw order of textobjects
Instead of just ordering the textobjects by their layer, use their
creation time (indirectly provided by the pool ID which is continuously
counting up).

This ensures that if there are multiple textobjects with the same text
ID and the same layer, that the latest is drawn last and overwrites the
previous ones.

That's necessary since the LUA code will create multiple instances of
the same textobject for the color fading effect in the credits.
2015-05-09 16:32:26 +02:00
Christian Krause
f7a5e8ad15 Merge pull request #1192 from chkr-private/layer-fixes
Implement drawing of dynamically created layers
2015-05-09 16:28:05 +02:00
Christian Krause
2fece8b8d7 EMI: Enable drawing of dynamic Layer objects
This patch enables drawing of Layer objects which are
dynamically created by LUA code.

All three sorted lists (background images, layers and actors) are
merged based on their sort-order.
2015-05-05 23:31:20 +02:00
Christian Krause
06df5f599f EMI: Layer::getSortOrder can be called in const context 2015-05-05 23:27:23 +02:00
Christian Krause
e77b5f46b1 GRAPHICS: Allow tiles with just one sub-image
Remove an error() call in BitmapData::loadTile when the number
of sub-images is smaller than 5. The code can handle such
bitmaps/tiles already.
2015-05-05 23:23:41 +02:00
Christian Krause
09bb2d7b0d EMI: Fix sanity check in Lua_V2::SetLayerSortOrder
Correct typo in sanity check and add an error message for
wrong parameters.
2015-05-05 23:22:42 +02:00
Christian Krause
d7e7ee214d GRAPHICS: Enable drawing of bitmaps/tiles with just one sub-image
Instead of using the number of sub-images to decide whether bitmaps
should be drawn using TIL information, better use the existance
of texture coordinates which are distinctive for tiles.
2015-05-05 23:19:16 +02:00
Dries Harnie
a518480359 GRIM: Fix abs->fabsf compiler warning 2015-05-05 18:37:30 +08:00
Dries Harnie
a051070b78 GRAPHICS: Disable extra attributes bound by a previous shader [OpenGLS]
When switching between shaders, the previous shader might have Y
attributes, while the current shader only has X, with X < Y. The extra
attributes will not be used by the shader, but the driver might attempt
to read from the bound FBOs anyway. OSX's OpenGL profiler stumbles over
this.
2015-05-05 18:35:02 +08:00
Einar Johan Trøan Sømåen
11ca8cca47 Merge pull request #1184 from vpelletier/controls
GRIM: Exit input handling after processing alt-return combo.
2015-05-03 16:08:47 +02:00
Christian Krause
409a6f7b95 EMI: Start animation when "Loop" key is set
This fixes the problem if the costume uses only key 3 ("Loop") but not
key 1 ("Play") for an animation. This happens e.g. for Pegnose's "run" chore.
2015-05-03 03:31:08 +02:00
Dries Harnie
9f6697227e EMI: Move GetSphereInfo warning to Actors channel 2015-04-28 17:01:37 +02:00
Dries Harnie
1d715329c2 Merge pull request #1187 from chkr-private/opengls-emi-fixes
GRAPHICS: Set uniform parameters for _spriteProgram
2015-04-28 16:57:55 +02:00
Dries Harnie
4955a71424 Merge pull request #1188 from chkr-private/opengls-fixes
GRAPHICS: Remove unused shader uniform variables
2015-04-28 16:52:15 +02:00
Christian Krause
a2e1c64d36 Merge pull request #1176 from chkr-private/screen-texture-lighting-fixes
EMI: Check bit in mesh face flags to disable lighting
2015-04-27 22:21:03 +02:00
Christian Krause
c2060b1649 GRAPHICS: Set uniform parameters for _spriteProgram
Set the uniform parameter for _spriteProgram
since they are needed by emi_actor.{fragment,vertex}
in drawSprite().
2015-04-27 21:46:16 +02:00
Christian Krause
4b8fcda1a1 GRAPHICS: Remove unused shader uniform variables 2015-04-27 21:01:42 +02:00