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

..

dialoguemanagerimp.cpp

Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.

2014-01-04 02:49:10 +01:00

dialoguemanagerimp.hpp

Fix incorrect disposition testing and get rid of of a related hack that is no longer needed.

2014-01-04 02:49:10 +01:00

filter.cpp

Merge branch 'master' into HEAD

2014-01-06 00:23:17 +01:00

filter.hpp

Implemented service refusal

2013-03-16 20:32:21 +01:00

journalentry.cpp

storing and loading the journal

2013-12-03 14:28:46 +01:00

journalentry.hpp

storing and loading the journal

2013-12-03 14:28:46 +01:00

journalimp.cpp

deal with dialogue/info records that don't exist anymore

2013-12-03 14:39:54 +01:00

journalimp.hpp

deal with dialogue/info records that don't exist anymore

2013-12-03 14:39:54 +01:00

quest.cpp

storing and loading the journal

2013-12-03 14:28:46 +01:00

quest.hpp

storing and loading the journal

2013-12-03 14:28:46 +01:00

selectwrapper.cpp

Dialog function 72 is not player-specific

2013-08-08 06:02:16 -07:00

selectwrapper.hpp

Dialog function 72 is not player-specific

2013-08-08 06:02:16 -07:00

topic.cpp

storing and loading the journal

2013-12-03 14:28:46 +01:00

topic.hpp

storing and loading the journal

2013-12-03 14:28:46 +01:00