409 Commits (1f2349ef6e82b7b1b82e1de6db2776e2043fb18d)

Author	SHA1	Message	Date
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
Capostrophic	ab29f9e13f	Add permanent barter disposition change option (feature #3103)	7 years ago
David Cernat	a4b588d1b5	[General] Add optional timestamps to journal entries in PlayerJournal	7 years ago
David Cernat	63a86f145d	[Client] Record type of each InterpreterContext for later checking	7 years ago
David Cernat	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
Capostrophic	8376c8c68e	Allow partial matches in NotCell condition (fixes #4459)	7 years ago
Capostrophic	b274931165	Revert erroneous changes	7 years ago
Capostrophic	11103211c5	Make Goodbye and Choice choices mutually exclusive	7 years ago
David Cernat	9e10eb9c84	Merge pull request #389 from OpenMW/master ... Add OpenMW commits up to 24 Feb 2018	7 years ago
Capostrophic	99360e132f	Only display "new journal entry" message in dialogue if there *is* a new entry	7 years ago
David Cernat	cac2c6c1e8	Merge pull request #360 from TES3MP/0.6.1-openmw-updates while resolving conflicts	7 years ago
David Cernat	ecb0ad0d77	Merge pull request #359 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml	7 years ago
Andrei Kortunov	b6ae7f3cc8	Do not add greetings to the journal index (bug #4342)	7 years ago
David Cernat	5aff515d3f	Merge pull request #337 from OpenMW/master ... Add OpenMW commits up to 15 Nov 2017	7 years ago
scrawl	c36d250044	Parse dialogue text for keywords after the resultscript runs (Fixes #4210)	7 years ago
David Cernat	605b06c303	[General] Find actor speech captions instead of sending them in packets	7 years ago
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