426 Commits (6828d83a42f084c87ec15d928daf4f5e14865588)

Author	SHA1	Message	Date
David Cernat	cc25612b8d	Add OpenMW commits up to 18 Sep 2019 ... # Conflicts: # apps/openmw/mwclass/container.cpp # apps/openmw/mwclass/door.cpp # apps/openmw/mwmechanics/security.cpp # apps/openmw/mwmechanics/spellcasting.cpp # apps/openmw/mwscript/miscextensions.cpp	5 years ago
Andrei Kortunov	d58f93f388	Use sayDone() only for scripting backward compatibility	5 years ago
David Cernat	5181c601c0	Add OpenMW commits up to 2 May 2019 ... # Conflicts: # CMakeLists.txt # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp # apps/openmw/mwscript/statsextensions.cpp	5 years ago
David Cernat	f671c0bddc	Add OpenMW commits up to 1 Apr 2019 ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/engine.cpp # apps/openmw/mwdialogue/dialoguemanagerimp.cpp # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwgui/trainingwindow.cpp # apps/openmw/mwgui/travelwindow.cpp # apps/openmw/mwgui/waitdialog.cpp	5 years ago
David Cernat	8729c3c5e3	Add OpenMW commits up to 9 Mar 2019 ... # Conflicts: # .travis.yml # CI/before_script.linux.sh # README.md # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwscript/animationextensions.cpp # apps/openmw/mwscript/guiextensions.cpp # apps/openmw/mwscript/miscextensions.cpp # apps/openmw/mwscript/soundextensions.cpp	5 years ago
David Cernat	95a5607509	Add OpenMW commits up to 22 Feb 2019 ... # Conflicts: # CMakeLists.txt # apps/openmw/mwmechanics/spellcasting.cpp # apps/openmw/mwscript/containerextensions.cpp	5 years ago
David Cernat	fba07194cf	Add OpenMW commits up to 29 Oct 2018 ... # Conflicts: # apps/openmw/mwbase/world.hpp # apps/openmw/mwinput/inputmanagerimp.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/aicombat.cpp # apps/openmw/mwmechanics/character.cpp # apps/openmw/mwworld/worldimp.cpp # apps/openmw/mwworld/worldimp.hpp	5 years ago
David Cernat	889bcec7f8	Add OpenMW commits up to 1 Sep 2018 ... # Conflicts: # apps/openmw/mwbase/world.hpp # apps/openmw/mwclass/creature.cpp # apps/openmw/mwclass/npc.cpp # apps/openmw/mwgui/jailscreen.cpp # apps/openmw/mwmechanics/actors.cpp # apps/openmw/mwmechanics/difficultyscaling.cpp # apps/openmw/mwscript/transformationextensions.cpp # apps/openmw/mwworld/worldimp.hpp	5 years ago
David Cernat	84cab59057	Add OpenMW commits up to 19 Aug 2018 ... # Conflicts: # .travis.yml # CI/before_install.linux.sh # CI/before_script.linux.sh # apps/openmw/engine.cpp # apps/openmw/main.cpp # apps/openmw/mwgui/windowmanagerimp.cpp # apps/openmw/mwmechanics/actors.hpp # apps/openmw/mwmechanics/mechanicsmanagerimp.cpp # apps/openmw/mwscript/aiextensions.cpp # apps/openmw/mwscript/containerextensions.cpp # apps/openmw/mwscript/dialogueextensions.cpp # apps/openmw/mwworld/cellstore.cpp # apps/openmw/mwworld/containerstore.cpp # apps/openmw/mwworld/scene.cpp # apps/openmw/mwworld/worldimp.cpp # components/misc/debugging.hpp	5 years ago
Andrei Kortunov	bd2188a0f8	Use the logging system for compiler errors	6 years ago
Bret Curtis	2c57abc245	Merge branch 'master' into dialoguefix	6 years ago
Andrei Kortunov	3032b177a1	Remove redundant includes	6 years ago
Andrei Kortunov	b7adbe79b9	Allow localization to use implicit keywords (bug #4841)	6 years ago
Capostrophic	0535de6ca0	Make quest status update handling closer to vanilla (bug #4815) ... Don't update quest status if we're simply updating the quest index Update quest status if a new entry is added regardless of its index	6 years ago
Andrei Kortunov	e06f0b797a	Replace all NULLs to nullptr	6 years ago
Capostrophic	7ef6fa9f61	Remove deprecated GMST get* functions	6 years ago
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
Andrei Kortunov	5a4d0cec3a	Use new logging system for game itself	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