9 commits

Author	SHA1	Message	Date
scrawl	6c1ff8caca	Merge branch 'master' into next ... Conflicts: apps/openmw/mwworld/weather.cpp components/fileorderlist/model/datafilesmodel.cpp	2013-03-20 02:29:03 +01:00
scrawl	e30af28860	Markers should still have collision if they have a NiRootCollisionNode	2013-03-14 19:03:42 +01:00
scrawl	599207a92d	Transparency sorting should be enabled only when alpha blending is enabled	2013-03-13 01:00:47 +01:00
scrawl	7f8d659f3c	Fix transparency sorting	2013-03-05 17:09:20 +01:00
scrawl	2486ec6cb9	Material fixes (vertex colors, alpha)	2013-03-05 13:51:48 +01:00
Chris Robinson	2f14f26b96	Use the full unique mesh name for the material instead of the NIF name	2013-03-04 10:35:13 -08:00
Chris Robinson	4e1e0eaf62	Merge remote-tracking branch 'zini/master' into material-fix ... Conflicts: components/nifogre/ogrenifloader.cpp	2013-03-03 14:24:05 -08:00
scrawl	05bd94effb	Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics	2013-03-03 15:14:20 +01:00
Nathan Jeffords	109dff2d29	renamed high level NIF files...	2013-03-02 13:23:09 -08:00

Renamed from components/nifogre/ogre_nif_loader.cpp (Browse further)