572 commits

Author	SHA1	Message	Date
scrawl	1b561ce91f	Merge branch 'master' into next	2012-05-29 06:56:23 +02:00
scrawl	69e6bc6588	add water settings to settings window	2012-05-29 06:45:44 +02:00
scrawl	5d03e86613	added field of view and texture filtering to settings window	2012-05-29 04:54:54 +02:00
scrawl	14f4f09f83	proper resolution switching (reposition GUI & adjust mouse clipping region)	2012-05-28 09:19:25 +02:00
scrawl	3daf1ebc3f	small map tweak	2012-05-28 05:03:50 +02:00
scrawl	19c428e86c	delete fix	2012-05-28 02:04:00 +02:00
scrawl	8f667580bb	ogre 1.8 final release compability fixes	2012-05-27 23:12:45 +02:00
scrawl	f6a6684685	when the resolution changes, adjust camera aspect ratio and recreate compositors	2012-05-27 21:39:18 +02:00
scrawl	a7e6a142f9	blend fog of war into adjacent cells	2012-05-27 00:39:33 +02:00
scrawl	656a8f1be9	working menu transparency slider	2012-05-23 01:32:36 +02:00
Marc Zinnschlag	7938566004	Merge remote branch 'scrawl/graphics' ... Conflicts: apps/openmw/mwrender/renderingmanager.cpp	2012-05-21 11:24:36 +02:00
scrawl	8f2c8bbea4	Merge branch 'master' into graphics	2012-05-21 09:50:46 +02:00
scrawl	789dfe1c88	fix a bug with water reflection plane height	2012-05-21 09:50:02 +02:00
scrawl	8a0c859c16	Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI	2012-05-18 22:27:48 +02:00
scrawl	c9aa0ca1f4	don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region	2012-05-17 19:54:09 +02:00
scrawl	933a40de14	better floating object label positioning.	2012-05-14 21:37:43 +02:00
gugus	9dd65dce30	Finished merging.	2012-05-11 11:52:07 +02:00
scrawl	ee883446b5	Merge branch 'master' into graphics	2012-05-04 07:38:11 +02:00
scrawl	02dad448fe	make the wireframe mode not affect sky	2012-05-03 05:38:43 +02:00
scrawl	9e6531a6c6	fix for dark corners bug on some cards	2012-04-30 21:22:26 +02:00
scrawl	4655ec94f0	Merge branch 'master' into physicsaedra2 & fix warnings ... Conflicts: apps/openmw/mwworld/scene.cpp	2012-04-30 18:46:51 +02:00
scrawl	aaa81397ed	Merge branch 'master' into graphics ... Conflicts: apps/openmw/mwscript/docs/vmformat.txt	2012-04-30 18:24:05 +02:00
scrawl	50d79a8815	Merge branch 'next' into tooltips	2012-04-29 17:30:34 +02:00
scrawl	9cf6f27f96	small fix	2012-04-29 03:38:00 +02:00
scrawl	11ebae3be2	toggleCompositors command useful for debugging	2012-04-29 03:33:10 +02:00
Marc Zinnschlag	d1d21c8a0e	compile fix	2012-04-28 21:21:40 +02:00
scrawl	4ce83badc9	flickering lights	2012-04-28 20:42:53 +02:00
scrawl	1b5bfc52a1	Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips ... Conflicts: apps/openmw/engine.cpp apps/openmw/mwclass/apparatus.cpp apps/openmw/mwclass/book.cpp apps/openmw/mwclass/container.cpp apps/openmw/mwclass/ingredient.cpp apps/openmw/mwclass/misc.cpp apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/potion.cpp apps/openmw/mwclass/repair.cpp apps/openmw/mwgui/window_manager.cpp	2012-04-24 02:02:03 +02:00
scrawl	e443455612	Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics	2012-04-24 00:54:35 +02:00
Marc Zinnschlag	7ac9523e0c	Merge branch 'master' into next	2012-04-23 15:32:02 +02:00
Marc Zinnschlag	35f478071e	Issue #255: deleted the old environment class and using the new one instead	2012-04-23 15:27:03 +02:00
Marc Zinnschlag	cc86998281	removing some cout spam	2012-04-21 10:12:59 +02:00
scrawl	7400b7f313	fix underwater effect staying active when teleporting from underwater to a cell that doesn't have water	2012-04-19 23:25:58 +02:00
scrawl	c6da3872b4	light improvements	2012-04-19 20:59:57 +02:00
scrawl	fb0e649191	minor fix	2012-04-19 01:10:55 +02:00
scrawl	aa4a1b675f	fixed the sky reflection issue	2012-04-19 01:08:26 +02:00
scrawl	046ef39c4a	use camera-relative rendering to prevent precision artifacts when moving far from (0,0,0)	2012-04-18 01:10:00 +02:00
scrawl	51a76eda92	Merge branch 'master' into graphics	2012-04-18 01:09:55 +02:00
Jason Hooks	1ce759af06	Merging in master	2012-04-17 18:12:05 -04:00
scrawl	1de1b3e40e	Merge branch 'master' into tooltips	2012-04-17 15:57:08 +02:00
scrawl	a11c4da16c	vertex colour tweak	2012-04-17 14:22:03 +02:00
Marc Zinnschlag	14ddcc1204	Merge remote branch 'jhooks/clothingarmor'	2012-04-17 00:26:39 +02:00
Jason Hooks	950378ff65	Khajiit male foot fix	2012-04-16 17:25:55 -04:00
scrawl	13b67faf2f	adding more safety checks	2012-04-16 20:39:41 +02:00
Marc Zinnschlag	7483c78b4a	Merge remote branch 'jhooks/clothingarmor' ... Conflicts: apps/openmw/mwrender/npcanimation.cpp	2012-04-16 14:06:27 +02:00
scrawl	d1e298c2e1	Merge branch 'master' into tooltips	2012-04-16 13:15:50 +02:00
Jason Hooks	0c9c253778	Fix for some types of boots	2012-04-15 22:49:17 -04:00
scrawl	0a223196e8	Merge branch 'master' into tooltips	2012-04-15 22:23:16 +02:00
scrawl	268b7cd6fc	replaced typename checks	2012-04-15 22:05:33 +02:00
Marc Zinnschlag	afa859a6a6	Merge remote branch 'jhooks/clothingarmor' ... Conflicts: apps/openmw/mwrender/npcanimation.cpp	2012-04-15 22:06:05 +02:00