Commit Graph

393 Commits (f2a6957e1603da236afde3f2ad6ba148620f7066)

Author SHA1 Message Date
David Cernat 37304655da Merge pull request #326 from OpenMW/master
Add OpenMW commits up to 25 Oct 2017
7 years ago
scrawl 4a7be0ffda Don't reset journal index to a lower value (Fixes #4172) 7 years ago
David Cernat dd25c7db4e Merge pull request #324 from OpenMW/master
Add OpenMW commits up to 24 Oct 2017
7 years ago
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)
7 years ago
David Cernat 360cf2ead7 Merge pull request #321 from OpenMW/master
Add OpenMW commits up to 22 Oct 2017
7 years ago
scrawl 3d0094bd2e Fix behavior of 'journal' command when invoked with already seen entry 7 years ago
scrawl 768da57da2 Fix dialogue topics displayed in lower case 7 years ago
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
7 years ago
Andrei Kortunov f26206b630 Make unconscious actors do not speak and do not track targets 7 years ago
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
7 years ago
scrawl 476bec41c5 Remove redundant code 7 years ago
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'
7 years ago
scrawl 717e68fab2 Remove redundant resetHistory argument 7 years ago
scrawl 19e07fad30 Remove redundant Services enum 7 years ago
scrawl f8ffd85146 Topic passed to keywordSelected() no longer has to be lower case
Remove redundant mDialogueMap
7 years ago
scrawl 82a211ba03 Fix duplicate code 7 years ago
scrawl 84657271c7 Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 7 years ago
scrawl c203a0774a Adjust some layouts to take better advantage of keyboard navigation 7 years ago
David Cernat a883c8f8aa [Client] Prevent scripts from creating PlayerTopic packet spam 7 years ago
David Cernat 685bf15d52 Merge pull request #231 from OpenMW/master
Add OpenMW commits up to 27 Jun 2017
8 years ago
Andrei Kortunov 7fcb22b867 Do not show empty journal entries (fixes #3891) 8 years ago
David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/main.cpp
8 years ago
Andrei Kortunov 4bb9622c21 Handle greetings differently from responses 8 years ago
David Cernat d8cd57a8be [Client] Make topic sync work with localized versions of the game 8 years ago
David Cernat 7f6c5e2f48 [Client] Only send PlayerJournal packets for new journal entries 8 years ago
David Cernat 11369f6513 [General] Implement sending and reading of PlayerTopic packets 8 years ago
David Cernat 2eb5221472 Merge pull request #215 from OpenMW/master
Add OpenMW commits up to 9 May 2017
8 years ago
Allofich 315ad54b29 Don't make NPCs or player speak while underwater
(Fixes #3851)
8 years ago
David Cernat 8b4e167efe [Client] Prevent NPC subtitles from being added to open Dialogue window 8 years ago
David Cernat 4ebc9f1314 Merge pull request #204 from OpenMW/master while resolving conflicts
# Conflicts:
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
8 years ago
Allofich f34e35eb19 Check for NULL before running voice scripts
(Fixes #3834)
8 years ago
David Cernat a5484d237b Merge pull request #203 from OpenMW/master
Add OpenMW commits up to 21 Apr 2017, part 2
8 years ago
Allofich 60c67bc327 Run scripts for voiced dialogue
(Fixes #3787)
8 years ago
David Cernat f0f0b2dcc9 [General] Send and read ActorSpeech packets 8 years ago
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.
8 years ago
scrawl 1692b7f38e Merge pull request #1209 from dhustkoder/master
Added ConstContainerStoreIterator (Task #3092)
8 years ago
Rafael Moura 7fa2703715 Porting more ContainerStoreIterator usage to const version #3 8 years ago
Rafael Moura 18a4b64f1a Porting more ContainerStoreIterator usage to const version #2 8 years ago
scrawl 3f27c8cc97 Always print context for script warnings to remove the need for verbose option
(Fixes #2813)
8 years ago
Allofich 5e992a0342 Fix attempting to access NPC stats on creatures 8 years ago
MiroslavR 5f234f8952 Dialogue: "PC Rank" condition now uses speaker's faction if "PC Faction" is not given (Fixes #3689) 8 years ago
Leon Krieg c7b4b2cdd7 Fixed multiple spelling mistakes 8 years ago
Allofich 1c54f54ab8 Fix shadowing warnings 8 years ago
Allofich 1c2e04747d Remove stray line 8 years ago
MiroslavR 14468262a7 Fix "Not Local" dialog test to also test variable value instead of just its existence (Fixes #3577) 8 years ago
Allofich 028db21c8a Don't let disposition at end of dialogue be below 0 (Fixes #3584) 8 years ago
Allofich 53e94b7c3f Fix shadowing warnings 8 years ago
scrawl b6230bd31f Reject weather dialogue conditions when in an interior cell (Fixes #3437) 9 years ago
scrawl 2ca7415708 Handle DialInfo::mFactionLess (Bug #3380) 9 years ago
scrawl 4854d6b093 Set the TalkedToPc flag for voiced dialogue (Fixes #3346) 9 years ago