4047 commits

Author	SHA1	Message	Date
scrawl	56b871e362	Rank condition should always fail if NPC is not in a faction	2013-04-22 07:57:53 +02:00
Chris Robinson	2345b5e8b3	Avoid storing text keys for each animation	2013-04-21 22:56:40 -07:00
Chris Robinson	7d59340ed6	Don't clip out the group name from the textkeys	2013-04-21 22:13:49 -07:00
Chris Robinson	6c85d6763a	Pass "loop stop" to the character controller	2013-04-21 18:38:25 -07:00
Chris Robinson	d7c9df16f8	Store the current animation group	2013-04-21 18:32:34 -07:00
scrawl	8bf1149cec	Fix activation not working sometimes ... The current player cell was only being updated when the reference was not empty, causing it to incorrectly detect a cell change the first time something was activated in a newly visited cell, immediately closing the opened dialogue again.	2013-04-21 21:24:48 +02:00
Nathan Jeffords	19325f9d40	fixed the type of iterator uses in MWWorld::Store ... The containers type used to declare some iterators was not an exact match for the type of the container the iterator was being initialized from. This was causing build failure on windows.	2013-04-21 11:41:09 -07:00
Chris Robinson	835ff8eb1e	Avoid creating an AnimationValue per ObjectList	2013-04-20 17:13:27 -07:00
Chris Robinson	4122b0b55f	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-20 00:25:00 -07:00
scrawl	a8e3acd6c4	Fix consecutive dialogue choices	2013-04-19 17:57:22 +02:00
Marc Zinnschlag	f13b0c884f	hotfix for CharacterPreview destructor	2013-04-19 14:41:26 +02:00
Chris Robinson	50bb92beb3	Use a method to set the visibility flags and render queue.	2013-04-19 02:01:50 -07:00
Marc Zinnschlag	9c1e280614	Merge remote-tracking branch 'scrawl/master'	2013-04-19 00:23:24 +02:00
Chris Robinson	434f3ac8c8	Merge remote-tracking branch 'zini/next' into nifogre	2013-04-18 15:14:28 -07:00
scrawl	ef9afeb53e	Auto calculate attributes if there are not specified in the NPC record	2013-04-18 23:51:43 +02: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	3c5e4ceefd	Workaround for ambiguous "Chargen_plank" ID in chargen script (one at -22,16 and one at -2,-9)	2013-04-18 16:46:32 +02:00
Chris Robinson	6d59325bff	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-17 23:21:17 -07:00
Britt Mathis	1dff1fabdb	Fixed race.cpp	2013-04-17 19:38:13 -04:00
Britt Mathis	7eee86ab66	No more using namespace	2013-04-17 18:56:48 -04:00
scrawl	c519fc360d	Move away from fixed record names for body parts	2013-04-18 00:19:34 +02:00
scrawl	0341a9e778	Fix a gcc 4.8 warning	2013-04-17 20:57:22 +02:00
scrawl	547f77031d	Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again	2013-04-17 17:06:30 +02:00
Bret Curtis	c1ec16986b	add cmake fix for compiling with binutils >= 2.23 which requires explicit linking for dl<friends> and Xt	2013-04-17 12:04:05 +02:00
Marc Zinnschlag	5bbab1abd9	Merge remote-tracking branch 'galdor557/master'	2013-04-17 09:52:58 +02:00
Britt Mathis	60fadaeaf0	Cleaned up includes in implementation files	2013-04-16 20:16:22 -04:00
Chris Robinson	cac793758b	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-16 11:52:19 -07:00
Chris Robinson	4ce98e9bd6	Store iterators for start and stop keys	2013-04-15 20:37:10 -07:00
Chris Robinson	1b1f9f7921	Allow multiple ObjectLists to be created for Animations. ... addObjectList may not currently be called outside of the related constructor.	2013-04-15 18:55:28 -07:00
scrawl	7fcaffefb0	Fixed travel window to use the rotation part of ESM::Position	2013-04-15 03:13:25 +02:00
Chris Robinson	69084139aa	Use an array of objectlists, instead of one base objectlist and an array of 'animation sources'	2013-04-14 17:58:21 -07:00
scrawl	2693b78536	Add initial player inventory when new game is started	2013-04-15 02:56:23 +02:00
Chris Robinson	f9dee25fd1	Store the base skeleton entity in MWRender::Animation	2013-04-14 16:56:35 -07:00
Marc Zinnschlag	9bc07e6221	Merge remote-tracking branch 'scrawl/diseasefix'	2013-04-14 19:45:55 +02:00
scrawl	a57fbbb168	Fix wrong detection of diseases	2013-04-14 17:51:17 +02:00
scrawl	48f46e505c	Look in exterior cells first (chargen_crate_01_empty is in the prison ship but also outside of it, the one outside needs to be disabled)	2013-04-14 17:37:39 +02:00
Marc Zinnschlag	62aa563466	Merge remote-tracking branch 'scrawl/scale'	2013-04-13 10:32:09 +02:00
Marc Zinnschlag	41744818bb	Merge remote-tracking branch 'scrawl/master'	2013-04-13 10:23:35 +02:00
scrawl	d50150ad71	Scale adjustment factor should not be written back to cellref scale	2013-04-13 00:13:56 +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
Chris Robinson	80a1abd48a	Clear the old text keys when setting new animation sources	2013-04-07 11:09:55 -07:00
Marc Zinnschlag	a0d34c5e8d	Merge remote-tracking branch 'wheybags/autorun2'	2013-04-07 19:51:02 +02:00
Marc Zinnschlag	a91e3c0b01	Merge remote-tracking branch 'scrawl/fatigue_bug'	2013-04-07 19:50:16 +02:00
Tom Mason	822866b5ae	fixed autorun	2013-04-07 18:04:30 +01:00
scrawl	8bbfba3f43	Fix fatigue not being set to its maximum value when player is rebuilt	2013-04-07 16:18:40 +02:00
scrawl	755a80a522	Fix camera shaking when near the pitch limit.	2013-04-07 15:52:43 +02:00
Chris Robinson	be419bc891	Handle NiCamera nodes	2013-04-07 02:28:15 -07:00
Chris Robinson	878b4c15c5	Set visibility flags and the render queue group for particles	2013-04-07 02:08:33 -07:00
Chris Robinson	2db72ae607	Rename EntityList to ObjectList	2013-04-07 01:52:35 -07:00
Chris Robinson	41e410347e	Merge remote-tracking branch 'zini/master' into nifogre	2013-04-06 10:35:01 -07:00