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
ab29f9e13f
Add permanent barter disposition change option (feature #3103 )
7 years ago
63a86f145d
[Client] Record type of each InterpreterContext for later checking
7 years ago
a236ffc4be
Merge pull request #456 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# README.md
# apps/openmw/mwgui/quickkeysmenu.cpp
# apps/openmw/mwmechanics/actors.cpp
# apps/openmw/mwmechanics/combat.cpp
7 years ago
b274931165
Revert erroneous changes
7 years ago
11103211c5
Make Goodbye and Choice choices mutually exclusive
7 years ago
cac2c6c1e8
Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts
7 years ago
ecb0ad0d77
Merge pull request #359 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
7 years ago
b6ae7f3cc8
Do not add greetings to the journal index (bug #4342 )
7 years ago
5aff515d3f
Merge pull request #337 from OpenMW/master
...
Add OpenMW commits up to 15 Nov 2017
7 years ago
c36d250044
Parse dialogue text for keywords after the resultscript runs ( Fixes #4210 )
7 years ago
605b06c303
[General] Find actor speech captions instead of sending them in packets
7 years ago
dd25c7db4e
Merge pull request #324 from OpenMW/master
...
Add OpenMW commits up to 24 Oct 2017
7 years ago
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 )
7 years ago
360cf2ead7
Merge pull request #321 from OpenMW/master
...
Add OpenMW commits up to 22 Oct 2017
7 years ago
768da57da2
Fix dialogue topics displayed in lower case
7 years ago
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
7 years ago
f26206b630
Make unconscious actors do not speak and do not track targets
7 years ago
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
7 years ago
476bec41c5
Remove redundant code
7 years ago
717e68fab2
Remove redundant resetHistory argument
7 years ago
19e07fad30
Remove redundant Services enum
7 years ago
f8ffd85146
Topic passed to keywordSelected() no longer has to be lower case
...
Remove redundant mDialogueMap
7 years ago
82a211ba03
Fix duplicate code
7 years ago
84657271c7
Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window
7 years ago
c203a0774a
Adjust some layouts to take better advantage of keyboard navigation
7 years ago
a883c8f8aa
[Client] Prevent scripts from creating PlayerTopic packet spam
7 years ago
fa3baac0f3
Merge pull request #228 from OpenMW/master while resolving conflicts
...
# Conflicts:
# .travis.yml
# CMakeLists.txt
# apps/openmw/main.cpp
8 years ago
4bb9622c21
Handle greetings differently from responses
8 years ago
d8cd57a8be
[Client] Make topic sync work with localized versions of the game
8 years ago
11369f6513
[General] Implement sending and reading of PlayerTopic packets
8 years ago
2eb5221472
Merge pull request #215 from OpenMW/master
...
Add OpenMW commits up to 9 May 2017
8 years ago
315ad54b29
Don't make NPCs or player speak while underwater
...
(Fixes #3851 )
8 years ago
8b4e167efe
[Client] Prevent NPC subtitles from being added to open Dialogue window
8 years ago
4ebc9f1314
Merge pull request #204 from OpenMW/master while resolving conflicts
...
# Conflicts:
# apps/openmw/mwdialogue/dialoguemanagerimp.cpp
8 years ago
f34e35eb19
Check for NULL before running voice scripts
...
(Fixes #3834 )
8 years ago
a5484d237b
Merge pull request #203 from OpenMW/master
...
Add OpenMW commits up to 21 Apr 2017, part 2
8 years ago
60c67bc327
Run scripts for voiced dialogue
...
(Fixes #3787 )
8 years ago
f0f0b2dcc9
[General] Send and read ActorSpeech packets
8 years ago
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.
8 years ago
3f27c8cc97
Always print context for script warnings to remove the need for verbose option
...
(Fixes #2813 )
8 years ago
5e992a0342
Fix attempting to access NPC stats on creatures
8 years ago
c7b4b2cdd7
Fixed multiple spelling mistakes
8 years ago
1c2e04747d
Remove stray line
8 years ago
028db21c8a
Don't let disposition at end of dialogue be below 0 ( Fixes #3584 )
8 years ago
4854d6b093
Set the TalkedToPc flag for voiced dialogue ( Fixes #3346 )
9 years ago
79eb2d20e0
Cleanup
9 years ago
12ec90f9e7
Change default argument, fix GetDisposition
9 years ago
2176ac592c
Call updateDialogueGlobals before dialogue starts ( Fixes #3034 )
9 years ago
c912310c52
Don't add persuasion results to the journal
9 years ago
David Cernat
Capostrophic
Capostrophic
Andrei Kortunov
scrawl
Allofich
scrawl
Leon Krieg