openmw-tes3coop/apps/openmw/mwdialogue
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 Dialogue: add conflict resolution for overlapping keywords (Fixes #2245) 2015-01-09 04:19:38 +01:00
hypertextparser.hpp Use all topics to search for keywords in dialogues (Fixes #2013) 2014-10-18 20:07:40 +02:00
journalentry.cpp Accept an implicit reference in Journal (Fixes #3135) 2016-01-11 23:07:01 +01:00
journalentry.hpp Accept an implicit reference in Journal (Fixes #3135) 2016-01-11 23:07:01 +01:00
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 Use all topics to search for keywords in dialogues (Fixes #2013) 2014-10-18 20:07:40 +02:00
keywordsearch.hpp Use empty() instead of !size() 2016-02-22 19:06:12 +01:00
quest.cpp Remove empty line at the beginning of files 2015-08-18 23:06:12 +02:00
quest.hpp storing and loading the journal 2013-12-03 14:28:46 +01:00
scripttest.cpp Fix shadowing warnings 2016-10-06 23:33:52 +09:00
scripttest.hpp consider --script-warn when running with --script-all-dialogue 2014-12-18 10:20:15 +01:00
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 Dialog function 72 is not player-specific 2013-08-08 06:02:16 -07:00
topic.cpp Remove empty line at the beginning of files 2015-08-18 23:06:12 +02:00
topic.hpp Implement ClearInfoActor script instruction (Fixes #1422) 2014-06-10 18:49:41 +02:00