libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-06 02:46:49 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4,719 Commits 6 Branches 5 Tags
Commit Graph

4719 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Pelletier
295e27ea3e GRIM: Do not truncate SetGamma parameter decimals. 2014-05-31 17:06:07 +02:00
Joel Teichroeb
12d1d629ce Merge pull request #886 from klusark/c++11 
Use nullptr and override throughout the code
 2014-05-30 17:46:31 -07:00
Joel Teichroeb
21ca0acedc GRIM: Add override to overriden functions 2014-05-30 17:45:22 -07:00
Joel Teichroeb
0f3da43694 GRIM: Change NULL to nullptr. 2014-05-30 17:43:08 -07:00
Joel Teichroeb
6a3103a9ee Merge pull request #885 from Akz-/animations 
EMI: Animation priority, blending and fixes
 2014-05-30 17:35:31 -07:00
Joni Vähämäki
765ecf7870 EMI: Implemented PlayChore and PauseChore. 2014-05-31 03:05:32 +03:00
Joni Vähämäki
95c4650706 EMI: Chore duration 1000 means the chore should play infinitely. 2014-05-31 03:05:31 +03:00
Joni Vähämäki
3e322b67ba Revert "EMI: Fix missing hold chores" 
This reverts commit 863b33e803f17503d5983a9f99cdd8dd71ec7543.

Conflicts:
	engines/grim/actor.cpp
	engines/grim/actor.h
	engines/grim/costume.cpp
	engines/grim/costume.h
	engines/grim/costume/chore.h
	engines/grim/emi/costumeemi.cpp
	engines/grim/emi/costumeemi.h
 2014-05-31 03:05:30 +03:00
Joni Vähämäki
b14b9856d6 EMI: Fixed implementation of AdvanceChore. 2014-05-31 03:05:30 +03:00
Joni Vähämäki
e6bc1430ca EMI: Never fade rest chores. 2014-05-31 03:05:29 +03:00
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
Joel Teichroeb
ee412e972b ALL: Fix merge 2014-05-24 22:53:30 -07: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
698f6434d5 Merge pull request #867 from larsmans/fix 
TINYGL: rename variable to get rid of warning
 2014-05-18 17:30:27 +02:00
Lars Buitinck
e5e2c3701a TINYGL: rename variable to get rid of warning 2014-05-18 16:26:09 +02: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
97ef97841c BINK: Fix #863, seeking to frame 0 triggers an assertion 
It would create and use a negative (invalid) Audio::TimeStamp
 2014-05-01 07:35:19 +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
Dries Harnie
dbf3b2e5f8 JANITORIAL: Fix missing reference in Math::{Line2d,Angle} 2014-04-21 14:22:01 +02:00
Dries Harnie
332fa1d52d ANDROID: Use extensions to query NPoT textures 2014-04-21 12:00:41 +02:00
Dries Harnie
aa90e6848f GRAPHICS: Only use packed depth-stencil framebuffer if extensions allow it 2014-04-21 12:00:41 +02:00
Dries Harnie
9f6cae54af GRAPHICS: Add OpenGL extension registry 2014-04-21 12:00:41 +02:00
Pawel Kolodziejski
2c022ad8f7 ALL: sync with ScummVM 2014-04-19 08:12:15 +02:00
Pawel Kolodziejski
afca9b825b CREDITS: updates 2014-04-19 08:00:34 +02:00
Pawel Kolodziejski
c1a5353613 VIDEO: fix compiler warning 2014-04-19 07:02:08 +02: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
Joel Teichroeb
d53c54596f GRIM: Correctly disable an override in the set tg. Fixes #861 2014-04-11 13:56:36 -07:00