mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 12:42:11 +00:00
Code Issues Projects Releases Wiki Activity
62774fcc4a
OpenMW/apps/openmw
History
scrawl 62774fcc4a Merge branch 'master' into HEAD 
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
2014-01-06 00:23:17 +01:00
..
mwbase Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
mwclass Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface. 2014-01-05 20:53:45 +01:00
mwdialogue Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
mwgui Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
mwinput Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
mwmechanics Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
mwrender Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
mwscript Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
mwsound Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
mwstate Merge remote-tracking branch 'mrcheko/savedgame' into savedgame 2013-12-20 13:13:06 +01:00
mwworld Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
CMakeLists.txt Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
config.hpp.cmake
crashcatcher.cpp
doc.hpp
engine.cpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
engine.hpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
main.cpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00