154 commits

Author	SHA1	Message	Date
Chris Robinson	f57c829cba	Play the appropriate swish sound and follow-up animation	2013-08-02 00:21:02 -07:00
scrawl	7dc30a01cd	Some changes suggested by cppcheck	2013-07-31 18:46:32 +02:00
Chris Robinson	4ad28ed369	Don't play a weapon-down sound when unreadying a spell	2013-07-25 00:46:20 -07:00
Chris Robinson	0db02af807	Set up the weapon state in the CharacterController constructor	2013-07-24 21:08:16 -07:00
Chris Robinson	705498ec24	Play a swish sound when attacking	2013-07-24 10:34:53 -07:00
Chris Robinson	bf1d907d07	Don't play casting animations for enchantments	2013-07-24 05:39:15 -07:00
Chris Robinson	cc8e8c1272	Use the attack strength as determined by how long the attack was held	2013-07-24 03:18:53 -07:00
Chris Robinson	11b094559f	Play the appropriate casting animation sound	2013-07-23 11:12:19 -07:00
Chris Robinson	17282c69b1	Handle spell-casting animation sequences	2013-07-23 07:30:54 -07:00
Chris Robinson	4d157cb19a	Handle marksmen weapon attack sequences	2013-07-23 06:13:08 -07:00
Chris Robinson	d5d832846e	Rename the follow-up upper character state enum	2013-07-23 04:56:49 -07:00
Chris Robinson	24567294ff	Move NPC state update handling into a separate method	2013-07-23 03:26:24 -07:00
Chris Robinson	22e07968af	Store the current weapon group name	2013-07-23 02:50:52 -07:00
Chris Robinson	0240efa6cf	Improve weapon attack logic to better handle picks, probes, and h2h	2013-07-23 02:28:58 -07:00
Marc Zinnschlag	ec575200e3	Merge remote-tracking branch 'gus/MeleeCombat2' ... Conflicts: apps/openmw/mwrender/animation.cpp	2013-07-23 09:12:23 +02:00
Chris Robinson	9c13568bb7	Remove idles from the state list and rename it	2013-07-18 01:49:53 -07:00
Chris Robinson	e803cdbe7f	Handle swimdeath and missing death animations	2013-07-18 01:13:53 -07:00
Chris Robinson	f01b0b48cc	Don't start with an idle state if dead	2013-07-18 00:35:03 -07:00
Chris Robinson	e78bdd2a5d	Clear 'swim' from the animation name as a backup instead of 'sneak'	2013-07-18 00:22:40 -07:00
Chris Robinson	0cd4df3edf	Stop playing idles on death	2013-07-17 02:19:22 -07:00
Chris Robinson	e2e278d06d	Fix some animations not playing properly ... Default movement animation speed multiplier should be 1, not 0. Only randomize death1...death5 for NPCs.	2013-07-17 02:06:31 -07:00
scrawl	dfe912dcab	Enum renaming	2013-07-16 23:38:55 +02:00
scrawl	91e95e1404	Use the correct slash, chop or thrust animation	2013-07-16 23:32:41 +02:00
gus	66e3eacace	fix bows	2013-07-16 15:14:34 +01:00
gus	701ff94887	bugfix for lockpick	2013-07-16 14:46:44 +01:00
gus	20341ae8b7	simplification + taking into account weapon speed. Seems too fast, but i'm not sure	2013-07-16 14:10:14 +01:00
gus	8fc6e73649	post-merge fix	2013-07-16 11:51:18 +01:00
gus	ee47e99dad	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into MeleeCombat2 ... Conflicts: apps/openmw/mwmechanics/character.cpp apps/openmw/mwmechanics/character.hpp	2013-07-16 11:40:19 +01:00
gus	f6e3445414	Jittering gone + bugfix: chop animation works! ... TODO: fix this unequip stuff	2013-07-16 09:50:59 +01:00
Chris Robinson	a932a89e02	Specify the velocity-based animation speed multiplier when playing it	2013-07-16 01:30:03 -07:00
Chris Robinson	f296d13c20	Add a speed multiplier to the animation state	2013-07-16 00:43:31 -07:00
Chris Robinson	06e631f213	Track death separately in the character controller	2013-07-15 23:43:33 -07:00
Chris Robinson	4ae65c20e6	Separate movement and idle states ... This allows us to better handle cases of "missing" animations. Mainly for first-person, but also for spells and certain weapon types.	2013-07-15 22:56:23 -07:00
gus	f7f23ac5d8	improvement of the chop animation. Still some jittering.	2013-07-15 17:18:16 +01:00
gus	076f98cbba	change way animations keys are handled (thanks KittyCat!)	2013-07-15 16:37:25 +01:00
gus	3947f44aa3	Porting old work	2013-07-13 22:24:52 +01:00
Vincent Heuken	b095c24854	resize actor collision boxes on death	2013-06-27 14:11:20 -07:00
Glorf	88f8637145	Bugfix #795	2013-06-26 22:20:24 +02:00
scrawl	8bd712cc95	Fix being able to move slowly when over encumbered	2013-05-31 04:08:44 +02:00
Torben Carrington	c8c1ddd927	Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander.	2013-05-24 20:10:07 -07:00
Chris Robinson	e8bbb755c3	Play the left-arm torch animation when it's equipped	2013-05-17 06:21:59 -07:00
Chris Robinson	4b9a888d74	Use the PickProbe animation group as appropriate	2013-05-17 01:46:51 -07:00
Chris Robinson	6201cb0093	Add a method to clear the animation queue	2013-05-16 06:59:41 -07:00
Chris Robinson	e069215583	Don't clear the last queued animation when it stops	2013-05-15 06:32:20 -07:00
Chris Robinson	66f55b3178	Play the item up/down sound when readying/unreadying weapons	2013-05-15 01:45:47 -07:00
Chris Robinson	b459a010b0	Fix vec.z being applied while not in the air	2013-05-14 23:03:28 -07:00
Chris Robinson	e8661794fe	Avoid trying to find a state for non-actors. ... They're only ever play idles, unless PlayGroup is called.	2013-05-14 07:29:07 -07:00
Chris Robinson	8ec722ac92	Use std::find_if instead of ugly for loops	2013-05-13 04:08:36 -07:00
Chris Robinson	f83ee5d316	Play ready/unready animations on the upper body	2013-05-13 03:32:00 -07:00
Chris Robinson	70dc2f77ad	Move the priority enum to MWMechanics	2013-05-13 00:54:44 -07:00