3957 commits

Author	SHA1	Message	Date
Marc Zinnschlag	41744818bb	Merge remote-tracking branch 'scrawl/master'	2013-04-13 10:23:35 +02:00
scrawl	2eb9395661	Do some padding with zeros on the resource group name to avoid priority problems with more than 10 resource groups.	2013-04-13 00:05:31 +02:00
scrawl	86bac7aa92	Fix wrong BSA group name typo	2013-04-12 23:40:30 +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	31289237ce	Merge remote-tracking branch 'kcat/nifogre'	2013-04-11 10:16:48 +02:00
Marc Zinnschlag	3f846a50d9	Merge remote-tracking branch 'galdor557/master' ... Conflicts: apps/openmw/mwgui/travelwindow.cpp	2013-04-11 10:15:42 +02:00
Chris Robinson	82091e3d07	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-10 23:20:28 -07:00
Britt Mathis	6128b9276f	Removed non-essential includes from all MWGui header files.	2013-04-11 00:21:56 -04:00
Chris Robinson	caff28e20a	Move NIFSkeletonLoader to a separate file	2013-04-10 19:58:17 -07:00
Britt Mathis	f7383905b7	Finally eliminated calls to MWBase::WindowManager in constructors	2013-04-10 14:46:21 -04:00
Britt Mathis	d768f6b57e	Deleted *_* files in MwGui, builds.	2013-04-10 13:05:15 -04:00
Marc Zinnschlag	beb1858a57	Merge remote-tracking branch 'glorf/bugfix'	2013-04-10 17:39:19 +02:00
Glorf	ad49d1ecab	Sixth minor fix	2013-04-10 15:24:20 +02:00
Britt Mathis	ce9bc6d9ba	MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions	2013-04-10 00:32:05 -04:00
Chris Robinson	50d8353a8d	Fix a hack so arms dont show in first-person	2013-04-09 16:51:04 -07:00
Chris Robinson	9d29921913	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-09 15:12:19 -07:00
Chris Robinson	a700c50e84	Add a first-person view mode to NpcAnimation ... And use it instead of showing/hiding the player.	2013-04-09 15:10:14 -07:00
Marc Zinnschlag	a2ab43be7e	Merge remote-tracking branch 'scrawl/master'	2013-04-09 21:22:38 +02:00
scrawl	0e7d555cdf	Terrain material now uses multiple passes if required, which means it can support an arbitrary number of layers. Also re-enables PSSM.	2013-04-09 20:31:00 +02:00
Tom Mason	6ca2b1af74	fix for turning animations playing when in vanity mode	2013-04-09 19:24:41 +01:00
Glorf	bd93e63150	Fifth minor fix	2013-04-09 19:46:27 +02:00
Glorf	248fff6eb7	Fourth minor fix	2013-04-09 19:41:03 +02:00
Glorf	44ef02eb99	Third minor fix	2013-04-09 19:04:59 +02:00
Chris Robinson	029d565727	Avoid calling setVisible for character previews	2013-04-09 09:23:07 -07:00
Chris Robinson	9f9d978b0f	Use an enum to specify the NPC's view mode (normal, head only)	2013-04-09 09:07:05 -07:00
Glorf	46925e93a6	Second minor fix	2013-04-09 16:14:08 +02:00
Glorf	623c2c8201	Minor fix	2013-04-09 07:45:07 +02:00
scrawl	01ae91f640	Fix several NPCs spawning in the ground	2013-04-09 01:24:17 +02:00
Glorf	7c22e123f4	Bugfix #691 changes	2013-04-08 22:10:55 +02:00
Chris Robinson	01a1a0b846	Merge remote-tracking branch 'zini/master' into nifogre ... Conflicts: components/nifogre/ogrenifloader.cpp	2013-04-08 11:46:57 -07:00
Marc Zinnschlag	ef09b1cac8	Merge remote-tracking branch 'glorf/bugfix-1'	2013-04-08 20:23:18 +02:00
Glorf	2f52df22ce	Bugfix #553	2013-04-08 19:00:38 +02:00
Glorf	194ca2584d	Small azura's star fix	2013-04-08 17:53:41 +02:00
Glorf	50932a7a6b	Finished bugfix #691	2013-04-08 17:50:03 +02:00
scrawl	d0bcf83091	Adjust player position to ground after using travel services	2013-04-08 16:30:18 +02:00
scrawl	a7de870a44	Fix mercenary not updating its profit when item was dragged onto the player avatar	2013-04-08 16:21:18 +02:00
Chris Robinson	08d43fe217	Make the getHeadNode method more general	2013-04-08 05:48:52 -07:00
Chris Robinson	3768e04a0c	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-07 17:24:47 -07:00
Chris Robinson	7baca30a1d	Only get the non-accum root's keyframe when updating positions ... The actual animation pose is now handled by the controllers, based on the current animation time.	2013-04-07 16:21:45 -07:00
Chris Robinson	261ea1fe5e	Implement a KeyframeController	2013-04-07 14:56:23 -07:00
Chris Robinson	f69a8259e1	Update animation source controller targets	2013-04-07 13:51:04 -07:00
scrawl	9e08497f02	Initial container content should inherit the owner of its container	2013-04-07 22:07:04 +02:00
Chris Robinson	7494f90301	Remove an unneeded function	2013-04-07 13:02:46 -07:00
scrawl	480467b6eb	Reset the 'owner' field for items that were legitimately bought from an NPC.	2013-04-07 21:53:11 +02:00
Chris Robinson	2362e920f3	Use an unconnected object list for animation sources ... We'll want the controllers, as the plan is to use their keyframe controllers to animate the actual skeleton used for the meshes.	2013-04-07 12:41:27 -07:00
scrawl	f3c8cd2065	Don't buy/sell keys which are set to open a lock	2013-04-07 21:38:53 +02:00
scrawl	2d2196b0d6	Implemented levelled items	2013-04-07 21:01:02 +02:00