mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 07:45:33 +00:00
Code Issues Releases Wiki Activity
openmw-tes3mp/apps/openmw
History
Marc Zinnschlag 1b5301eec0 Merge branch 'savedgame' 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwbase/soundmanager.hpp
	apps/openmw/mwgui/mapwindow.hpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
	apps/openmw/mwsound/soundmanagerimp.hpp
	components/esm/loadcell.cpp
2014-02-01 18:16:32 +01:00
..
mwbase Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
mwclass Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
mwdialogue Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
mwgui Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
mwinput Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
mwmechanics Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
mwrender Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
mwscript Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
mwsound Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
mwstate load and save of reference in cells (without CustomData state) 2014-01-27 13:27:42 +01:00
mwworld Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
CMakeLists.txt Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
config.hpp.cmake another minor correction (fixing the previous one) 2011-07-08 16:16:06 +02:00
crashcatcher.cpp crashcatcher uname error checking 2014-01-09 00:52:37 +01:00
doc.hpp first set of additional doxygen comments 2010-09-25 15:03:53 +02:00
engine.cpp Merge branch 'savedgame' 2014-02-01 18:16:32 +01:00
engine.hpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
main.cpp Merge branch 'master' of https://github.com/zinnschlag/openmw into savedgame 2014-01-24 18:28:35 +01:00