411 commits

Author	SHA1	Message	Date
Chris Robinson	7c3b014193	Figure out which animations to play based on priority ... Bone group will also be taken into account later.	2013-05-10 18:37:44 -07:00
Chris Robinson	ccff364b52	Use a map of active layers instead of an array ... A bit of an upheaval. Each animation is now a "layer", instead of each layer having an animation. Incidentally, this is much closer to how Ogre handles animation states. In the future, each layer will have a priority, which will be used to determine which one affects a given bone group (which we currently only have one of).	2013-05-10 03:08:07 -07:00
Chris Robinson	74ed1f73b4	Merge remote-tracking branch 'zini/master' into animations	2013-05-09 13:53:38 -07:00
Torben Carrington	4928c9d079	Removed sqrt function call (minor optimization thanks to Chris)	2013-05-08 20:47:31 -07:00
Torben Carrington	d20178dd56	Removed unnecessary std::cout messages	2013-05-08 20:05:45 -07:00
Torben Carrington	133964f0e4	AIEscort complete	2013-05-08 20:02:24 -07:00
Torben Carrington	c03dca47f5	AIEscort implemented and working - only touchups are needed.	2013-05-08 17:19:47 -07:00
Torben Carrington	10840765d9	Framework - duration and pathing implemented, no waiting for follower yet.	2013-05-08 15:27:20 -07:00
Marc Zinnschlag	51067698a8	minor cleanup	2013-05-08 21:26:39 +02:00
Chris Robinson	90e29c83c0	Merge remote-tracking branch 'zini/master' into animations ... Conflicts: apps/openmw/mwmechanics/character.cpp	2013-05-06 19:17:39 -07:00
gus	006f25d1c0	First try to improve AI. Does not work yet due to strange bug in physicsystem	2013-05-06 00:46:50 +01:00
gus	7fe7111c19	Fargoth quest almost works. There is still a sall problem as the path taken is not exactly the same. I need to copy the exact way morrowind do pathfinding...	2013-05-03 17:09:09 +01:00
kpp	dcccfd9f22	Initialize values	2013-05-02 22:43:21 +04:00
Chris Robinson	a120653c38	Implement handling weapon states	2013-05-01 10:19:16 -07:00
Marc Zinnschlag	95eeea2a27	Revert "Merge remote-tracking branch 'glorf/acrobatics'" ... This reverts commit 089ef7a2a0, reversing changes made to 67422c397c.	2013-05-01 16:56:16 +02:00
Glorf	b8630239d7	Code cleanup	2013-05-01 12:25:02 +02:00
Glorf	236ec3409f	Finished acrobatics	2013-05-01 12:21:59 +02:00
Chris Robinson	4b15da076b	Move getStateInfo into the character controller	2013-04-30 19:26:41 -07:00
Glorf	d30e43784a	Fatigue decrease when jumping, live decrease when falling	2013-04-30 23:39:56 +02:00
Glorf	5a8c1661be	Jump acrobatics working, started falling acrobatics implementation	2013-04-30 20:44:17 +02:00
Glorf	add3cd6456	Advance acrobatics on jump	2013-04-30 18:22:59 +02:00
Chris Robinson	05060e57ec	Add a weapon state to the character controller	2013-04-29 13:07:49 -07:00
scrawl	78596cad83	Fix enchantment points value	2013-04-29 10:19:09 +02:00
scrawl	07891fa213	Athletics skill increase	2013-04-28 07:53:04 +02:00
Chris Robinson	274f3c7b77	Force character state to update after switching view modes	2013-04-25 07:08:11 -07:00
Chris Robinson	e4eb4b7e30	Keep track of the character looping state	2013-04-25 06:29:17 -07:00
Chris Robinson	9da2c9153e	Don't store the animation group string in the character controller	2013-04-25 06:12:37 -07:00
Chris Robinson	24f1eba902	Keep track of whether an animation supplies movement ... Also handle it when it doesn't.	2013-04-24 22:45:43 -07:00
Chris Robinson	0817d59f23	Allow specifying where to start in an animation	2013-04-24 19:09:36 -07:00
Chris Robinson	333354fe62	Remove the character controller from the Animation class	2013-04-24 07:10:41 -07:00
Chris Robinson	b80891099e	Don't use the character controller to handle text keys ... The Animation class has the Ptr and can call to whatever subsystem is needed.	2013-04-24 06:48:34 -07:00
Chris Robinson	e8cabc9434	Pass the loop count from loopgroup to the play method ... Instead of queueing each iteration separately.	2013-04-24 06:32:11 -07:00
Chris Robinson	c58dfbe921	Specify the loop count to Animation::play	2013-04-24 04:56:39 -07:00
Chris Robinson	8782ae6976	Separate some Animation fields into a separate AnimLayer class	2013-04-22 23:52:28 -07:00
Chris Robinson	bb64efc18e	Improve looping behavior	2013-04-22 05:08:52 -07:00
Chris Robinson	6c85d6763a	Pass "loop stop" to the character controller	2013-04-21 18:38:25 -07:00
Marc Zinnschlag	1b764e5d3c	Merge remote-tracking branch 'gus/AI'	2013-04-18 22:17:49 +02:00
Glorf	f9deb593d1	Bugfix #578	2013-04-18 21:37:58 +02:00
gus	c753eb4c28	another way to do pathfinding. Slightly less powerfull algorithme in theory, but morrowind pathgrids are so simple it shouldn't be a problem. Hope it solves the bug for KittyCat	2013-04-18 18:35:01 +01:00
scrawl	2693b78536	Add initial player inventory when new game is started	2013-04-15 02:56:23 +02:00
scrawl	a57fbbb168	Fix wrong detection of diseases	2013-04-14 17:51:17 +02:00
gus	905cff2a94	anonymous namespace	2013-04-11 18:02:12 +01:00
gus	0a187e56aa	bugfix	2013-04-11 17:58:11 +01:00
gus	6934b20abd	actors are now updates every frame. This should not be the case, but this is a quickfix for AI.	2013-04-11 17:57:58 +01:00
gus	b5b0e7a656	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI	2013-04-11 16:15:32 +01:00
Marc Zinnschlag	beb1858a57	Merge remote-tracking branch 'glorf/bugfix'	2013-04-10 17:39:19 +02:00
Glorf	194ca2584d	Small azura's star fix	2013-04-08 17:53:41 +02:00
Chris Robinson	3768e04a0c	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-07 17:24:47 -07:00
scrawl	8bbfba3f43	Fix fatigue not being set to its maximum value when player is rebuilt	2013-04-07 16:18:40 +02:00
Chris Robinson	41e410347e	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-06 10:35:01 -07:00