mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-24 10:26:36 +00:00
Code Issues Releases Wiki Activity
openmw/components/files
History
scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp
2015-05-04 02:41:50 +02:00
..
androidpath.cpp release jni memory 2015-03-16 18:21:38 +04:00
androidpath.h change Jni name method 2015-02-26 18:30:14 +04:00
androidpath.hpp fixes 2014-12-03 01:11:50 +04:00
collections.cpp Fix bsa file loading not being case insensitive (Fixes #1178) 2014-05-26 17:34:36 +02:00
collections.hpp Load fallback archives listed in openmw.cfg at startup 2013-03-09 21:14:11 +01:00
configurationmanager.cpp Add silent mode to ConfigurationManager, used by essimporter 2015-01-31 22:40:39 +01:00
configurationmanager.hpp Add silent mode to ConfigurationManager, used by essimporter 2015-01-31 22:40:39 +01:00
constrainedfilestream.cpp Fix compile error 2015-02-27 19:58:43 +01:00
constrainedfilestream.hpp Multiple definition fix 2015-02-20 17:57:18 +01:00
fixedpath.hpp Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
linuxpath.cpp the global config path is not always $prefix/etc, so just define the whole path in the build system 2014-09-19 20:23:39 +02:00
linuxpath.hpp fixes building on systems with kFreeBSD kernel 2014-08-18 17:19:54 +02:00
lowlevelfile.cpp Tabs to spaces 2015-01-31 22:40:42 +01:00
lowlevelfile.hpp Tabs to spaces 2015-01-31 22:40:42 +01:00
macospath.cpp #2460: use Application Support as user data path on OS X 2015-03-18 23:48:03 +02:00
macospath.hpp XDG compliant paths 2013-12-26 20:53:51 +01:00
multidircollection.cpp minor simplification 2014-05-18 14:55:05 +04:00
multidircollection.hpp improved error handling 2012-12-26 17:15:53 +01:00
windowspath.cpp Installer work for Windows (Fixes #1621) 2015-03-15 08:08:55 +13:00
windowspath.hpp XDG compliant paths 2013-12-26 20:53:51 +01:00