1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 18:49:54 +00:00
openmw-tes3mp/apps/openmw/mwclass
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
..
activator.cpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
activator.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
apparatus.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
apparatus.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
armor.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
armor.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
book.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
book.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
classes.cpp Mantis: #18 - Move components from global namespace into their own namespace. 2011-06-19 18:14:03 +02:00
classes.hpp moved concrete record classes to separate sub-system (mwclass) 2010-08-03 13:17:31 +02:00
clothing.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
clothing.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
container.cpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
container.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
creature.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
creature.hpp Use SDL to create the window 2015-05-13 02:53:09 +02:00
creaturelevlist.cpp Fix for broken levelled creature spawning (Fixes #2365) 2015-02-11 12:10:46 +01:00
creaturelevlist.hpp Fix for broken levelled creature spawning (Fixes #2365) 2015-02-11 12:10:46 +01:00
door.cpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
door.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
ingredient.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
ingredient.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
itemlevlist.cpp added missing getId functions to classes derived from MWWorld::Class 2014-07-18 09:56:58 +02:00
itemlevlist.hpp added missing getId functions to classes derived from MWWorld::Class 2014-07-18 09:56:58 +02:00
light.cpp Empty model exception fix 2015-05-12 16:50:31 +02:00
light.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
lockpick.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
lockpick.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
misc.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
misc.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
npc.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
npc.hpp Use SDL to create the window 2015-05-13 02:53:09 +02:00
potion.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
potion.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
probe.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
probe.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
repair.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
repair.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
static.cpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
static.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00
weapon.cpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02:00
weapon.hpp Move physicssystem to a new mwphysics module 2015-05-10 01:09:00 +02:00