ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,750 Commits 45 Branches 139 Tags
eb26094de17387f2677ce882192ff543c10e1155
Commit Graph
4750 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joni Vähämäki eb26094de1 EMI: Move methods that require animation state information from AnimationEmi to AnimationStateEmi. 2014-06-15 03:13:30 +03:00
Joni Vähämäki af7bc0679c EMI: Use a hash map for joint lookup by name. 2014-06-15 03:13:29 +03:00
Joel Teichroeb 08f6e8195d Merge pull request #891 from Akz-/grim-lookat-fix 
GRIM: If ActorLookAt is called with an actor as the target, look towards...
 2014-06-11 16:59:41 -07:00
Joel Teichroeb 42c5b0f16b Merge pull request #921 from Akz-/emi-contract-fix 
EMI: Enable backface culling. Fixes #900
 2014-06-11 13:13:18 -07:00
Joni Vähämäki d80c84ad97 EMI: Enable backface culling. Fixes #900 2014-06-10 22:51:24 +03:00
Dries Harnie a2d57c88a9 MISC: Add COPYING.MIT 2014-06-10 19:29:04 +02:00
Dries Harnie a463d5ebef MISC: Add copyright notice from glm 2014-06-10 19:28:45 +02:00
Dries Harnie 99bab131bb MISC: Add copyright notice from glm 2014-06-10 19:05:47 +02:00
Joel Teichroeb 8f7ce221dc GRIM: Refactor SetAmbientLight 2014-06-09 14:27:41 -07:00
Joni Vähämäki e7b57bdff2 EMI: Save and restore animation states. Fixes #902 2014-06-05 08:12:49 -07:00
Joel Teichroeb 7df2d49dc5 EMI: Draw primitives last. Fixes #906 2014-06-05 07:50:49 -07:00
Joel Teichroeb 64621fc223 EMI: Implement changing line enpoints 2014-06-05 07:50:49 -07:00
Dries Harnie df517ea6fc EMI: Implement WorldToScreen 2014-06-05 07:50:49 -07:00
Dries Harnie 23e5e206c7 GRIM/EMI: Add proj/view matrix calculation to GfxBase 2014-06-05 07:50:48 -07:00
Dries Harnie 54494e860c MYST3: Fix pointer to local variable issue. 
Fixes coverity issue #1195422.
 2014-06-05 14:41:43 +02:00
Joel Teichroeb d3fd2c8ff5 Merge pull request #893 from vpelletier/fix_lights 
Improve light intensity
 2014-06-03 11:21:38 -07:00
Joel Teichroeb ec026ecba4 GRIM: Remove usless setColormap line 
The code in pushCostume and the behavior for setColormap(NULL) has been
unchanged since 0.1.0, so there are probably no unintended consiquences
and the functionality should not change without this line.
 2014-06-02 18:56:33 -07:00
Joel Teichroeb 4aa61146c6 GRIM: Convert a few more NULLs 2014-06-02 16:59:09 -07:00
Einar Johan Trøan Sømåen a563dff4ad Merge pull request #892 from vpelletier/lua_logging 
Trivial lua debug logging cleanups
 2014-06-02 15:36:08 +02:00
Vincent Pelletier b2fcde697a GRIM: Set a spot exponent to simulate DirectX's penumbra. 
Effect is especially visible near set do's window.
 2014-06-01 23:13:10 +02:00
Vincent Pelletier 446c40384f GRIM: Use specular lighting. 
A few sets where spot lights are present: hq (elevator, projector),
do (window), al (light above garage door).
 2014-06-01 23:13:03 +02:00
Vincent Pelletier f9bc96a649 GRIM: Always set light's GL_SPECULAR. 2014-06-01 23:13:00 +02:00
Joel Teichroeb 684f51f7f3 EMI: Add missing break 2014-06-01 11:13:01 -07:00
Joel Teichroeb 2920822e60 EMI: Add missing else 2014-06-01 11:12:52 -07:00
Joel Teichroeb 4131513ae7 GRIM: Don't check against null before deleting 2014-06-01 11:12:44 -07:00
Vincent Pelletier e9ba4fe99c GRIM: Make lua Print(Error|Warning) use consistent debug channels. 2014-05-31 17:06:07 +02:00
Vincent Pelletier afbb526691 GRIM: Lua Print(Debug|Warning|Error) caller provides newline. 2014-05-31 17:06:07 +02:00
Vincent Pelletier 295e27ea3e GRIM: Do not truncate SetGamma parameter decimals. 2014-05-31 17:06:07 +02:00
Vincent Pelletier 38dbea6082 GRIM: Replace intensity divisor with attenuation. 2014-05-31 17:04:02 +02:00
Vincent Pelletier bc520bc5e1 GRIM: Disable GL_LIGHT0's default specular component. 2014-05-31 17:04:01 +02:00
Vincent Pelletier d7ebff2ac3 GRIM: Use GLfloat instead of float when passed to gl* functions. 2014-05-31 17:04:01 +02:00
Joni Vähämäki de3c68d89c GRIM: If ActorLookAt is called with an actor as the target, look towards the actor's head instead of their origin. Fixes #887 2014-05-31 15:59:55 +03: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 863b33e803.

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