16282 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Marc Zinnschlag	900378a31e	changed 'not implemented' warning message for object movement	2016-03-12 13:26:33 +01:00
Marc Zinnschlag	d6b8033b46	handle cell transitions when moving objects	2016-03-12 13:19:51 +01:00
Marc Zinnschlag	5c587fe93e	Merge remote-tracking branch 'scrawl/cs_waterlevel'	2016-03-12 08:07:38 +01:00
scrawl	d840c7d5eb	Slightly tweak the spawn point heuristics ... Fixes an issue with hlaalu building exits	2016-03-11 22:48:28 +01:00
scrawl	97526284f5	Allow setting the water level of an interior cell with sky (Fixes #3244)	2016-03-11 22:10:59 +01:00
scrawl	d986b1a48b	Add comment	2016-03-11 19:28:53 +01:00
scrawl	1abb77f8a1	Cleanup	2016-03-11 19:18:51 +01:00
scrawl	9f03982e0b	Use a dedicated VBO for RigGeometry's vertices and normals ... The VBO used by the source geometry's arrays may be unintentionally shared with other RigGeometries. The vertices and normals are the only attributes that are modified at all, so using a dedicated VBO for these should improve performance further.	2016-03-11 19:08:48 +01:00
scrawl	50b8260a39	Disable VBOs in RigGeometry while investigating a crash possibly related to commit cda8a88f0d	2016-03-11 18:21:55 +01:00
scrawl	aae43dbff5	Set the MorphGeometry vertex buffer object usage to GL_DYNAMIC_DRAW	2016-03-11 16:10:39 +01:00
scrawl	4eb090a8d0	Set the RigGeometry vertex buffer object usage to GL_DYNAMIC_DRAW	2016-03-11 16:09:48 +01:00
scrawl	174dd82894	Manually apply the osg::Light state ... Reduce the amount of virtual function calls. Don't use the osg::Light's lightNum. Don't set spotlight state that we're not using (yet).	2016-03-11 15:43:20 +01:00
Marc Zinnschlag	fa9689c5e7	delay command execution until call to Object::apply has finished (avoids cutting off the branch we are sitting on)	2016-03-11 14:04:47 +01:00
Marc Zinnschlag	6a2fe564ef	Merge branch 'master' into move	2016-03-11 12:47:33 +01:00
scrawl	58e0e8bd4e	Enable vertex buffer objects in RigGeometry	2016-03-11 01:39:09 +01:00
scrawl	0dbf44b414	Enable vertex buffer objects in MyGUI RenderManager now that OSG 3.4 is a dependency	2016-03-11 01:35:57 +01:00
scrawl	3f08cbff71	Share the state attributes for terrain techniques ... Reduces the total amount of GL calls / frame by about 14% - 50% depending on the scene.	2016-03-11 01:08:53 +01:00
scrawl	84b8da7a09	Share the osg::Material on drawables ... Reduces the number of GL calls / frame by ~4%.	2016-03-11 01:06:54 +01:00
scrawl	85bd4f52f0	Improve occlusion query geometry rendering	2016-03-11 00:09:46 +01:00
scrawl	93ec289b1d	Improve setting of occlusion query state	2016-03-10 23:18:20 +01:00
scrawl	14e1911820	Fix memory leaks	2016-03-10 20:38:14 +01:00
scrawl	abcfe9bcee	Don't add empty text key objects	2016-03-10 17:01:14 +01:00
scrawl	02d23564dc	Include cleanup	2016-03-10 14:29:45 +01:00
scrawl	f898bf493f	Don't use Geodes	2016-03-10 13:17:01 +01:00
scrawl	137dde7cf8	Include cleanup	2016-03-10 12:59:17 +01:00
ae-g-i-s	c9791c5c1a	Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves (fixes #3233)	2016-03-08 21:30:28 +01:00
ae-g-i-s	2f1c6c740c	Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)" ... This reverts commit 000597236e.	2016-03-08 20:41:39 +01:00
ae-g-i-s	9585a12fb1	Merge remote-tracking branch 'upstream/master' into enable-unbounded-disposition-check	2016-03-08 20:40:47 +01:00
Marc Zinnschlag	b2181fae20	safer handling of command macros	2016-03-08 10:48:44 +01:00
scrawl	121bdd3e39	Update comment	2016-03-07 22:46:15 +01:00
scrawl	3e6cf17665	Warn about cellrefs with an empty refId (Bug #3238)	2016-03-07 22:44:03 +01:00
scrawl	d0aba0d9ee	Catch exceptions thrown during reference loading (Bug #3238)	2016-03-07 21:28:50 +01:00
scrawl	b139ad56b7	Merge pull request #912 from corristo/bring-osx-ci-back ... Reactivate OS X CI	2016-03-06 20:40:07 +01:00
ae-g-i-s	000597236e	Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() (Fixes #3233)	2016-03-06 18:29:32 +01:00
Nikolay Kasyanov	697b809c79	Reactivate OS X CI	2016-03-06 16:09:10 +01:00
scrawl	0fc65db6bb	Remove parts before setting the new object root	2016-03-06 11:34:15 +01:00
scrawl	0df975a4d7	Properly detach nodes in CopyRigVisitor (Fixes #3234)	2016-03-06 11:33:07 +01:00
scrawl	82b792f808	Eliminate dynamic_cast in BillboardCallback	2016-03-05 20:02:33 +01:00
scrawl	60a12b3dee	Use MyGUI's castType function	2016-03-05 20:00:51 +01:00
scrawl	763f647412	Add ItemModel::allowedToInsertItems	2016-03-05 19:53:24 +01:00
scrawl	373c1e7602	Assign the PageDisplay on initialization	2016-03-05 19:48:01 +01:00
scrawl	5ea7446eeb	Change a dynamic_cast to static_cast	2016-03-05 19:41:45 +01:00
scrawl	c085e503c6	Pass the btCollisionObject as const	2016-03-05 16:09:56 +01:00
scrawl	004f0d37d5	Fix the projectile launch position for spells cast from objects (Fixes #3235)	2016-03-05 15:56:54 +01:00
scrawl	910e41e3c4	Allow an Object to be specified as ignore parameter for castRay	2016-03-05 15:56:19 +01:00
Marc Zinnschlag	b5005f7812	keep sub mode over mode changes	2016-03-05 11:41:42 +01:00
Marc Zinnschlag	a63453846b	properly clear drag mode at the end of a drag	2016-03-05 11:14:08 +01:00
Marc Zinnschlag	51a4e3fa7d	properly abort drags from outside the worldspace widget (code was leaving unclean dragging flags behind)	2016-03-05 10:56:54 +01:00
Marc Zinnschlag	70745487f3	cancel instance move on editing lock becoming active	2016-03-05 10:44:46 +01:00
Marc Zinnschlag	b1fb64bf68	added missing drag mode resets	2016-03-04 16:25:30 +01:00