168 commits

Author	SHA1	Message	Date
Chris Robinson	cf6e3ab933	Fix a potential divide-by-zero	2013-08-19 09:36:51 -07:00
Chris Robinson	2ec39f3622	Don't start the jump animation until after the actor is airborn ... A bit counter-intuitive, but otherwise certain jump animations will improperly add an offset to the initial inertia.	2013-08-19 08:24:47 -07:00
Chris Robinson	ac3d3df9fc	Implement jumping animations	2013-08-19 08:10:18 -07:00
Chris Robinson	6e9f15793d	Implement a jumping state	2013-08-18 23:42:56 -07:00
Chris Robinson	b0f8045c72	Improve mid-air control	2013-08-18 05:59:06 -07:00
Chris Robinson	9d56e2d86d	Apply movement by queueing it to do later	2013-08-17 22:34:38 -07:00
Chris Robinson	6fd4cdb5fb	Play randomized werewolf sounds	2013-08-11 00:53:17 -07:00
Chris Robinson	180f0d0fe9	Restart from the loop point if replaying the same animation	2013-08-09 21:25:28 -07:00
Chris Robinson	a28c36de17	Don't count as running if not actually moving along (local) X/Y	2013-08-09 06:53:07 -07:00
Chris Robinson	c2d8eb377f	Play some appropriate sounds in werewolf form	2013-08-09 06:40:16 -07:00
Chris Robinson	eab4e09566	Handle the pick/probe in the character controller	2013-08-06 19:48:59 -07:00
scrawl	4caac0d859	Fix idle animations repeating	2013-08-05 02:06:23 +02:00
vorenon	76a1abe9fa	Don't allow the use of the "jump" key while sneaking - Update	2013-08-04 20:10:33 +02:00
vorenon	aa45127895	Adjusted swish sounds ... Sorry Chris, I was wrong. The game actually uses SwishM for every attack, but at a different pitch depending on the force of the attack. I realized it after testing your changes.	2013-08-02 16:33:39 +02:00
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