2891 commits

Author	SHA1	Message	Date
scrawl	3a2dccad4b	Implement 'Show' script instruction	2016-02-27 13:40:53 +01:00
scrawl	f99cd15f00	Vanilla-compatible activate / onActivate (Fixes #1629) ... See https://forum.openmw.org/viewtopic.php?f=6&t=3074&p=34618#p34635	2016-02-26 13:08:35 +01:00
scrawl	195c3b9967	Merge pull request #904 from sandstranger/disable_opengles_anddroid ... disable opengl es for Android by default	2016-02-25 21:39:25 +01:00
scrawl	cdccf03228	Fix mismatched delete	2016-02-25 21:32:42 +01:00
sandstranger	a7b78b37f5	disable opengles for Android by default	2016-02-25 22:39:18 +03:00
scrawl	5f4ace1bc2	Implement support for sphere map NiTextureEffects (Fixes #1827)	2016-02-24 21:06:41 +01:00
scrawl	062410bd8c	Don't incorrectly remove TexEnv state	2016-02-23 10:56:18 +01:00
scrawl	90a99991d1	Use empty() instead of !size()	2016-02-22 19:06:12 +01:00
scrawl	8bd16e4d5a	Don't compute the world matrix multiple times	2016-02-22 18:58:19 +01:00
scrawl	055d35a2b0	Revert "Warn about particle emitters that have multiple parent node paths" ... Not working correctly because osg won't ignore camera nodes. This reverts commit 1667c807be.	2016-02-22 18:10:25 +01:00
scrawl	1667c807be	Warn about particle emitters that have multiple parent node paths	2016-02-22 15:21:06 +01:00
Marc Zinnschlag	f9f91d5386	Merge remote-tracking branch 'origin/master'	2016-02-21 09:01:17 +01:00
scrawl	cee608e31b	Make it work with appveyor's outdated OSG build	2016-02-21 01:41:50 +01:00
scrawl	8e826eefe6	Add missing initialization	2016-02-21 01:26:45 +01:00
scrawl	e25e0a0600	ShaderVisitor: assume the first texture unit is the diffuseMap	2016-02-20 23:47:32 +01:00
scrawl	e7682e04ae	Cleanup	2016-02-20 22:09:41 +01:00
scrawl	cdefee3e64	Add call to MultiObjectCache::releaseGLObjects	2016-02-20 20:38:37 +01:00
scrawl	4ca6e91292	Fix in-code default settings so that we don't attempt to use shaders in OpenCS	2016-02-20 20:36:29 +01:00
scrawl	8f81df2bd3	Cleanup	2016-02-20 20:34:56 +01:00
scrawl	0db7163363	Add specular mapping for terrain	2016-02-20 19:55:08 +01:00
scrawl	171e293641	ShaderManager: insert #line directives when including files	2016-02-20 19:55:08 +01:00
scrawl	f01e8a6950	Add specular mapping for objects	2016-02-20 19:55:08 +01:00
scrawl	5cf2441b10	ShaderVisitor: support automatic recognition of normal maps based on file pattern ... Introduce new settings 'auto use object normal maps', 'auto use terrain normal maps', 'normal map pattern'	2016-02-20 18:00:43 +01:00
scrawl	6a0ac824bd	Fix terrain error in OpenCS	2016-02-19 15:00:58 +01:00
scrawl	7071d286e8	Fix inverted check for 16-bit indices	2016-02-19 14:59:47 +01:00
scrawl	4e5462bc19	Don't attempt to create a collision shape for an empty TriShape	2016-02-19 14:23:55 +01:00
scrawl	ca0e1fe0e0	Set the osg::Material on the terrain root node	2016-02-19 01:45:28 +01:00
scrawl	6000e48bba	Add terrain shaders and normal map support ... Textures with _n filename suffix are automatically recognized as terrain normal maps.	2016-02-19 01:37:30 +01:00
scrawl	5e12a1b4ef	Add enchanted item glow to the shader	2016-02-18 23:05:44 +01:00
scrawl	268594dcf1	Recreate shader in NpcAnimation::setAlpha	2016-02-18 22:48:53 +01:00
scrawl	a73512afb7	Add shader settings to settings.cfg	2016-02-18 19:38:34 +01:00
scrawl	21c4dffed2	Add #include support in shaders	2016-02-18 19:37:58 +01:00
scrawl	22cc5c0965	Cache the Program	2016-02-18 19:37:58 +01:00
scrawl	456816f707	Use diffuse.a / vertex.a, use material emission	2016-02-18 19:37:58 +01:00
scrawl	3e854a84a2	Slightly more efficient applying of light state	2016-02-18 19:37:57 +01:00
scrawl	f93b7ec943	Fix light state issue ... GLSL does not respect gl_Disable(GL_LIGHTX), so we have to set unused lights to zero. Sadly, this change makes the applying of the modelView matrix less efficient. So far I couldn't find a better solution, osg's state tracker keeps getting in the way. :(	2016-02-18 19:37:57 +01:00
scrawl	9376811213	Vertex lighting shader	2016-02-18 19:37:57 +01:00
scrawl	a9ad1b09e2	Introduce ShaderManager & ShaderVisitor ... Actual shaders still to be written.	2016-02-18 19:37:56 +01:00
scrawl	e647ee5424	Support RGB and RGBA embedded textures in NIF files (Fixes #2295)	2016-02-18 19:37:56 +01:00
scrawl	a9ac108382	Fully read NiPixelData	2016-02-18 19:37:56 +01:00
scrawl	606758d72f	NifLoader: create the BumpTexture slot, but don't use it yet	2016-02-18 19:37:56 +01:00
scrawl	4cd4131da9	NifLoader: assign a name to created textures ... This name will tell the shader visitor how to handle that texture.	2016-02-18 19:37:56 +01:00
scrawl	50e92c8136	NifLoader: move texture property handling to a separate function	2016-02-18 19:37:56 +01:00
scrawl	acf44fd9e5	NifLoader: handleTextureControllers outside of the NumTextures loop	2016-02-18 19:37:55 +01:00
scrawl	e05d975020	Change the way that texture filtering settings are applied at runtime	2016-02-18 19:37:55 +01:00
scrawl	a94029267f	Fix an inverted condition (Bug #3209)	2016-02-18 01:25:52 +01:00
scrawl	c4d38bb42d	Fix clang analyzer warnings	2016-02-16 19:17:04 +01:00
scrawl	ed57293e54	Allow '^' escape characters in books ... http://forum.openmw.org/viewtopic.php?f=2&t=3373&p=37584&sid=1a0b015e6716b1bced37fd398ef876c7	2016-02-16 14:55:13 +01:00
scrawl	9eb96b9cb6	Parse the bullet version in FindBullet.cmake	2016-02-15 14:34:59 +01:00
scrawl	83a9a164bc	Raise the required bullet version to 2.83 ... 2.82 appears to have a bug that causes the player to be able to phase through certain objects (bug #1587).	2016-02-15 00:33:17 +01:00