2381 Commits

Author SHA1 Message Date
Giulio Camuffo
81427724b9 GRIM: Check _restChore before trying to start it. Fix #100 2011-05-29 19:11:08 +02:00
Giulio Camuffo
e48e9669e7 GRIM: Remove some broken and unuseful code. 2011-05-29 18:27:40 +02:00
Giulio Camuffo
fdd249e438 GRIM: Initialize _anim._time to -1. 2011-05-29 15:46:23 +02:00
Giulio Camuffo
036f4a5b54 GRIM: Hide a sprite if its component fade is 0. 2011-05-29 12:31:23 +02:00
Giulio Camuffo
e548d852db GRIM: Increased savegame version to 16. 2011-05-29 11:42:37 +02:00
Joel Teichroeb
dee8a211ca Reduced code even more. 2011-05-29 11:42:37 +02:00
Giulio Camuffo
f2fcaaec1a GRIM: Save the new things introduced with the recent keyframe commits. 2011-05-29 11:42:36 +02:00
Giulio Camuffo
94530d611c GRIM: Cleanup some other save/restore code. 2011-05-29 11:42:36 +02:00
Giulio Camuffo
411a1f6661 Merge pull request #186 from Akz-/master
GRIM: Implement the rest of KeyframeComponent's keys (values 5 to 12).
2011-05-28 14:47:50 -07:00
Joni Vähämäki
e1df9a3807 GRIM: Implement the rest of KeyframeComponent's keys (values 5 to 12). 2011-05-28 23:55:57 +03:00
Giulio Camuffo
7c952ff420 GRIM: Clean up some code. 2011-05-28 14:46:36 +02:00
Giulio Camuffo
a19449d097 GRIM: Initialize Chore::_fade in Chore constructor, instead in Chore::fade(). 2011-05-28 14:38:07 +02:00
Giulio Camuffo
5d6f3ad2c0 GRIM: Default _fade = 1 when starting to fade a chore. 2011-05-28 12:43:58 +02:00
Giulio Camuffo
3ec45e19ad GRIM: Clean up a bit some save/restore code. 2011-05-28 11:31:12 +02:00
Giulio Camuffo
b5e52e7d01 Merge pull request #185 from Akz-/master
GRIM: Ignore delta if the flag 256 is set in the animation.
2011-05-28 01:48:04 -07:00
Pawel Kolodziejski
6da6d73ef0 Merge pull request #184 from klusark/clean
Clean up some code.
2011-05-28 00:26:21 -07:00
Pawel Kolodziejski
4febbdac82 GRIM: cleanup 2011-05-28 08:49:40 +02:00
Pawel Kolodziejski
152c407a3d ALL: missed changes 2011-05-28 08:49:12 +02:00
Pawel Kolodziejski
65920ffec9 ALL: added residual man 2011-05-28 07:05:57 +02:00
Joel Teichroeb
a42ffed5cb Some cleanup of scene and scene related code. 2011-05-27 16:04:22 -07:00
Joel Teichroeb
934a90d05c Cleaned up actor a bit. 2011-05-27 14:55:08 -07:00
Joni Vähämäki
dc82edc787 GRIM: Ignore delta if the flag 256 is set in the animation. Fixes #80 2011-05-28 00:25:34 +03:00
Giulio Camuffo
b7334b8312 Merge pull request #183 from Akz-/master
GRIM: Animation fixes.
2011-05-27 13:21:43 -07:00
Joni Vähämäki
ca178ac724 GRIM: Update chores in the order in which they are played. 2011-05-27 23:10:27 +03:00
Joni Vähämäki
9f63517dda GRIM: Allow stopping a chore even if it was not playing. Fixes balloon man's animations. 2011-05-27 23:08:15 +03:00
Giulio Camuffo
9c77ab4851 GRIM: Added some 'const's and '&'s. 2011-05-27 21:55:06 +02:00
Giulio Camuffo
5d8efde1ef Merge pull request #182 from Akz-/smoothwalk
GRIM: Smooth walk/turn transition fixes.
2011-05-27 12:23:01 -07:00
Giulio Camuffo
6ccd546689 GRIM: Implemented GetSectorOppositeEdge. Fix #110 2011-05-27 19:27:08 +02:00
Giulio Camuffo
a6189bb7d0 GRIM: Store the sectors in the scene in an ordered way. 2011-05-27 19:06:23 +02:00
Joni Vähämäki
70b3ef2f0b GRIM: Fixed certain combinations of walking/turning having jerky transitions. 2011-05-27 19:15:25 +03:00
Joni Vähämäki
ed4194c367 GRIM: Don't reset the chore's fade value when fading in a chore that was previously fading out. 2011-05-27 19:14:02 +03:00
Joni Vähämäki
1cec00b254 GRIM: Add the unscaled animation weight to the weight sum. 2011-05-27 19:12:39 +03:00
Giulio Camuffo
28a49de60c Merge pull request #178 from Akz-/smoothwalk
GRIM: Smoothly transition between rest, walk and turn animations.
2011-05-26 12:39:39 -07:00
Joni Vähämäki
9b560ce629 GRIM: Stop the walk chore first before fading it in so the animation will always start from the first frame. 2011-05-26 21:13:05 +03:00
Giulio Camuffo
51e6fdfddb GRIM: Compile fix. 2011-05-26 19:19:05 +02:00
Joel Teichroeb
7bee11a09c Made restoreObjects look for old objects. 2011-05-26 19:18:33 +02:00
Giulio Camuffo
c00f915431 GRIM: Simply set _active=false on KeyframeComponent::setKey(5). Fix #158 2011-05-26 18:54:44 +02:00
Giulio Camuffo
87cb7c3acd Merge pull request #180 from klusark/save
Clean up the savegame code somewhat.
2011-05-26 09:46:12 -07:00
Joel Teichroeb
9239271dff Made the functions use correct signed/unsigned. 2011-05-26 09:34:39 -07:00
Joel Teichroeb
cb86bc7892 A bit of cleanup. 2011-05-26 09:27:35 -07:00
Joel Teichroeb
0f3f852c31 Reduced duplicated code in loading and saving. 2011-05-26 09:23:43 -07:00
Giulio Camuffo
ff33c770f5 GRIM: Check if the scene exists before getting its cmap. Fix #166 2011-05-26 18:10:52 +02:00
Giulio Camuffo
0679f6323b GRIM: Actually delete the TextObjects passed to KillTextObject. 2011-05-26 18:02:29 +02:00
Giulio Camuffo
04ac7d972a Merge pull request #177 from Akz-/spritefix
GRIM: Remove the sprite from the node's list of sprites when destructed.
2011-05-26 01:32:07 -07:00
Andrea Corna
4482bd8771 Cleaned some code (thanks to Klusark) 2011-05-26 14:24:04 +08:00
Andrea Corna
970b738e8a GRIM: Prevent a crash if StartFullscreenMovie or StartMovie are called with a non-existant file 2011-05-26 14:23:54 +08:00
Andrea Corna
908b3d7972 GRIM: Fixed an issue on 64-bit machines 2011-05-26 12:29:18 +08:00
Joni Vähämäki
b4c4d5459f GRIM: Smoothly transition between rest, walk and turn animations. 2011-05-25 23:36:10 +03:00
Joni Vähämäki
1184d2318b GRIM: Don't reset the chore's fade value when fading a chore in/out, unless fading in a chore that was not playing already. 2011-05-25 23:35:30 +03:00
Joni Vähämäki
892fa3d995 GRIM: A better fix for removeSprite. 2011-05-25 23:01:25 +03:00