6767 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	1f58edb9db	Merge branch 'master' of https://github.com/zinnschlag/openmw into journal	2013-05-03 18:17:27 +02: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
Marc Zinnschlag	2e6594f8f7	Merge remote-tracking branch 'glorf/bugfix-5'	2013-05-03 14:55:00 +02:00
scrawl	75dcf52552	Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)	2013-05-03 13:55:57 +02:00
Glorf	517dfb4d75	Bugfix #732 part 2	2013-05-03 13:24:34 +02:00
Glorf	57f22c77c0	Bugfix #732 part 1	2013-05-03 12:44:27 +02:00
greye	a8b1706678	init pointer value to prevent segfault	2013-05-03 10:51:42 +04:00
kpp	dcccfd9f22	Initialize values	2013-05-02 22:43:21 +04:00
Glorf	f1a659e2ac	Bugfix #730	2013-05-02 14:49:30 +02:00
kpp	28ef4d97da	Fixes Bug #734 'Book empty line problem' ... Hides buttons 'Next' and 'Prev' at the last and at the first page	2013-05-02 07:35:25 +04:00
Chris Robinson	03a6190c5a	Merge remote-tracking branch 'zini/master' into animations	2013-05-01 10:20:42 -07:00
Chris Robinson	a120653c38	Implement handling weapon states	2013-05-01 10:19:16 -07:00
Marc Zinnschlag	d5741c7141	Merge remote-tracking branch 'scrawl/master'	2013-05-01 16:58:43 +02: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
scrawl	1acfd849a2	Fix a case folding bug	2013-05-01 16:38:16 +02:00
Marc Zinnschlag	fe038cef03	turned redeclartion of local variables from an error into a warning	2013-05-01 14:20:09 +02:00
Marc Zinnschlag	63407a662c	allow <== and >== as alternative for <= and >= in scripts	2013-05-01 14:08:05 +02:00
Marc Zinnschlag	6f0ccb6e38	Merge remote-tracking branch 'scrawl/insertrecords'	2013-05-01 13:55:26 +02:00
Marc Zinnschlag	089ef7a2a0	Merge remote-tracking branch 'glorf/acrobatics'	2013-05-01 13:44:23 +02:00
scrawl	40a0969055	Insert records that may not exist in vanilla MW	2013-05-01 12:47:50 +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
scrawl	67422c397c	GetWindSpeed	2013-05-01 11:42:24 +02:00
scrawl	5063d90dda	GetStartingAngle was implemented, but not registered	2013-05-01 11:22:46 +02:00
scrawl	627c3fdb6b	Added GetStandingPC, GetStandingActor; Fixed GetStartingPos	2013-05-01 11:15:43 +02:00
scrawl	3c68c87923	Fix some naming guidelines, fix topic index exception, fix exception in keyword search for some journal entries	2013-05-01 10:28:59 +02:00
scrawl	8bc59f8fe6	Merge branch 'master' into journal	2013-05-01 08:27:42 +02:00
Chris Robinson	d01351431c	Merge remote-tracking branch 'zini/master' into animations	2013-04-30 19:27:55 -07: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
scrawl	1420a2cb33	Tweaked adjustPosition. Now uses a very thin box for tracing the feet only.	2013-04-30 20:43:38 +02:00
scrawl	91c89e5db4	Use sphere cast instead of ray for camera distance adjustment; use the box orientation value in newtrace	2013-04-30 20:26:59 +02:00
Glorf	add3cd6456	Advance acrobatics on jump	2013-04-30 18:22:59 +02:00
scrawl	2a42556aa5	Merge branch 'master' into HEAD	2013-04-30 14:54:10 +02:00
scrawl	20d5ba0eec	Revert "enable move construction/assignment to key ESM data structure to reduce sorting costs" ... This reverts commit 6dbb53493b.	2013-04-30 14:54:07 +02:00
scrawl	24f968623f	Revert "reworked Nif::KeyListT into Nif::CurveT" ... This reverts commit e7665582ad.	2013-04-30 14:53:51 +02:00
scrawl	de3c76a54b	Revert "reworked NIFStream to use a type-handler" ... This reverts commit 03ee7663a3.	2013-04-30 14:53:41 +02:00
Marc Zinnschlag	61e476118d	Merge remote-tracking branch 'kcat/animations'	2013-04-30 10:25:26 +02:00
Marc Zinnschlag	2cb7e1f3d5	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-30 10:24:02 +02:00
scrawl	c0dd383cd0	Fix door collision to work with all possible movement directions	2013-04-30 09:43:32 +02:00
Chris Robinson	05060e57ec	Add a weapon state to the character controller	2013-04-29 13:07:49 -07:00
Glorf	d283f8d85f	Bugfix #748	2013-04-29 21:19:13 +02:00
Chris Robinson	020e3e8a8e	Show the equipped weapon in the inventory screen ... And use the proper pose based on what's equipped.	2013-04-29 12:08:43 -07:00
Chris Robinson	854de1c6c1	Make sure the weapon is in the proper group	2013-04-29 11:43:37 -07:00
Chris Robinson	15a2eeebb8	Merge remote-tracking branch 'zini/master' into animations ... Conflicts: apps/openmw/mwworld/worldimp.cpp	2013-04-29 10:16:29 -07:00
Chris Robinson	063322b081	Declare some variables closer to where they're used	2013-04-29 10:12:50 -07:00
Chris Robinson	0cf531ba12	Make sure to update parts when the weapon changes	2013-04-29 09:53:36 -07:00
Marc Zinnschlag	93868c8bca	Merge remote-tracking branch 'scrawl/master'	2013-04-29 18:08:25 +02:00
Marc Zinnschlag	bab899513a	Merge remote-tracking branch 'glorf/bugfix-4'	2013-04-29 18:04:22 +02:00