418 commits

Author	SHA1	Message	Date
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
Chris Robinson	1d934e3112	Reduce some stdout spam	2013-04-06 04:46:28 -07:00
Glorf	48d9885554	Started bugfix #691	2013-04-05 15:42:05 +02:00
Marc Zinnschlag	18e046e628	cleaned up race record struct	2013-04-04 13:50:36 +02:00
Glorf	08e9bb0236	Another small enchanting fix	2013-04-03 18:25:40 +02:00
Glorf	ae3e4ecf8b	Finished enchanting	2013-04-03 18:02:30 +02:00
Glorf	7b7d3353a6	Exception for enchanting with Azura Star	2013-04-02 22:23:38 +02:00
Glorf	369cf0b4ca	Enchanting price mechanics	2013-04-02 20:46:48 +02:00
Marc Zinnschlag	df658d29f0	Merge branch 'faction'	2013-04-02 14:21:51 +02:00
Marc Zinnschlag	f9f520df34	adjusted faction record to increase consistency with other records	2013-04-02 13:59:45 +02:00
gus	6a33170ca2	More bugfix, but I don't like this one.	2013-04-01 17:44:06 +00:00
gus	20af7d89a2	post master-merge fixes. Looks a little odd.	2013-04-01 17:30:40 +00:00
gus	2be9405c96	the sgn function is no longer in the global namespace	2013-04-01 15:44:08 +00:00
Marc Zinnschlag	751c679255	Merge remote-tracking branch 'glorf/enchanting'	2013-04-01 17:35:04 +02:00
Marc Zinnschlag	9dbd024076	another minor fix	2013-04-01 17:30:54 +02:00
Glorf	1bff6ed872	Enchaning values import, fixed constness	2013-04-01 17:12:47 +02:00
gus	1eb3d3e10e	Merge branch 'master' of https://github.com/zinnschlag/openmw.git into AI ... Conflicts: apps/openmw/CMakeLists.txt	2013-04-01 14:10:19 +00:00
gus	47cc945ef4	more refactoring	2013-04-01 12:38:13 +00:00
Marc Zinnschlag	26db983599	minor fix	2013-04-01 10:46:08 +02:00
Chris Robinson	d0703efd69	Another place to check the class' isActor method	2013-03-31 17:32:39 -07:00
Chris Robinson	04aeb3dd07	Rename Mechanics' Activators to Objects	2013-03-31 17:32:38 -07:00
Chris Robinson	10d04c928c	Use the object's class to check if it's an actor	2013-03-31 17:32:38 -07:00
Glorf	d29a42dcbe	Fixed enchanting mechanics	2013-03-31 23:18:23 +02:00
gus	63424ade56	refactoring	2013-03-31 17:30:03 +00:00
scrawl	1a2daa3bc1	Merge branch 'master' of git://github.com/zinnschlag/openmw into companion	2013-03-31 14:50:03 +02:00
scrawl	b0199c703c	Companion UI	2013-03-31 13:13:46 +02:00
Chris Robinson	4836ba16f7	Implement turning states	2013-03-31 03:50:20 -07:00
Chris Robinson	7b02ec411b	Apply the rotation when updating the character controller	2013-03-31 01:29:24 -07:00
Chris Robinson	466c0086b8	Use a full Movement to hand off to the world physics update	2013-03-31 00:13:56 -07:00
Chris Robinson	0ce188b7cc	Store the position and rotation in MWMechanics::Movement	2013-03-30 19:00:46 -07:00
Chris Robinson	af65ecd841	Pass the movement vector in as a parameter to CharacterController::update	2013-03-30 18:37:40 -07:00
Glorf	7dbc779c3a	Self-enchanting mechanics	2013-03-30 19:08:42 +01:00
scrawl	e7af718b55	Remove unnecessary WindowManager::messageBox arguments	2013-03-30 12:56:37 +01:00
Marc Zinnschlag	573368849b	Merge remote-tracking branch 'glorf/enchanting' ... Conflicts: apps/openmw/CMakeLists.txt	2013-03-29 16:48:21 +01:00
Glorf	86275e5bd4	Some enchanting fixes	2013-03-29 12:00:09 +01:00
Glorf	cc8f7f238e	Enchanted item base ptr fix	2013-03-29 00:55:29 +01:00
Glorf	eb88463b94	Some enchanting fixes	2013-03-28 23:39:20 +01:00
Glorf	6643fe789c	Enchanting system	2013-03-28 17:41:00 +01:00
scrawl	efe6a3ebee	Fix compile error & warnings	2013-03-26 18:01:01 +01:00
scrawl	2ecd2f4ecd	Merge branch 'next' into HEAD	2013-03-26 17:44:53 +01:00
scrawl	a2ca679beb	Added PC repair feature	2013-03-23 08:16:46 +01:00
Marc Zinnschlag	fd2c07a6f4	delete death events on adding an actor to the scene	2013-03-18 10:54:47 +01:00
Marc Zinnschlag	61cb0f98a6	keep track of death events	2013-03-18 10:47:09 +01:00
scrawl	95e1cdc07d	Move getArmorRating to MWWorld::Class.	2013-03-17 22:29:12 +01:00
scrawl	dd57eabc3e	Better use an enum for magic effect IDs	2013-03-16 23:28:26 +01:00
scrawl	1666bc7740	Armor rating	2013-03-16 22:53:33 +01:00
gus	9efb073617	clean up + correct a bug	2013-03-14 18:05:00 +00:00
gus	80804fac35	check if the NPC is close from a non loaded cell. If yes, AITravel is simply ended.	2013-03-14 17:16:37 +00:00
gus	f943580138	Somehow manages to get from one cell to another, but this looks wrong... And I don't know how morrowind do it, because aitravel is completly buggy	2013-03-12 17:44:22 +00:00
gus	bbc4c23f7e	AITravel now works correctly on exterior cells. As long as NPC don't try to leave cell, it's ok.	2013-03-10 15:07:22 +00:00
Emanuel Guevel	c020665cf2	Fix appending int to string in an exception message	2013-03-09 01:00:03 +01:00
gus	01908dbcc2	little improvement	2013-03-06 21:17:33 +00:00
gus	5fc7103425	First attempt at pathfinding using boost::graph	2013-03-06 20:31:47 +00:00
scrawl	8be9627c8d	Fix method signatures	2013-03-06 21:26:41 +01:00
scrawl	f7d8f6456f	Stats should never go below 0	2013-03-06 20:45:11 +01:00
scrawl	268bb23590	Implemented sneaking animation	2013-03-06 16:58:56 +01:00
scrawl	6f05c4229f	Implemented potion & ingredient effect stacking	2013-03-03 12:41:37 +01:00
scrawl	cf87708c1f	Magic effect icons for spells	2013-03-03 12:01:19 +01:00
Chris Robinson	000128d084	Merge remote-tracking branch 'zini/master' into misc-cleanup	2013-02-25 10:38:08 -08:00
Chris Robinson	48271e49ec	Properly update the Ptr object in the mechanics manager when moving across cells	2013-02-25 09:57:34 -08:00
Marc Zinnschlag	88e8659a49	minor cleanup	2013-02-25 16:52:31 +01:00
scrawl	73d48a95f6	Add message box when the player tries to move when being overencumbered.	2013-02-25 16:31:48 +01:00
Chris Robinson	89d4c245e9	Better calculate jump velocity ... The fatigue term isn't currently used correctly	2013-02-24 03:30:33 -08:00
Chris Robinson	d77d035d3a	Handle the "sound" events in runAnimation	2013-02-23 14:15:11 -08:00
Chris Robinson	e6da9dfae5	Specify the animation key to stop playing at	2013-02-23 05:15:10 -08:00
Chris Robinson	f841576bba	Don't override animations played with playgroup	2013-02-23 01:54:46 -08:00
Chris Robinson	7fcca180b6	Implement rudimentary jumping	2013-02-20 20:08:04 -08:00
Chris Robinson	1399a06c76	Update animation looping when setting the same state	2013-02-19 04:01:33 -08:00
Chris Robinson	17200cb226	Don't try to move when there's no speed	2013-02-18 20:43:55 -08:00
Chris Robinson	627b866744	Don't try to set a new state when dead	2013-02-18 06:29:16 -08:00
Chris Robinson	f2948ced23	Allow diagonal movement	2013-02-18 03:07:31 -08:00
Chris Robinson	e4341525c8	Add a jump state ... Currently unused	2013-02-15 04:45:28 -08:00
Chris Robinson	ff0099fa6e	Scale the animation speed based on the animation velocity and movement speed ... This may not be totoally correct since it takes the whole animation into account, rather than just the looping portion. But it's good enough for now.	2013-02-15 02:15:39 -08:00
Chris Robinson	3348e8a436	Clarify a comment	2013-02-14 22:41:14 -08:00
Chris Robinson	cbaf489eb6	Add running states	2013-02-06 16:53:52 -08:00
Chris Robinson	fc307e64b0	Add swimming states	2013-02-05 19:05:07 -08:00
Chris Robinson	8c0bb1ff4d	Rotate movement in the movement solver	2013-02-05 14:02:14 -08:00
Chris Robinson	f7f1adfb9d	Don't accumulate animations with activators	2013-02-05 12:55:06 -08:00
Chris Robinson	2c39760bd5	Move the movement solver code to mwworld's physics system	2013-02-05 12:45:10 -08:00
Chris Robinson	0a4568bd11	Move the PtrMovementList typedef to MWWorld ... Use it for the doPhysics parameter, too	2013-02-05 11:03:39 -08:00
Chris Robinson	d50832081c	Remove the unneeded PhysicActor field from MovementSolver	2013-02-05 09:37:02 -08:00
Chris Robinson	a782a9109b	Store the vertical velocity in the physic actor	2013-02-05 09:24:22 -08:00
Chris Robinson	82e4da4e64	Get the half-extents from the physicactor	2013-02-05 07:41:57 -08:00
Chris Robinson	1c604445ba	Store movement vectors as they get returned	2013-02-05 06:59:01 -08:00
Chris Robinson	5ee298cdc1	Make sure the player updates last	2013-02-04 14:08:38 -08:00
Chris Robinson	2f8affc955	Make sure the player's controller is properly updated when they change	2013-02-04 12:58:06 -08:00
Chris Robinson	ee9b19d2ed	Make sure to remove a Ptr from the activators when requested	2013-02-04 12:04:06 -08:00
Chris Robinson	39cf7b0b42	Pass the Ptr of the object being moved to the move method ... This prevents having to store another copy of it, which risks getting out of sync.	2013-02-04 11:17:48 -08:00
Chris Robinson	1a5cb8760d	Rotate movement vector to world space before passing to the movement solver	2013-02-04 11:04:20 -08:00
Chris Robinson	6b32fa7999	Use the correct position for the actor	2013-02-04 09:48:21 -08:00
Chris Robinson	1747c1e01a	Integrate a new movement solver to handle object movement and collisions ... Temporary, and pretty breoken. Needs some serious integration fixes.	2013-02-04 07:10:14 -08:00
Chris Robinson	91513206a0	Don't use per-animation accumulation values ... This breaks walking diagonally and "jumping" (which technically wasn't jumping anyway).	2013-02-03 12:02:51 -08:00
Chris Robinson	51d5efeeb2	Work out the state in the character controller update method	2013-02-03 07:15:34 -08:00
Chris Robinson	7fe877d8ea	Add a couple more character states	2013-02-03 00:19:22 -08:00