2161 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
Joni Vähämäki	08e1f09f25	GRIM: Fixed removeSprite not removing the first sprite in the linked list.	2011-05-25 22:51:12 +03:00
Joni Vähämäki	1d9d066cd5	GRIM: Remove the sprite from the node's list of sprites when destructed.	2011-05-25 22:01:40 +03:00
Pawel Kolodziejski	bc256bbdfc	Merge pull request #173 from Akz-/animfix ... GRIM: Animation fixes.	2011-05-24 21:38:07 -07:00
Pawel Kolodziejski	34264d755d	Merge pull request #175 from klusark/master ... Only get speach position when speach is enabled.	2011-05-24 21:34:59 -07:00
Pawel Kolodziejski	365cbbd229	Merge pull request #172 from klusark/work ... Add support for lua sending text to the background.	2011-05-24 21:31:00 -07:00
Joel Teichroeb	414372292f	Only get speach position when speach is enabled.	2011-05-24 21:07:55 -07:00
Joni Vähämäki	cd389d9488	GRIM: Fixed removeActiveAnimation not correctly iterating through all of the animations in the list.	2011-05-25 00:18:23 +03:00
Joni Vähämäki	a6a3b5e28a	GRIM: Fixed animation not being correctly added to the list of active animations on save restore.	2011-05-25 00:16:01 +03:00
Joni Vähämäki	d095dd96e3	GRIM: Only add the weight to the weight sum if the node was really animated.	2011-05-25 00:12:47 +03:00
Joni Vähämäki	a64fe9f69d	GRIM: Code formatting fixes.	2011-05-25 00:10:45 +03:00
Joel Teichroeb	915fc302bd	Add support for lua sending text to the background.	2011-05-24 12:55:22 -07:00
Giulio Camuffo	86014e7f65	Merge pull request #171 from Akz-/animation ... GRIM: Apply animations in priority order.	2011-05-24 12:21:09 -07:00
Joni Vähämäki	7dfc5d8f28	GRIM: Set value of _active inside the activate/deactivate methods.	2011-05-24 20:38:41 +03:00
Joel Teichroeb	c357c1a45f	Tell all the children that their parent is gone.	2011-05-25 01:32:24 +08:00
Pawel Kolodziejski	ce3ceeac71	Merge pull request #169 from JenniBee/mingw32_compile ... fixing compilation on mingw32	2011-05-24 10:24:26 -07:00
Joni Vähämäki	9f200ca16f	GRIM: Add back the c_str() to warning prints that print out the filename of keyframes.	2011-05-24 20:18:17 +03:00
JenniBee	7e63184810	fixing compilation on mingw32	2011-05-24 13:03:59 -04:00
Joni Vähämäki	6a40b43f16	GRIM: Apply animations in priority order.	2011-05-24 19:47:39 +03:00
Giulio Camuffo	d1d0dfe909	GRIM: Expire the TextObjects only when the speech mode is TextOnly or a movie is playing.	2011-05-23 19:26:46 +02:00
Giulio Camuffo	82ad8ee365	GRIM: Init Scene::_lightsConfigured.	2011-05-23 19:18:20 +02:00