6482 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Zinnschlag	247a76766d	fixed a typo in a doxygen comment	2013-04-25 10:27:43 +02:00
Marc Zinnschlag	71fc8f5830	Merge remote-tracking branch 'scrawl/item' into next	2013-04-25 10:21:14 +02:00
Marc Zinnschlag	a5dbc7ce61	Merge remote-tracking branch 'scrawl/next' into next	2013-04-25 10:10:52 +02:00
scrawl	9e3917881d	Don't fail on nonexistent items in a levelled list	2013-04-25 04:44:30 +02:00
scrawl	933f894148	Added Blind and Night Eye effects	2013-04-25 02:31:51 +02:00
scrawl	38c371a6ef	Merge branch 'master' into next	2013-04-25 02:31:44 +02:00
scrawl	ad05f238de	Use one vertex buffer for all UV coordinates	2013-04-25 02:31:39 +02:00
Marc Zinnschlag	8d0e5fc0c4	updated changelog once more	2013-04-25 02:31:39 +02:00
scrawl	baa7a9160c	Rank condition should always fail if NPC is not in a faction	2013-04-25 02:31:39 +02:00
scrawl	a7092ef2d7	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-25 02:31:39 +02:00
Nathan Jeffords	2dc01fe56b	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-25 02:31:39 +02:00
scrawl	51580ead4f	Fix consecutive dialogue choices	2013-04-25 02:31:39 +02:00
Marc Zinnschlag	87ce2110dc	hotfix for CharacterPreview destructor	2013-04-25 02:31:38 +02:00
scrawl	21bdcc9f20	Only use the shader based mygui manager if the fixed pipeline is unavailable	2013-04-25 02:31:38 +02:00
Marc Zinnschlag	2c8b0a1541	last minute change to changelog	2013-04-25 02:31:38 +02:00
scrawl	cd57e3f896	Auto calculate attributes if there are not specified in the NPC record	2013-04-25 02:31:38 +02:00
Emanuel Guevel	c0102954f1	Add non-breaking space to font code range	2013-04-25 01:42:09 +02:00
scrawl	44ac0a7c18	Use one vertex buffer for all UV coordinates	2013-04-23 22:47:57 +02:00
greye	cfccf0981d	update IndexedStore::setUp() for multiple datafile support	2013-04-23 14:36:38 +04:00
Marc Zinnschlag	a608e7ed06	updated changelog once more	2013-04-22 09:56:11 +02:00
Marc Zinnschlag	29cb076113	Merge remote-tracking branch 'scrawl/rank'	2013-04-22 09:52:28 +02:00
Marc Zinnschlag	3fa35af796	Merge remote-tracking branch 'scrawl/master'	2013-04-22 09:52:24 +02:00
scrawl	56b871e362	Rank condition should always fail if NPC is not in a faction	2013-04-22 07:57:53 +02: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	1051fa51a7	Recognize NiFlipController	2013-04-19 15:07:08 -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
scrawl	e92897526c	Only use the shader based mygui manager if the fixed pipeline is unavailable	2013-04-19 01:33:33 +02:00
Marc Zinnschlag	92e06cebf3	last minute change to changelog	2013-04-19 00:26:36 +02: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	257f940366	updated changelog	2013-04-18 22:50:04 +02:00
Marc Zinnschlag	3b3a052f4f	increased version number	2013-04-18 22:36:48 +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	b34caccd2e	Fix moving NPCs not getting their collision box moved	2013-04-18 16:46:38 +02: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
Chris Robinson	3def2a0f45	Treat the particle random values as the max differential	2013-04-16 19:16:45 -07:00