16367 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Aesylwinn	c8bae38a8e	Remove trackball mode	2016-03-18 14:53:10 -04:00
Aesylwinn	0e75b4a234	Remove warning about */ outside of comment	2016-03-18 14:49:00 -04:00
Aesylwinn	7009355baf	Remove unused variable	2016-03-18 14:46:53 -04:00
Aesylwinn	4374f69a60	Reduce mouse sensitivity	2016-03-18 14:43:13 -04:00
Aesylwinn	2b72a04e7a	Update 1st person up axis ASAP.	2016-03-18 14:02:55 -04:00
Aesylwinn	999869da24	Position camera above, near, and looking at the scene.	2016-03-18 14:02:24 -04:00
Aesylwinn	fcccacc0fa	Define a constant for the World Up vector	2016-03-18 13:57:48 -04:00
scrawl	0a2724f9f2	Update AUTHORS.md	2016-03-18 10:28:38 +01:00
Marc Zinnschlag	589fb1031b	Merge remote-tracking branch 'pi03k/bug_3248'	2016-03-18 07:32:57 +01:00
scrawl	a6e23d03d3	Don't clamp disposition twice, clamping is already done inside getDerivedDisposition	2016-03-18 00:42:22 +01:00
scrawl	102f9719f7	Remove some garbage	2016-03-18 00:39:27 +01:00
scrawl	79eb2d20e0	Cleanup	2016-03-18 00:39:19 +01:00
scrawl	12ec90f9e7	Change default argument, fix GetDisposition	2016-03-18 00:38:02 +01:00
scrawl	bc5adfa4fe	Merge pull request #913	2016-03-18 00:31:55 +01:00
scrawl	30402f75e3	Use xbase_anim_female as the base skeleton for female NPCs (Fixes #3258)	2016-03-18 00:24:38 +01:00
scrawl	2b38d10449	Always add xbase_anim	2016-03-18 00:17:05 +01:00
pi03k	629a558e7b	Fix for bug 3248	2016-03-17 22:34:45 +01:00
Aesylwinn	59f59a3385	Fix indentation	2016-03-14 00:45:36 -04:00
Aesylwinn	08fe914ba1	Preliminary editor camera	2016-03-14 00:45:18 -04:00
Aesylwinn	2cff2cd643	Remove unnecessary override.	2016-03-14 00:45:08 -04:00
Aesylwinn	9ed2cf6581	Fix callback being skipped	2016-03-14 00:44:56 -04:00
Aesylwinn	ebdc212886	Moved selectNavigationMode to SceneWidget class, centralized camera selection.	2016-03-14 00:44:46 -04:00
Aesylwinn	9afb0e0f90	Input restructuring.	2016-03-14 00:42:15 -04:00
Aesylwinn	f4f7afb53b	Removed now unnecessary installation of event filter.	2016-03-14 00:41:57 -04:00
Aesylwinn	38059593a7	Removed workaround for OSG input handling in RenderWidget.	2016-03-14 00:41:04 -04:00
Aesylwinn	48047beb9a	Stripped OSG mouse and keyboard handling.	2016-03-14 00:40:40 -04:00
scrawl	24ae9f4ac1	Remove no longer needed apply(Geode&) in SetFilterSettingsVisitor and NodeToShapeVisitor ... In OSG 3.4 (which is now a requirement), Drawables are normal Nodes attached in the scene graph. Geode is still provided for backwards compatibility, but does not need to be specially handled here because it now functions just like a normal Group node.	2016-03-14 00:38:22 +01:00
scrawl	e8caafa190	Remove no longer needed applyEffect(osgFX::Effect&) in SetFilterSettingsVisitor ... No longer needed because terrain texture filtering is now updated manually in TerrainGrid::updateTextureFiltering.	2016-03-14 00:31:43 +01:00
scrawl	50acdf3e47	Move createCharacter inside the try block	2016-03-14 00:03:02 +01:00
scrawl	a0cc9de088	Make the creation of save file directories even more explicit	2016-03-14 00:00:11 +01:00
scrawl	b7b7c0612d	Make getCurrentCharacter create argument explicit	2016-03-13 23:48:44 +01:00
scrawl	7463c0c353	Addition to last commit, don't create a save directory on death	2016-03-13 23:48:22 +01:00
scrawl	426a6fdcc2	Don't create the save directory on loading a game ... This prevents empty directories being created when loading a save file outside of the saves directory with the --load-savegame switch.	2016-03-13 23:42:08 +01:00
scrawl	d7c7bb850b	ToggleAI cleanup	2016-03-12 20:32:42 +01:00
Marc Zinnschlag	d5067201d0	Merge branch 'move'	2016-03-12 13:27:00 +01:00
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