You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
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
6 years ago
..
dialoguemanagerimp.cpp Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
dialoguemanagerimp.hpp Merge pull request #469 from davidcernat/master while resolving conflicts 6 years ago
filter.cpp Allow partial matches in NotCell condition (fixes #4459) 7 years ago
filter.hpp Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577) 8 years ago
hypertextparser.cpp Dialogue: add conflict resolution for overlapping keywords (Fixes #2245) 10 years ago
hypertextparser.hpp Use all topics to search for keywords in dialogues (Fixes #2013) 10 years ago
journalentry.cpp Accept an implicit reference in Journal (Fixes #3135) 9 years ago
journalentry.hpp Accept an implicit reference in Journal (Fixes #3135) 9 years ago
journalimp.cpp [General] Add optional timestamps to journal entries in PlayerJournal 7 years ago
journalimp.hpp [General] Add optional timestamps to journal entries in PlayerJournal 7 years ago
keywordsearch.cpp Use all topics to search for keywords in dialogues (Fixes #2013) 10 years ago
keywordsearch.hpp Use empty() instead of !size() 9 years ago
quest.cpp Remove empty line at the beginning of files 10 years ago
quest.hpp storing and loading the journal 11 years ago
scripttest.cpp Fix shadowing warnings 8 years ago
scripttest.hpp consider --script-warn when running with --script-all-dialogue 10 years ago
selectwrapper.cpp Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577) 8 years ago
selectwrapper.hpp Dialog function 72 is not player-specific 12 years ago
topic.cpp Remove empty line at the beginning of files 10 years ago
topic.hpp Implement ClearInfoActor script instruction (Fixes #1422) 11 years ago