2226 commits

Author	SHA1	Message	Date
scrawl	739455e6f8	new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc	2012-07-19 16:23:30 +02:00
scrawl	4434fb640e	Merge branch 'master' into shadersystem	2012-07-17 19:12:02 +02:00
Marc Zinnschlag	483b125aad	avoid locking up in case actor updates repeatedly throw exceptions	2012-07-17 18:37:20 +02:00
Marc Zinnschlag	6744375636	fixed a logic error in the auto equip code	2012-07-17 18:35:01 +02:00
Marc Zinnschlag	beb18282bb	Issue #342: various fixes	2012-07-17 16:44:55 +02:00
Marc Zinnschlag	76de2f7360	Issue #342: handle magic effects 79-82 and 17-20	2012-07-17 15:49:37 +02:00
Marc Zinnschlag	a3652f16ce	Issue #342: factored out dynamic stats calculation into a separate function	2012-07-17 12:18:43 +02:00
Marc Zinnschlag	2c70a93553	Merge branch 'master' into potions ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp	2012-07-17 10:32:18 +02:00
Marc Zinnschlag	0d3a7d482e	Merge remote branch 'modred11/master'	2012-07-17 10:21:46 +02:00
Marc Zinnschlag	4bfed952bc	Merge remote branch 'guidoj/master'	2012-07-17 10:17:06 +02:00
Marc Zinnschlag	e9b95d55cd	Revert "Proper way to find and use libtbb" ... This reverts commit d6bf2b7d29.	2012-07-17 09:49:52 +02:00
guidoj	a021165d9f	Changed standard C lib includes to C++ format	2012-07-17 09:44:24 +02:00
guidoj	0549e949ba	Mostly removal of unnecessary #include's and a little clean up	2012-07-17 09:27:12 +02:00
Dmitry Marakasov	d6bf2b7d29	Proper way to find and use libtbb	2012-07-17 00:11:56 +04:00
Dmitry Marakasov	0e934a52ca	Include soundmanager.hpp for Play_Normal enum	2012-07-16 23:54:24 +04:00
Dmitry Marakasov	1c53add6c4	Include boost/shared_ptr.hpp for boost:shared_ptr	2012-07-16 23:54:21 +04:00
scrawl	509e9d7034	Merge branch 'master' into shadersystem	2012-07-15 21:58:45 +02:00
Marc Zinnschlag	da916cecfb	fixed a bug in a cmake script that resulted in some files being compiled twice	2012-07-15 19:29:09 +02:00
scrawl	778e59ee37	terrain as it was before, with about 4x less code	2012-07-15 08:21:43 +02:00
scrawl	29f91753f7	correction	2012-07-14 18:44:03 +02:00
scrawl	93c641efa7	terrain albedo	2012-07-14 18:25:43 +02:00
scrawl	7d5b94709d	Merge branch 'master' into shadersystem ... Conflicts: components/nifogre/ogre_nif_loader.cpp	2012-07-14 11:16:35 +02:00
scrawl	16c2ea3a75	terrain colourmap	2012-07-14 11:13:38 +02:00
Marc Zinnschlag	573d7e7e45	Issue #314: fix to potion use function (was mixing up potion with potion user)	2012-07-13 15:51:57 +02:00
Marc Zinnschlag	782d417d5b	Issue #314: potion usage	2012-07-13 13:09:22 +02:00
Carl Maxwell	e4d046f69c	Prepending m to the name of every member variable. ... I made a bunch of changes in apps/openmw/mwrender/animation.cpp because the scope brackets didn't line up in a bunch of places npcanimations.cpp & creatureanimations.cpp were the same kind of thing	2012-07-13 03:51:58 -07:00
scrawl	d2fbb11475	temp commit	2012-07-13 11:26:36 +02:00
Marc Zinnschlag	29b4a5e5f7	Issue #314: added apply actions	2012-07-13 09:41:38 +02:00
Marc Zinnschlag	84d846cf07	Issue #314: implemented apply and skillUsageSucceeded functions for MWClass::Npc	2012-07-13 09:16:27 +02:00
scrawl	7731e9a6fa	finished cleaning up sky	2012-07-13 09:13:12 +02:00
Marc Zinnschlag	805b81bf6e	Issue #314: added skillUsageSucceeded function to Class	2012-07-13 09:03:17 +02:00
Marc Zinnschlag	7a2d613043	Issue #314: extended Class::apply function to cover the actor	2012-07-13 08:50:46 +02:00
scrawl	b8384162b6	merge	2012-07-13 06:16:55 +02:00
scrawl	ad7383be43	sky	2012-07-11 09:08:55 +02:00
scrawl	e0a99f104b	settings tab "shadows"	2012-07-11 04:28:45 +02:00
scrawl	485adc8bdc	shader mode button in settingswindow	2012-07-11 03:19:51 +02:00
scrawl	865bfc6f47	sync mrt_output setting	2012-07-11 02:31:03 +02:00
Marc Zinnschlag	ec9ebe6b58	Merge branch 'skillgain' into potions ... Conflicts: apps/openmw/mwmechanics/activespells.cpp	2012-07-10 14:08:30 +02:00
Marc Zinnschlag	f11bf49a90	cmake fix; silenced some warnings	2012-07-10 13:23:41 +02:00
gugus	164a5c8fe4	rotation now also work with the physic representation	2012-07-10 12:10:50 +02:00
gugus	70c74ede05	changed rotation order	2012-07-10 11:53:12 +02:00
gugus	410b693555	setAngle improvement	2012-07-10 11:15:46 +02:00
scrawl	3537af051d	removed the old shader helper	2012-07-10 00:17:52 +02:00
scrawl	5d1e6b6bf6	remove cg profile check	2012-07-10 00:09:47 +02:00
scrawl	1a9f59d5d4	shadows	2012-07-10 00:07:33 +02:00
Marc Zinnschlag	0d8150f4bd	Issue #324: added useSkill function to NpcStats (adjust skill level according to use)	2012-07-09 21:15:52 +02:00
Marc Zinnschlag	a207c86fd1	Issue #324: added some range checks	2012-07-09 21:14:11 +02:00
Marc Zinnschlag	67c1c5ce18	Issue #324: adjusted setSkill script instructions according to the recent research	2012-07-09 20:42:45 +02:00
Marc Zinnschlag	25a5657d80	Issue #324: Modified the interface for modified stats	2012-07-09 20:34:12 +02:00
scrawl	07fd9986ef	accidently removed the map.	2012-07-09 20:14:07 +02:00