2429 Commits

Author SHA1 Message Date
Ori Avtalion
1574aaa470 GRIM: Fix class/struct mismatch 2011-07-30 11:29:53 +03:00
Giulio Camuffo
b83d432dd7 GRIM: Implemented L1_PreRender(). 2011-07-29 23:02:52 +02:00
Giulio Camuffo
1c62f04688 GRIM: Fix the focus point of the iris. 2011-07-29 22:49:08 +02:00
Giulio Camuffo
59b6af4d18 GRIM: Simplify L1_RotateVector() by using Matrix3. 2011-07-29 21:58:14 +02:00
Giulio Camuffo
6a07ec6331 GRIM: Don't put the start position in the path calculated by walkTo. Fix #302 2011-07-29 21:35:40 +02:00
Giulio Camuffo
8c8587eabc The last modifications about Costume::reset() weren't necessary.
Revert 8ea3e3 and d3b15c
2011-07-29 16:47:47 +02:00
Giulio Camuffo
8ea3e3776d GRIM: Don't reset the components of a chore if it was started right after stopping it. 2011-07-29 16:30:19 +02:00
Giulio Camuffo
5826d46265 GRIM: Some fixes with the lipsync and talk chores. 2011-07-29 16:14:19 +02:00
Giulio Camuffo
d3b15cfa17 GRIM: When stopping a chore reset the components at the next update, not immediately. 2011-07-29 16:13:46 +02:00
Giulio Camuffo
3cc4ae644d GRIM: Take the cmap from the main model component if there is no parent. Fix #309 2011-07-29 15:03:28 +02:00
Giulio Camuffo
32a1815ff9 GRIM: Document some Actor's methods. 2011-07-29 11:08:05 +02:00
Giulio Camuffo
9aa04ad7e8 GRIM: Fading or stopping an animation must not change its paused state. 2011-07-28 22:38:37 +02:00
Giulio Camuffo
497dabe1b0 GRIM: Every material image have its own properties, not shared in all the material. 2011-07-28 22:21:16 +02:00
Giulio Camuffo
c3470d9b16 GRIM: Make a material transparent only if it asks to. Fix #298 Fix #254
This also fixes partially #31, making the hats visible.
2011-07-28 21:36:03 +02:00
Giulio Camuffo
abfa56a336 GRIM: Don't stop the talk chores, but set them at the last frame. Fix #305 2011-07-28 15:52:38 +02:00
Giulio Camuffo
7a8354d429 GRIM: Don't run the stop_talk chore looping. Fix #295 2011-07-28 14:46:51 +02:00
Giulio Camuffo
8eaa2a38a0 GRIM: Reset the value of the developerMode key when loading a save. 2011-07-28 12:38:08 +02:00
Giulio Camuffo
f913542fd5 Merge pull request #306 from somaen/irisOptimization
GRIM: Iris optimization, Fixes #282
2011-07-28 02:00:22 -07:00
Einar Johan T. Sømåen
1ce4441ae8 GRIM: Remove redundant points in irisAround 2011-07-28 07:30:37 +02:00
Einar Johan T. Sømåen
b97c26403a GFX: Formatting 2011-07-28 02:27:48 +02:00
Einar Johan T. Sømåen
8cc9bc5e30 GFX: Formatting 2011-07-28 02:23:05 +02:00
Einar Johan T. Sømåen
1c2c251cd2 GRIM: Also use irisAround for when the entire screen is covered. 2011-07-28 02:22:11 +02:00
Einar Johan T. Sømåen
6c5a960298 GRIM: Add VAO-rendering to irisAround. 2011-07-28 02:13:02 +02:00
Einar Johan T. Sømåen
e529a0b4c5 GRIM: Fix typo in previous commit 2011-07-28 02:11:02 +02:00
Einar Johan T. Sømåen
27fb697036 GRIM: Reduce the points in irisAroundRegion to use 2D-coordinates. 2011-07-28 02:04:56 +02:00
Einar Johan T. Sømåen
3632df14d7 GRIM: Simplify Iris-drawing to one double-for-loop for TinyGL 2011-07-28 01:56:28 +02:00
Einar Johan T. Sømåen
fd95d82ae1 GRIM: Create Iris with TRIANGLE_STRIP for OpenGL 2011-07-28 01:36:27 +02:00
Giulio Camuffo
cc4fcd3ffc GRIM: Reload the shared materials with the new colormap. Fix #299 2011-07-27 18:07:35 +02:00
Giulio Camuffo
075c1cae7d GRIM: Hide the zbuffer bitmap if it doesn't have the wanted image. Fix #296 2011-07-27 16:30:59 +02:00
Giulio Camuffo
2d9b1240ce GRIM: Move the animation code out of costume.cpp. 2011-07-27 15:18:39 +02:00
Giulio Camuffo
33ead92fe6 GRIM: Fix lipsync loading. 2011-07-27 12:09:23 +02:00
Giulio Camuffo
580f8f3881 Revert "GRIM: Compose the fadings on the keyframe animations."
Turned out original doesn't compose the fadings, so it's better
not to do that.
This reverts commit 9c90270ff28693050ba41a8f46255e47a94098b8.
2011-07-27 12:04:36 +02:00
Giulio Camuffo
9c90270ff2 GRIM: Compose the fadings on the keyframe animations. 2011-07-27 11:25:06 +02:00
Giulio Camuffo
f6bb8bc75d GRIM: No need to check for _active there. 2011-07-26 19:06:18 +02:00
Giulio Camuffo
260ef557bd GRIM: Activate manually a keyframe animation when it's faded through a setKey() call. 2011-07-26 19:02:34 +02:00
Giulio Camuffo
78df81f282 GRIM: Don't try to stop the rest chore when it's already stopped. Fix #289 2011-07-26 19:00:35 +02:00
Giulio Camuffo
a71ca9da39 GRIM: Don't activate all the keyframe animations on fadeIn. 2011-07-26 18:55:30 +02:00
Giulio Camuffo
48fb1532db Revert "GRIM: The rest chore must always play. Fix #291"
This reverts commit 131f4415491e12bcec0344c2cafeec00fe7daf5c.
2011-07-26 17:36:00 +02:00
Giulio Camuffo
131f441549 GRIM: The rest chore must always play. Fix #291 2011-07-26 17:21:09 +02:00
Giulio Camuffo
4e42d4558a GRIM: Fix a possible crash when deleting costumes. 2011-07-26 16:44:30 +02:00
Giulio Camuffo
ceb9ddb199 GRIM: Draw the subtitles even if "background" is true. 2011-07-26 16:33:36 +02:00
Giulio Camuffo
341658ec87 GRIM: Stop the actors from walking when chaning set. Fix #289 2011-07-26 16:08:08 +02:00
Giulio Camuffo
3223e3d621 Merge pull request #303 from somaen/irisfix
GRIM: Don't draw the entire Iris when a movie is played. Fixes #293
2011-07-26 06:47:24 -07:00
Einar Johan T. Sømåen
8e9b915c76 GRIM: Don't draw the entire Iris when a movie is played. Fixes #293 2011-07-26 15:10:20 +02:00
Giulio Camuffo
1427f47dd1 GRIM: Don't try to delete the same bitmap twice. 2011-07-26 12:09:54 +02:00
Giulio Camuffo
5d0a6ea56b GRIM: Don't wait for the bounding box if the actor is not in the set. 2011-07-26 00:16:55 +02:00
Giulio Camuffo
30f8df5d3a GRIM: Deleted a piece of code by mistake. 2011-07-26 00:15:48 +02:00
Giulio Camuffo
c3db9b5e86 GRIM: Draw the primitive objects under the actors. #Fix 287 2011-07-26 00:10:27 +02:00
Giulio Camuffo
02d9907657 GRIM: Don't crash if the text object was deleted in the meantime. 2011-07-26 00:07:44 +02:00
Giulio Camuffo
54e1478e85 GRIM: Calculate the bounding box of the meshes only if necessary. 2011-07-25 23:42:07 +02:00