14667 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
scrawl	a3151fe525	fixed input handling priority in the main loop	2012-04-05 21:16:51 +02:00
scrawl	8bfc81f398	Merge branch 'master' into water	2012-04-05 20:09:38 +02:00
scrawl	622fb568cf	removed MRT setting and figure it out automatically	2012-04-05 19:27:54 +02:00
scrawl	b8a470efcd	put transparent objects in a seperate render queue, in order to not mess up the mrt textures	2012-04-05 19:07:21 +02:00
Marc Zinnschlag	000cfad82d	Merge remote branch 'scrawl/gamesettings'	2012-04-05 18:07:47 +02:00
scrawl	88c50c5171	Merge branch 'master' into water	2012-04-05 15:38:46 +02:00
scrawl	1b89a9e203	various fixes	2012-04-05 15:30:55 +02:00
Dmitry Marakasov	84b475130a	Add missing include	2012-04-05 15:03:28 +02:00
Marc Zinnschlag	d45abcd89c	Merge remote branch 'k1ll/master'	2012-04-05 15:02:44 +02:00
Marc Zinnschlag	01500e979a	another fix for optional arguments	2012-04-05 15:00:49 +02:00
scrawl	e1bde415f5	typo	2012-04-05 14:22:44 +02:00
scrawl	43fd0352f4	removed unneeded lines	2012-04-05 14:21:57 +02:00
scrawl	f49131e1b8	renamed setting, automatically disable MRT when unsupported	2012-04-05 13:09:59 +02:00
k1ll	f2c4e513a4	Add support for building with a static build of the MyGui Libraries.	2012-04-05 13:01:09 +02:00
scrawl	add4ebe445	fresnel effect	2012-04-05 12:59:56 +02:00
Marc Zinnschlag	1201c271b2	Merge remote branch 'swick/initocfg'	2012-04-05 12:43:00 +02:00
scrawl	f6342cfd60	fixed viewport background color, fixed indentation of some old functions	2012-04-05 11:52:06 +02:00
scrawl	5664d879a5	fixed some sky objects	2012-04-05 11:40:56 +02:00
scrawl	8ddc8131a5	fresnel test	2012-04-05 11:18:58 +02:00
scrawl	36fd9b9f26	shore transition test	2012-04-05 10:39:22 +02:00
scrawl	ab8b74dcac	forgot adding a file	2012-04-05 08:58:21 +02:00
Jason Hooks	ca4de0606e	Some planning	2012-04-04 23:23:24 -04:00
scrawl	3f05aba76d	got MRT working, some minor quirks to solve (black viewport background)	2012-04-05 01:21:36 +02:00
Sebastian Wick	f7bfea5861	typo 2 -.-	2012-04-05 00:16:44 +02:00
Sebastian Wick	56c9992b29	typo	2012-04-04 23:52:42 +02:00
Sebastian Wick	8c84f68dab	fix for older boost versions; unsigned warning	2012-04-04 23:51:22 +02:00
Marc Zinnschlag	6fd3d5c776	Merge remote branch 'lgro/master'	2012-04-04 23:19:30 +02:00
gugus	aaa5368fe9	added script instruction pcraiserank. Does not work yet.	2012-04-04 22:14:38 +02:00
gugus	2c7c945208	check playerfaction during dialogue	2012-04-04 22:13:57 +02:00
Lukasz Gromanowski	ea8e5cb6f8	Issue #225: Land struct is not copyable. ... Disabled copy constructor and assignment operator in Land structure.	2012-04-04 21:39:21 +02:00
Lukasz Gromanowski	cd2789b15a	Revert "Issue #225: Correction to commit ae98904." ... This reverts commit 0e5c90d3e7.	2012-04-04 21:05:19 +02:00
Sebastian Wick	5dd65c11ee	forgot to save the file	2012-04-04 21:04:52 +02:00
Sebastian Wick	57ae1bdc43	Merge branch 'master' of https://github.com/zinnschlag/openmw into initocfg ... Conflicts: apps/openmw/main.cpp	2012-04-04 20:58:02 +02:00
scrawl	eb67afe552	added MRT output to terrain material	2012-04-04 20:18:08 +02:00
Sebastian Wick	6ccb32d26c	import nosound option	2012-04-04 20:06:31 +02:00
Sebastian Wick	d3a6484bbc	set the default value for --fallback the right way	2012-04-04 19:59:46 +02:00
Sebastian Wick	a974d88cf1	Revert "set a default value for --fallback" ... This reverts commit 94a220dcdd.	2012-04-04 19:58:04 +02:00
scrawl	006970fd79	add MRT code to shaders	2012-04-04 19:53:41 +02:00
Sebastian Wick	94a220dcdd	set a default value for --fallback	2012-04-04 19:52:07 +02:00
scrawl	6442d49e16	render queue groups, sky fix	2012-04-04 18:53:40 +02:00
Sebastian Wick	48b7b03453	typo; World::getFallback(std::string key, std::string def)	2012-04-04 16:15:15 +02:00
Sebastian Wick	16e7bf353a	remove debug message	2012-04-04 16:08:46 +02:00
Sebastian Wick	de510d445b	throw an error if the --fallback syntax is wrong	2012-04-04 15:23:14 +02:00
Sebastian Wick	329ba24eab	streamlined command line options	2012-04-04 15:11:30 +02:00
scrawl	328bdaafb6	fixed a problem with the underwater compositor	2012-04-03 22:53:08 +02:00
scrawl	2fa9bac517	added fog	2012-04-03 22:04:37 +02:00
scrawl	cc4076d42a	basic noise	2012-04-03 21:16:43 +02:00
scrawl	fe63f2b2aa	first reflection test; removed the refraction render (we'll have it for free using MRT and deferred water rendering)	2012-04-03 19:10:02 +02:00
Marc Zinnschlag	e403c7158a	Merge remote branch 'gus/DialogueSystem'	2012-04-03 18:27:36 +02:00
Marc Zinnschlag	cc9696cc2c	Merge remote branch 'scrawl/minimap'	2012-04-03 18:26:20 +02:00