2853 commits

Author	SHA1	Message	Date
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
Marc Zinnschlag	28e3fe837f	Merge remote-tracking branch 'scrawl/osg_34'	2016-02-14 17:31:33 +01:00
scrawl	eaf3f5a829	Remove unused arguments	2016-02-13 04:14:05 +01:00
scrawl	6fc6913424	Do not set the cursor when creating it	2016-02-13 03:34:09 +01:00
scrawl	5824619a95	Clean up includes	2016-02-12 19:28:10 +01:00
scrawl	8b596dfcbe	Remove support for OSG 3.2 ... Since commit e8662bea31, we're using OSG functionality that contains an unfixed crash bug in version 3.2. The bug is fixed in version 3.4 (OSG commit 6351e5020371b0b72b300088a5c6772f58379b84)	2016-02-12 14:46:45 +01:00
scrawl	be6ea3d607	Account for UV coordinate flip in UVController (Fixes #3203)	2016-02-11 16:22:54 +01:00
Marc Zinnschlag	da6dcfc49e	Merge remote-tracking branch 'scrawl/resource'	2016-02-10 16:23:38 +01:00
scrawl	5e876b1379	Add missing include	2016-02-10 15:34:06 +01:00
scrawl	98c5e072f2	Swap the terrain cache update order to make more sense	2016-02-09 21:17:10 +01:00
scrawl	9f729667fb	Remove debug output	2016-02-09 21:16:11 +01:00
scrawl	0865cea211	Preload terrain	2016-02-09 21:16:11 +01:00
scrawl	98848c752a	Make getLayerInfo thread safe	2016-02-09 20:26:58 +01:00
scrawl	8aba74e6ee	Remove GridElement	2016-02-09 20:23:53 +01:00
scrawl	596fe56bfd	Make Land::loadData thread safe	2016-02-09 20:21:56 +01:00
scrawl	afe533e670	Accept a const Object in UnrefQueue	2016-02-09 19:00:30 +01:00
scrawl	246566cef4	Preload instances in BulletShapeManager	2016-02-09 18:48:49 +01:00
scrawl	e28dc3e72f	Preload instances in SceneManager	2016-02-09 18:35:26 +01:00
scrawl	2e62298bd3	Clean up ObjectCache includes	2016-02-09 18:11:07 +01:00
scrawl	40a6e05e17	Use a deque instead of vector in UnrefQueue	2016-02-09 16:09:55 +01:00
scrawl	d11c2864df	Introduce UnrefQueue to handle the deleting of no longer needed objects in the background thread	2016-02-09 15:45:35 +01:00
scrawl	84f01b7527	Remove unneeded forward declaration	2016-02-08 16:27:28 +01:00
scrawl	b2019d31c7	Mark thread safe methods in BsaFile	2016-02-08 15:55:05 +01:00
scrawl	e4e313fe12	Remove outdated comment	2016-02-08 14:41:21 +01:00
scrawl	c8054424c9	Preload items equipped by NPCs	2016-02-07 22:37:52 +01:00
scrawl	a81b10b415	Make the cache expiryDelay configurable	2016-02-07 19:05:55 +01:00
scrawl	41233fc8e5	Keep a reference to the original scene template for as long as the instance is used	2016-02-07 18:56:21 +01:00
scrawl	778bce3ae9	Remove unused ObjectCache functions	2016-02-07 18:27:12 +01:00
scrawl	49ecac4ced	Add a mutex lock around the SharedStateManager	2016-02-07 07:37:35 -08:00
scrawl	c3ad4dad75	Fix applying of filter settings on terrain textures	2016-02-07 05:53:56 -08:00
scrawl	8b981ab507	Crash fix	2016-02-07 05:53:42 -08:00
scrawl	c155680d3c	Customize ObjectCache for more efficient locking in removeExpiredObjectsInCache	2016-02-07 00:43:37 +01:00
scrawl	d855a13b44	Clear the resource cache from the worker thread	2016-02-07 00:36:31 +01:00
scrawl	6f9ca0f68f	Add basic cell preloader class ... Not properly in use yet, but seems to be working.	2016-02-07 00:14:13 +01:00
scrawl	e055ae094a	Improve const-correctness in BulletShapeManager ... Sadly, two const_cast's are needed to work around Bullet API quirks.	2016-02-07 00:14:13 +01:00
scrawl	b7e69cbc64	Refactor WorkQueue, merge WorkTicket and WorkItem ... Allow the caller to hold on to the WorkItem. This makes it possible for a derived WorkItem to store the result of the work within the WorkItem itself.	2016-02-06 22:42:45 +01:00
scrawl	df57d4bfba	Use a common base class for resource managers ... Implement updateCache to delete unreferenced cached objects when they have not been referenced for a while.	2016-02-06 17:22:17 +01:00
scrawl	e02f35264f	Work around OSG 3.2 not respecting the DEEP_COPY_CALLBACK flag (Fixes #3183)	2016-02-06 15:08:12 +01:00
scrawl	ea1efaac0c	Use the osgDB::ObjectCache in SceneManager, cleanup	2016-02-06 00:15:12 +01:00