13 commits

Author	SHA1	Message	Date
cc9cii	687b62dfd3	Revert some changes (mostly iostream adds)	2014-09-30 18:46:26 +10:00
cc9cii	312b7cd571	Merge branch 'master' into QtOGre ... Conflicts: apps/opencs/model/doc/document.cpp apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/pagedworldspacewidget.hpp components/nif/niffile.hpp libs/openengine/bullet/physic.hpp	2014-09-30 10:52:04 +10:00
scrawl	7b2070de5a	unloadUnreferencedMaterials: Properly unload materials instead of removing techniques	2014-08-18 19:23:16 +02:00
scrawl	c5a9cd0aa1	Sync upstream changes to shiny	2014-08-06 20:13:58 +02:00
gus	2092e5fe22	compile fixes	2014-07-22 11:49:45 +02:00
scrawl	edb5a54092	Include some more required Ogre headers explicitely.	2014-03-05 21:46:37 +01:00
scrawl	4bc4af6bf0	Enable microcode caching for Ogre 1.9+	2013-12-14 22:01:24 +01:00
scrawl	3452bd2e0b	Add glow effect for enchanted items	2013-11-20 00:13:12 +01:00
scrawl	a54f8c7ee2	Removed an optimization that caused problems on 32 bit builds	2013-05-22 21:01:05 +02:00
scrawl	75dcf52552	Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)	2013-05-03 13:55:57 +02:00
scrawl	23b477a938	Fix normal maps with spaces in filename not getting loaded	2013-04-12 04:36:28 +02:00
scrawl	7f8d659f3c	Fix transparency sorting	2013-03-05 17:09:20 +01:00
scrawl	7b35b82833	adding shiny	2012-11-06 19:09:44 +01:00