teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
openmw-tes3coop/apps
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
..
bsatool Port bsatool 2015-04-22 18:06:29 +02:00
esmtool Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-03-27 17:30:48 +01:00
essimporter fixing MSVC 2013 warning C4244: & C4305 2015-03-08 13:07:29 +13:00
launcher Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-04 02:41:50 +02:00
mwiniimporter fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
nifosgtest Port Animation::addEffect 2015-04-19 01:57:52 +02:00
opencs Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-04 02:41:50 +02:00
openmw Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-04 02:41:50 +02:00
openmw_test_suite UnitTests: add another dialogue keyword test 2015-01-10 00:29:07 +01:00
wizard Silence -Wreorder warnings. 2015-04-28 18:48:02 -05:00
doc.hpp