David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts ... # Conflicts: # apps/openmw/main.cpp # apps/openmw/mwbase/world.hpp # apps/openmw/mwdialogue/dialoguemanagerimp.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwscript/dialogueextensions.cpp # apps/openmw/mwworld/worldimp.hpp		2018-08-20 14:08:44 +03:00
..
dialoguemanagerimp.cpp	Merge pull request #469 from davidcernat/master while resolving conflicts	2018-08-20 14:08:44 +03:00
dialoguemanagerimp.hpp	Merge pull request #469 from davidcernat/master while resolving conflicts	2018-08-20 14:08:44 +03:00
filter.cpp	Allow partial matches in NotCell condition (fixes #4459)	2018-06-18 03:27:31 +03:00
filter.hpp	Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577)	2016-10-11 02:53:43 +02:00
hypertextparser.cpp
hypertextparser.hpp
journalentry.cpp
journalentry.hpp
journalimp.cpp	[General] Add optional timestamps to journal entries in PlayerJournal	2018-07-26 04:36:12 +03:00
journalimp.hpp	[General] Add optional timestamps to journal entries in PlayerJournal	2018-07-26 04:36:12 +03:00
keywordsearch.cpp
keywordsearch.hpp
quest.cpp
quest.hpp
scripttest.cpp	Fix shadowing warnings	2016-10-06 23:33:52 +09:00
scripttest.hpp
selectwrapper.cpp	Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577)	2016-10-11 02:53:43 +02:00
selectwrapper.hpp
topic.cpp
topic.hpp