127 commits

Author	SHA1	Message	Date
Chris Robinson	5267d17408	Revert "forgot to destroy child scene nodes" ... This reverts commit f1a3309392. Unneeded. The caller already calls this which destroys the children recursively	2013-02-24 14:14:08 -08:00
ChrisKCat	9e7b559b09	Merge pull request #6 from scrawl/lights ... For light objects without an AttachLight bone, attach the light to the c...	2013-02-24 14:12:53 -08:00
scrawl	f1a3309392	forgot to destroy child scene nodes	2013-02-24 19:03:25 +01:00
scrawl	1ae2d3c6ab	For light objects without an AttachLight bone, attach the light to the center of the object instead of the origin.	2013-02-24 19:00:06 +01:00
greye	6a8c532244	fix and unify object cell change update in mwrender	2013-02-24 15:04:56 +04:00
Chris Robinson	0148db8ccf	Merge remote-tracking branch 'zini/master' into animation2 ... Conflicts: apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp	2013-02-23 05:59:35 -08:00
scrawl	4b51184ec4	Merge branch 'master' of https://github.com/zinnschlag/openmw into graphics	2013-02-23 14:37:28 +01:00
greye	ac7095537f	remove insertMesh() call on object cell change	2013-02-23 16:50:37 +04:00
scrawl	f17ea109ca	Fix light positions	2013-02-23 04:06:05 +01:00
Chris Robinson	7f2d71554e	Use the correct offset when building static geometry from an entity	2013-01-10 04:16:18 -08:00
scrawl	d3c0851aa7	Changed light attenuation back to linear in all cases, this seems to be what MW does.	2013-01-09 22:08:42 +01:00
Chris Robinson	c4c8295e0b	Rename NIFLoader to Loader, and update some comments	2013-01-09 09:10:59 -08:00
Chris Robinson	9675a6d04a	Merge remote-tracking branch 'zini/master' into animation2	2013-01-08 02:25:37 -08:00
Marc Zinnschlag	2557ef4d7d	post merge fixes and some misc clean up	2013-01-07 12:17:46 +01:00
Nathan Jeffords	0f3712f284	change flickering light's brightness pattern	2013-01-06 14:29:22 -08:00
Chris Robinson	58d35dbfcf	Have createEntities' caller retrieve the text keys as needed	2013-01-05 04:01:11 -08:00
greye	3c2ce25f5f	m prefix for mwworld/cellstore.hpp	2012-11-05 16:07:59 +04:00
greye	7606ebafd6	resolving conflicts, minor update	2012-09-17 11:37:50 +04:00
scrawl	950bf66334	throw an exception if default value for a setting is not found	2012-09-02 11:39:54 +02:00
greye	d6150b7482	high-level implementation, unstable	2012-07-30 23:28:14 +04:00
Chris Robinson	36be1536d9	Return text keys from NIFs when creating entities	2012-07-23 17:20:47 -07:00
scrawl	f8d6a36196	Merge branch 'master' into nif-cleanup ... Conflicts: apps/openmw/mwrender/sky.cpp apps/openmw/mwrender/sky.hpp components/nifogre/ogre_nif_loader.cpp components/nifogre/ogre_nif_loader.hpp	2012-07-23 15:35:31 +02:00
Chris Robinson	3dedac5cb1	Create mesh entities for objects when loading the NIF	2012-07-17 13:40:03 -07:00
Chris Robinson	a539e98274	Handle all meshes when inserting objects into the scene	2012-07-16 10:48:48 -07:00
Chris Robinson	939d0d2fc5	Return a list of meshes and the skeleton from NIFLoader::load	2012-07-13 20:01:15 -07:00
scrawl	865bfc6f47	sync mrt_output setting	2012-07-11 02:31:03 +02:00
Marc Zinnschlag	c85aaafac2	more include cleanup (most removing Ogre.h)	2012-07-03 15:32:38 +02:00
Marc Zinnschlag	87667ab57e	Issue #107: Ptr related include cleanup	2012-07-03 13:55:53 +02:00
Marc Zinnschlag	7fcd41c69d	Issue #107: Detemplateised CellStore; some include cleanup	2012-06-29 18:54:23 +02:00
Marc Zinnschlag	76174098c7	Issue #107: CellStore moved from ESMS to MWWorld	2012-06-29 16:48:50 +02:00
gugus	9dd65dce30	Finished merging.	2012-05-11 11:52:07 +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
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	c6da3872b4	light improvements	2012-04-19 20:59:57 +02:00
scrawl	f2fae770d4	Merge branch 'master' into physicsaedra2 ... Conflicts: apps/openmw/mwworld/player.cpp	2012-04-13 13:55:13 +02:00
scrawl	2a4fcf42a3	basic shadows	2012-04-11 18:53:13 +02:00
scrawl	9e1a9e5758	Merge branch 'master' into physicsaedra2 ... Conflicts: apps/openmw/mwinput/inputmanager.cpp libs/openengine/bullet/physic.cpp	2012-04-08 17:08:36 +02:00
scrawl	113bbfa253	removed the now unneccesary SG for transparent objects	2012-04-08 14:37:36 +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
scrawl	6442d49e16	render queue groups, sky fix	2012-04-04 18:53:40 +02:00
scrawl	8aea311797	added visibility flags for everything	2012-04-03 15:13:47 +02:00
scrawl	16481b0594	Merge branch 'master' into minimap	2012-04-02 19:38:36 +02:00
scrawl	342464530d	rotated map working	2012-04-02 19:37:24 +02:00
scrawl	5f2a674d93	fixed a typo	2012-04-02 16:14:39 +02:00
scrawl	fd662f937a	add settings for viewing distance and fog	2012-04-02 15:51:48 +02:00
scrawl	e5cc9adbb0	added settings for rendering distance of small objects	2012-04-02 15:30:29 +02:00
scrawl	1445ae992d	adding a setting to disable static geometry	2012-04-02 14:24:16 +02:00
Marc Zinnschlag	647c0e4df3	Merge remote branch 'scrawl/renderingdistance'	2012-03-29 21:27:25 +02:00
scrawl	0332a8df96	Merge branch 'renderingdistance' into minimap	2012-03-29 18:09:24 +02:00
Marc Zinnschlag	10b4c1d904	silenced a warning	2012-03-29 18:04:52 +02:00
scrawl	e22ae7c840	bounds fix (again)	2012-03-29 17:30:13 +02:00
scrawl	19c801f538	disabled rendering distance for now	2012-03-29 16:56:30 +02:00
scrawl	f45c650975	bounds fix	2012-03-29 16:47:59 +02:00
scrawl	bb09c2189a	lower rendering distance for small objects (reduce batch count)	2012-03-27 00:45:25 +02:00
Jason Hooks	18a139cd66	adding up and down move buttons	2012-03-24 22:03:08 -04:00
scrawl	5b38b17baf	local map rendering (nothing to see yet, as it is not displayed in GUI)	2012-03-10 15:28:18 +01:00
scrawl	42a7375a0b	adjusted the batch region size, this was the cause for lights going on/off bug	2012-03-04 23:26:35 +01:00
Marc Zinnschlag	784c6fe0ff	some cleanup	2012-02-06 10:41:13 +01:00
Marc Zinnschlag	e1600d9a2a	fixed movable object cleanup for ordinary objects	2012-02-06 10:29:18 +01:00
Jason Hooks	0d3338f867	Some naming changes	2011-11-22 02:39:28 -05:00
Marc Zinnschlag	51d5c7cd59	Merge remote branch 'jhooks/mwrender' into mwrender ... Conflicts: apps/openmw/engine.cpp - fixed code that did not compile - removed tons of tabs - more clean up	2011-11-21 12:52:28 +01:00
Jason Hooks	7385948056	Yet another crash fix	2011-11-19 20:22:56 -05:00
Jason Hooks	7319f7a8c6	Many bugs fixed related to changing cells	2011-11-19 01:01:19 -05:00
Jason Hooks	4dc59dfbdd	Scenenode flip	2011-11-17 17:10:27 -05:00
Jason Hooks	62d8d1add2	more recommended changes	2011-11-11 14:37:42 -05:00
Jason Hooks	a7652bcb0c	Yacoby's changes on Objects	2011-11-09 13:53:29 -05:00
Jason Hooks	469086747e	Compile error fix;RenderingInterface separated; buildStaticGeometry argument changed	2011-11-07 23:35:39 -05:00
Jason Hooks	c11b3a57c1	Made buildStaticGeometry function	2011-11-05 14:57:33 -04:00
Jason Hooks	8edcd4d15b	removing tabs	2011-11-04 21:57:39 -04:00
Jason Hooks	6c80e75deb	More Objects functionality	2011-11-04 21:48:52 -04:00
Jason Hooks	edf85b26f9	Insert Mesh, Insert Light, insertBegin improved	2011-11-03 19:40:37 -04:00
Jason Hooks	9ac627c931	Commenting out assert	2011-11-02 22:45:58 -04:00
Jason Hooks	d49a02abe5	new insertBegin()	2011-11-02 22:41:48 -04:00
Jason Hooks	c2181d2091	Dealing with scenenodes	2011-11-02 00:13:33 -04:00
Jason Hooks	3d43a4cd33	Made recommended changes	2011-11-01 13:46:57 -04:00
Jason Hooks	f1bc5b0ab6	Objects started, RenderingInterface	2011-10-31 23:59:16 -04:00