1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 21:42:13 +00:00
OpenMW/apps/openmw/mwbase
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
..
dialoguemanager.hpp
environment.cpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
environment.hpp moved exit game flag from Environment to StateManager 2013-11-16 11:07:23 +01:00
inputmanager.hpp
journal.hpp storing and loading the journal 2013-12-03 14:28:46 +01:00
mechanicsmanager.hpp save and load dynamic records 2013-12-07 13:17:28 +01:00
scriptmanager.hpp globals script cleanup; fixed potential case folding bug 2013-12-12 13:15:38 +01:00
soundmanager.hpp Avoid a hack to play the underwater sound properly 2013-08-27 13:26:57 -07:00
statemanager.hpp bug 428 ask to load recent saved game 2013-12-19 22:08:34 +02:00
windowmanager.hpp Change all instances of skill/attribute values to use an appropriate typedef. 2014-01-03 01:59:15 +01:00
world.hpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00