1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-28 21:15:34 +00:00
openmw-tes3mp/apps/openmw
scrawl 22f01b1232 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/launcher/graphicspage.cpp
	apps/opencs/editor.cpp
	apps/opencs/model/doc/document.cpp
	apps/opencs/view/render/cell.cpp
	apps/opencs/view/render/mousestate.cpp
	apps/opencs/view/render/textoverlay.cpp
	apps/opencs/view/render/worldspacewidget.cpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwgui/inventorywindow.cpp
	apps/openmw/mwgui/loadingscreen.cpp
	apps/openmw/mwgui/mapwindow.cpp
	apps/openmw/mwgui/pickpocketitemmodel.cpp
	apps/openmw/mwgui/waitdialog.cpp
	apps/openmw/mwmechanics/combat.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwrender/globalmap.cpp
	apps/openmw/mwworld/physicssystem.cpp
	apps/openmw/mwworld/refdata.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	components/sdlutil/sdlinputwrapper.cpp
	extern/shiny/Main/Factory.cpp
	extern/shiny/Main/MaterialInstance.cpp
	extern/shiny/Main/Platform.cpp
	extern/shiny/Main/ShaderSet.cpp
2015-05-23 20:33:44 +02:00
..
mwbase Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
mwclass Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
mwdialogue Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
mwgui Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
mwinput Implement UI scaling factor 2015-05-15 00:41:21 +02:00
mwmechanics Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
mwphysics Restore getHitContact 2015-05-22 04:36:33 +02:00
mwrender Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
mwscript Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
mwsound Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
mwstate Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
mwworld Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
android_commandLine.cpp release jni memory 2015-03-16 18:21:38 +04:00
android_commandLine.h command line support for Android 2015-03-15 21:15:58 +04:00
android_main.c release jni memory 2015-03-16 18:21:38 +04:00
CMakeLists.txt Port MWRender::Camera 2015-05-22 00:29:27 +02:00
crashcatcher.cpp make it C98 compat 2014-12-23 17:13:11 +01:00
doc.hpp
engine.cpp Port MWRender::Camera 2015-05-22 00:29:27 +02:00
engine.hpp Pause simulationTime when the GUI is up 2015-05-14 02:26:19 +02:00
main.cpp MechanicsManager, frame update 2015-04-25 15:19:17 +02:00