David Cernat
5aff515d3f
Merge pull request #337 from OpenMW/master
...
Add OpenMW commits up to 15 Nov 2017
2017-11-16 08:49:56 +02:00
scrawl
c36d250044
Parse dialogue text for keywords after the resultscript runs ( Fixes #4210 )
2017-11-15 17:20:06 +00:00
David Cernat
605b06c303
[General] Find actor speech captions instead of sending them in packets
2017-10-30 11:06:09 +02:00
David Cernat
37304655da
Merge pull request #326 from OpenMW/master
...
Add OpenMW commits up to 25 Oct 2017
2017-10-26 17:28:56 +03:00
scrawl
4a7be0ffda
Don't reset journal index to a lower value ( Fixes #4172 )
2017-10-24 20:02:35 +00:00
David Cernat
dd25c7db4e
Merge pull request #324 from OpenMW/master
...
Add OpenMW commits up to 24 Oct 2017
2017-10-24 19:36:14 +03:00
scrawl
e564dd842e
Refactor dialogue responses to make sure messages from scripts are printer afterwards, not before the dialogue response ( Fixes #4166 )
...
Don't delete Link objects prematurely (Fixes #4171 )
2017-10-23 23:33:06 +00:00
David Cernat
360cf2ead7
Merge pull request #321 from OpenMW/master
...
Add OpenMW commits up to 22 Oct 2017
2017-10-23 14:51:29 +03:00
scrawl
3d0094bd2e
Fix behavior of 'journal' command when invoked with already seen entry
2017-10-22 20:50:15 +00:00
scrawl
768da57da2
Fix dialogue topics displayed in lower case
2017-10-22 20:50:15 +00:00
David Cernat
38247ff086
Merge pull request #303 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwbase/dialoguemanager.hpp
# apps/openmw/mwdialogue/dialoguemanagerimp.hpp
# apps/openmw/mwgui/container.cpp
# apps/openmw/mwgui/windowmanagerimp.cpp
# apps/openmw/mwscript/dialogueextensions.cpp
2017-10-06 04:10:04 +03:00
Andrei Kortunov
f26206b630
Make unconscious actors do not speak and do not track targets
2017-09-30 20:55:42 +04:00
scrawl
2ce79e07a4
Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways.
...
- Fix memory leaks in DialogueWindow
- Fix Link objects being deleted from their own event handler
2017-09-25 23:38:28 +02:00
scrawl
476bec41c5
Remove redundant code
2017-09-25 23:27:01 +02:00
scrawl
e8c6a3b225
Fix crash in dialogue filter if local variables are not configured
...
This could happen e.g. by 'some_npc_in_remote_cell->forcegreeting'
2017-09-25 21:21:51 +02:00
scrawl
717e68fab2
Remove redundant resetHistory argument
2017-09-25 19:58:34 +02:00
scrawl
19e07fad30
Remove redundant Services enum
2017-09-25 19:52:20 +02:00
scrawl
f8ffd85146
Topic passed to keywordSelected() no longer has to be lower case
...
Remove redundant mDialogueMap
2017-09-25 19:03:38 +02:00
scrawl
82a211ba03
Fix duplicate code
2017-09-25 17:47:30 +02:00
scrawl
84657271c7
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
2017-09-24 19:08:12 +02:00
scrawl
c203a0774a
Adjust some layouts to take better advantage of keyboard navigation
2017-09-24 19:08:11 +02:00
David Cernat
a883c8f8aa
[Client] Prevent scripts from creating PlayerTopic packet spam
2017-08-23 07:14:45 +03:00
David Cernat
685bf15d52
Merge pull request #231 from OpenMW/master
...
Add OpenMW commits up to 27 Jun 2017
2017-06-28 05:58:19 +03:00
Andrei Kortunov
7fcb22b867
Do not show empty journal entries ( fixes #3891 )
2017-06-27 15:54:16 +04:00
David Cernat
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
2017-06-18 18:16:10 +03:00
Andrei Kortunov
4bb9622c21
Handle greetings differently from responses
2017-06-08 22:40:31 +04:00
David Cernat
d8cd57a8be
[Client] Make topic sync work with localized versions of the game
2017-05-31 14:11:16 +03:00
David Cernat
7f6c5e2f48
[Client] Only send PlayerJournal packets for new journal entries
2017-05-27 22:49:11 +03:00
David Cernat
11369f6513
[General] Implement sending and reading of PlayerTopic packets
2017-05-24 21:43:34 +03:00
David Cernat
2eb5221472
Merge pull request #215 from OpenMW/master
...
Add OpenMW commits up to 9 May 2017
2017-05-09 14:31:26 +03:00
Allofich
315ad54b29
Don't make NPCs or player speak while underwater
...
(Fixes #3851 )
2017-05-08 19:55:54 +09:00
David Cernat
8b4e167efe
[Client] Prevent NPC subtitles from being added to open Dialogue window
2017-05-05 20:16:20 +03:00
David Cernat
4ebc9f1314
Merge pull request #204 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
2017-04-22 14:33:26 +03:00
Allofich
f34e35eb19
Check for NULL before running voice scripts
...
(Fixes #3834 )
2017-04-22 07:51:31 +09:00
David Cernat
a5484d237b
Merge pull request #203 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017, part 2
2017-04-21 21:07:37 +03:00
Allofich
60c67bc327
Run scripts for voiced dialogue
...
(Fixes #3787 )
2017-04-21 10:39:11 +09:00
David Cernat
f0f0b2dcc9
[General] Send and read ActorSpeech packets
2017-04-16 18:43:13 +03:00
scrawl
29556a1802
More consistent wording of errors/warnings
...
A Warning indicates a potential problem in the content file(s) that the user told OpenMW to load. E.g. this might cause an object to not display at all or as intended, however the rest of the game will run fine.
An Error, however, is more likely to be a bug with the engine itself - it means that basic assumptions have been violated and the engine might not run correctly anymore.
The above mostly applies to errors/warnings during game-play; startup issues are handled differently: when a file is completely invalid/corrupted to the point that the engine can not start, that might cause messages that are worded as Error due to the severity of the issue but are not necessarily the engine's fault.
Hopefully, being a little more consistent here will alleviate confusion among users as to when a log message should be reported and to whom.
2017-03-04 21:48:31 +01:00
scrawl
1692b7f38e
Merge pull request #1209 from dhustkoder/master
...
Added ConstContainerStoreIterator (Task #3092 )
2017-03-02 18:36:21 +01:00
Rafael Moura
7fa2703715
Porting more ContainerStoreIterator usage to const version #3
2017-02-28 14:31:51 +00:00
Rafael Moura
18a4b64f1a
Porting more ContainerStoreIterator usage to const version #2
2017-02-27 21:50:10 +00:00
scrawl
3f27c8cc97
Always print context for script warnings to remove the need for verbose option
...
(Fixes #2813 )
2017-02-21 04:32:59 +01:00
Allofich
5e992a0342
Fix attempting to access NPC stats on creatures
2017-01-06 02:58:24 +09:00
MiroslavR
5f234f8952
Dialogue: "PC Rank" condition now uses speaker's faction if "PC Faction" is not given ( Fixes #3689 )
2016-12-23 19:03:59 +01:00
Leon Krieg
c7b4b2cdd7
Fixed multiple spelling mistakes
2016-12-14 16:39:33 +01:00
Allofich
1c54f54ab8
Fix shadowing warnings
2016-10-15 00:12:46 +09:00
Allofich
1c2e04747d
Remove stray line
2016-10-13 23:38:21 +09:00
MiroslavR
14468262a7
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
Allofich
028db21c8a
Don't let disposition at end of dialogue be below 0 ( Fixes #3584 )
2016-10-10 02:20:24 +09:00
Allofich
53e94b7c3f
Fix shadowing warnings
2016-10-06 23:33:52 +09:00
scrawl
b6230bd31f
Reject weather dialogue conditions when in an interior cell ( Fixes #3437 )
2016-06-11 18:26:20 +02:00
scrawl
2ca7415708
Handle DialInfo::mFactionLess (Bug #3380 )
2016-05-01 00:10:50 +02:00
scrawl
4854d6b093
Set the TalkedToPc flag for voiced dialogue ( Fixes #3346 )
2016-04-12 21:39:05 +02:00
scrawl
79eb2d20e0
Cleanup
2016-03-18 00:39:19 +01:00
scrawl
12ec90f9e7
Change default argument, fix GetDisposition
2016-03-18 00:38:02 +01:00
ae-g-i-s
c9791c5c1a
Add addTemporaryDispositionChange parameter to MechanicsManager::getDerivedDisposition(), adjust callers that previously added temp disposition changes themselves ( fixes #3233 )
2016-03-08 21:30:28 +01:00
ae-g-i-s
2f1c6c740c
Revert "Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() ( Fixes #3233 )"
...
This reverts commit 000597236e
2016-03-08 20:41:39 +01:00
ae-g-i-s
000597236e
Fix incorrect handling of baseDisposition >= 100 in testDisposition(), enable unbounded getDerivedDisposition() ( Fixes #3233 )
2016-03-06 18:29:32 +01:00
scrawl
90a99991d1
Use empty() instead of !size()
2016-02-22 19:06:12 +01:00
scrawl
f315a4386f
Accept an implicit reference in Journal ( Fixes #3135 )
2016-01-11 23:07:01 +01:00
scrawl
a9f0f30bb8
Reject conditions testing agaist Choice when not currently in a choice ( Fixes #3117 )
2016-01-01 23:55:52 +01:00
scrawl
0333c40047
Fix typo in SameRace dialogue function (function was inverted, Fixes #3116 )
2016-01-01 02:59:55 +01:00
scrawl
2176ac592c
Call updateDialogueGlobals before dialogue starts ( Fixes #3034 )
2015-12-19 21:58:49 +01:00
scrawl
04f7a8f8eb
Remove redundant getId function
2015-12-18 16:58:38 +01:00
scrawl
8222c78cf2
Do not filter creature dialogue by NPC-only conditions ( Fixes #3086 )
2015-12-16 01:30:04 +01:00
scrawl
2737aabe93
Pc functions apply to creature dialogue ( Fixes #3078 )
2015-12-14 01:52:13 +01:00
scrawl
f875597be5
Don't use tolower()
...
See https://forum.openmw.org/viewtopic.php?f=8&t=3231&p=35968
2015-12-07 21:58:30 +01:00
scrawl
c912310c52
Don't add persuasion results to the journal
2015-12-01 16:16:21 +01:00
scrawl
d5a738bd39
Apply 27e669296e (locale-unaware tolower) to more code
...
In particular, the one in VFS::normalizeFilename was affecting cell loading performance.
2015-11-30 00:38:52 +01:00
scrawl
93565eccbf
Update the dialogue topic list after running greeting script
2015-10-18 21:40:16 +02:00
scrawl
04df656f54
Remove some junk
2015-10-18 21:39:53 +02:00
dteviot
77a1d947cc
extracted MWMechanics::getPlayer()
2015-08-21 21:12:39 +12:00
scrawl
67bd6cd708
Remove empty line at the beginning of files
...
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
2015-08-18 23:06:12 +02:00
scrawl
24ae1d5ace
Fix some issues found by coverity
2015-07-11 03:34:08 +02:00
Alexander "Ace" Olofsson
3655ef16af
Explicitly instantiate ESM::StatState
2015-07-07 19:19:37 +02:00
scrawl
141e9d36a4
Get rid of unused DialogueManager::mScriptVerbose
2015-06-04 20:12:39 +02:00
Rohit Nirmal
396fba7fa9
Silence -Wreorder warnings, and remove -Wno-reorder.
2015-05-21 22:46:44 -05:00
scrawl
ac88326909
Exit out of choice when no responses are found ( Fixes #2525 )
2015-05-11 16:38:16 +02:00
scrawl
37a6d7da76
WindowManager refactoring
2015-03-11 20:04:25 +01:00
scrawl
e30f240ba2
Add travel service support for creatures ( Fixes #2432 )
2015-03-09 03:15:11 +01:00
dteviot
e197f5318b
fixing MSVC 2013 warning C4244: & C4305
...
conversion from 'const float' to 'int', possible loss of data
conversion from 'double' to 'int', possible loss of data
conversion from 'float' to 'int', possible loss of data
2015-03-08 13:07:29 +13:00
Alexander "Ace" Olofsson
df5a08b6de
Move manualref code out of header
2015-02-09 15:01:49 +01:00
scrawl
0c6e2170db
Include cleanup
2015-02-05 04:18:42 +01:00
Marc Zinnschlag
c02c72e134
Merge remote-tracking branch 'jordan-ayers/topic/dialogue-set'
2015-01-30 18:23:14 +01:00
Jordan Ayers
419046e121
Dialogue: Use std::set for known topics in the manager.
...
There were three different data structures being used for topic lists
in this code. (map< string, true >, list< string >, and vector< string >)
Switch the local topic lists to set< string >. This supports everything
the list and map were doing, reduces the variety of data structures, and
makes count (a more efficient search) available.
The vector has not changed, since it's tied to the ESM modules, and must
meet other requirements.
2015-01-29 18:28:13 -06:00
scrawl
431f540791
ESSImport: fix NPC factions
2015-01-27 23:12:21 +01:00
scrawl
6367b4dc0b
Improve INFO struct naming
2015-01-27 23:12:21 +01:00
scrawl
6f41e0d12e
Reapply quest index when loading quest from savegame (Bug #2260 )
2015-01-27 23:12:20 +01:00
scrawl
697ab16ec5
Fix for coverity defects
2015-01-27 19:00:26 +01:00
scrawl
c883a73d30
Several warning fixes
2015-01-23 15:34:47 +01:00
scrawl
8b5effe3e0
Fix wrong magic number for JOUR in openmw savegames
2015-01-23 15:34:47 +01:00
scrawl
5104a5a023
Add missing setFactionReaction instruction, use absolute storage instead of difference
...
Seems to be closer to how MW is storing it (it has the complete FACT record in the savegame, actually).
This (somewhat) breaks OMW savegame compatibility in that old changes are discarded, but I don't think the faction reactions are quest relevant anywhere.
2015-01-20 00:53:31 +01:00
scrawl
c3f3f8b3d0
Use only Cell records for saving progress bar ( Fixes #2259 )
2015-01-11 18:01:06 +01:00
scrawl
579f5d232f
Move interactive messageBox to separate function
2015-01-10 23:23:48 +01:00
scrawl
37bea9d4dc
Fix exception for empty dialog topics ( Fixes #2267 )
2015-01-10 15:06:30 +01:00
scrawl
ce2cbab402
Dialogue: improve conflict resolution for chains of overlapping keywords (unit test for such a case will follow)
2015-01-09 20:08:52 +01:00
scrawl
ddd6e682bc
Dialogue: add conflict resolution for overlapping keywords ( Fixes #2245 )
2015-01-09 04:19:38 +01:00
scrawl
cc9af9562b
Function_CreatureTargetted should return '2' for werewolfs
...
This makes NPCs say the correct attack voice files when fighting a werewolf.
2014-12-24 15:45:12 +01:00
scrawl
4aed5158cc
Support region names in cell dialogue filter ( Fixes #2113 )
2014-12-24 15:45:12 +01:00
Marc Zinnschlag
a6d30bc2e3
consider --script-warn when running with --script-all-dialogue
2014-12-18 10:20:15 +01:00
