Commit Graph

42 Commits (a083439139b883b260605fac90d6304ea293effa)

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
Andrei Kortunov b0f2e00e7f Make forcegreeting a non-op for non-actor objects (bug #4553) 6 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
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
David Cernat a883c8f8aa [Client] Prevent scripts from creating PlayerTopic packet spam 7 years ago
David Cernat 2f551aba02 [Client] Don't start dialogue via client scripts if already in dialogue
This prevents infinite greeting spam in scripts such as hlormarScript.
7 years ago
David Cernat 7f6c5e2f48 [Client] Only send PlayerJournal packets for new journal entries 7 years ago
David Cernat 11369f6513 [General] Implement sending and reading of PlayerTopic packets 7 years ago
David Cernat a82646a130 [Client] Delineate tes3mp-only code more clearly, part 2 7 years ago
David Cernat a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 7 years ago
David Cernat e2c595fc5d Add preliminary structure for journal changes 7 years ago
scrawl f315a4386f Accept an implicit reference in Journal (Fixes #3135) 8 years ago
scrawl 67bd6cd708 Remove empty line at the beginning of files
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
9 years ago
Alexander "Ace" Olofsson fce404acc5 Remove some including of mwbase/world.hpp
Since ref.hpp is rather well used in OpenMW-CS this should help compile times there
9 years ago
scrawl 431f540791 ESSImport: fix NPC factions 9 years ago
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.
9 years ago
MiroslavR a4d0068e29 Make forcegreeting no-op for disabled references (Fixes #2093) 10 years ago
scrawl aa02974d3b Fix Journal instruction for non-existing journal indices (Fixes #2063) 10 years ago
scrawl b259c5def2 Make GetFactionReaction garbage argument optional 10 years ago
scrawl 2dd54dbcfc Implement ClearInfoActor script instruction (Fixes #1422) 10 years ago
scrawl 3e2eed9269 Implement getFactionReaction function
Strange bug when using value != 0 for the garbage argument?
10 years ago
scrawl e266c39c5d Implement modFactionReaction instruction (Closes #1347) 10 years ago
scrawl b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
10 years ago
Emanuel Guevel 1e4a854433 Remove static method MWWorld::Class::get(&Ptr)
It was just adding a level of indirection to Ptr.getClass().
All the call were replaced by that instead. The number of lines changed
is important, but the change itself is trivial, so everything should be
fine. :)
10 years ago
scrawl 3a7e2f8bb5 Allow invoking Journal instruction with non-existing index
This is used by the MG_EscortScholar1 quest.
10 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
Alex de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 11 years ago
scrawl 9c170af30c SameFaction 12 years ago
scrawl 0af869c816 GetReputation 12 years ago
scrawl eb29b1593b ModReputation, SetReputation 12 years ago
Marc Zinnschlag d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 12 years ago
Marc Zinnschlag 923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 12 years ago
scrawl c4aae96d94 implemented "goodbye" script function that force-cancels dialogue 12 years ago
Marc Zinnschlag 35f478071e Issue #255: deleted the old environment class and using the new one instead 12 years ago
Marc Zinnschlag b5d12d0723 fixed ForceGreeting 12 years ago
gugus c24a85848f forceGreeting script instruction 12 years ago
Marc Zinnschlag 187b8e58d6 fixed handling of optional instruction/function arguments; removed choice workaround 12 years ago
gugus 042d87f77f a lot of clean up 12 years ago
gugus 07d8d654cd one step toward function filters and end choices. 12 years ago
gugus 82c6b0f92a choice function. Do not work. 12 years ago
gugus f1dc360720 added the script instruction addTopic 12 years ago
Marc Zinnschlag e4a0702bb4 added journal-related script instructions 13 years ago