Bret Curtis 2c57abc245

Merge branch 'master' into dialoguefix

2019-03-29 15:07:45 +01:00

..

dialoguemanagerimp.cpp

Merge branch 'master' into dialoguefix

2019-03-29 15:07:45 +01:00

dialoguemanagerimp.hpp

Add permanent barter disposition change option (feature #3103)

2018-08-01 17:31:35 +03:00

filter.cpp

Replace all NULLs to nullptr

2018-10-09 10:21:12 +04: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

Allow localization to use implicit keywords (bug #4841)

2019-02-09 14:06:05 +04:00

journalentry.cpp

Replace all NULLs to nullptr

2018-10-09 10:21:12 +04:00

journalentry.hpp

Accept an implicit reference in Journal (Fixes #3135)

2016-01-11 23:07:01 +01:00

journalimp.cpp

Only display "new journal entry" message in dialogue if there *is* a new entry

2018-02-18 16:01:50 +03:00

journalimp.hpp

Accept an implicit reference in Journal (Fixes #3135)

2016-01-11 23:07:01 +01: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

Make quest status update handling closer to vanilla (bug #4815)

2019-02-08 10:25:31 +03:00

quest.hpp

storing and loading the journal

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

scripttest.cpp

Remove redundant includes

2019-02-23 08:02:12 +04:00

scripttest.hpp

consider --script-warn when running with --script-all-dialogue

2014-12-18 10:20:15 +01:00

selectwrapper.cpp

Remove redundant includes

2019-02-23 08:02:12 +04: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