mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 15:49:56 +00:00
Code Issues Releases Wiki Activity
28373 commits 38 branches 54 tags 122 MiB
Commit graph

51 commits

Author SHA1 Message Date
David Cernat
7f435ceeac Add OpenMW commits up to 1 Nov 2020 
# Conflicts:
#   CMakeLists.txt
#   apps/openmw/main.cpp
#   apps/openmw/mwclass/container.hpp
#   apps/openmw/mwclass/creature.hpp
#   apps/openmw/mwclass/npc.hpp
#   apps/openmw/mwdialogue/dialoguemanagerimp.hpp
#   apps/openmw/mwdialogue/journalimp.hpp
#   apps/openmw/mwgui/container.cpp
#   apps/openmw/mwgui/dialogue.hpp
#   apps/openmw/mwgui/mainmenu.cpp
#   apps/openmw/mwgui/windowmanagerimp.hpp
#   apps/openmw/mwmechanics/aiactivate.hpp
#   apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
#   apps/openmw/mwscript/containerextensions.cpp
#   apps/openmw/mwscript/interpretercontext.hpp
#   components/CMakeLists.txt
 2020-11-01 23:17:59 +02:00
Andrei Kortunov
8ca3c3b123 Mark overrided methods by override keyword 2020-10-16 22:18:54 +04:00
David Cernat
9d6f3fdd09 Add OpenMW commits up to 1 Dec 2019 
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/mwscript/aiextensions.cpp
#	apps/openmw/mwscript/statsextensions.cpp
 2019-12-01 23:52:42 +02:00
Capostrophic
0adc2df65f Make SameFaction work (bug #5213) 2019-11-23 14:47:50 +03:00
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
 2019-08-21 19:04:04 +03:00
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
 2019-08-20 10:06:15 +03:00
Capostrophic
59f7df187d Add explicit variant of Journal 2019-03-05 20:47:05 +03:00
David Cernat
d9dd7073cf [General] Send certain packets only when logged in 
Previously, client mods adding packet-sending scripts to the spawn area made clients send the associated packets as soon as they inputted their character name when joining a server using those mods. This made the clients either get disconnected for not replying to a handshake first, or it made them get kicked for sending object packets that are disallowed for players who are not logged in.

To fix this, LocalPlayer's hasFinishedCharGen() has been replaced with isLoggedIn(), because the former was already returning true when players inputted their names.
 2018-10-13 15:36:13 +03:00
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
 2018-08-20 14:08:44 +03:00
Andrei Kortunov
5a4d0cec3a Use new logging system for game itself 2018-08-14 23:05:43 +04:00
Andrei Kortunov
b0f2e00e7f Make forcegreeting a non-op for non-actor objects (bug #4553) 2018-08-05 09:31:45 +04:00
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
 2017-10-06 04:10:04 +03:00
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
 2017-09-25 23:38:28 +02:00
David Cernat
a883c8f8aa [Client] Prevent scripts from creating PlayerTopic packet spam 2017-08-23 07:14:45 +03:00
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.
 2017-07-26 22:37:57 +03:00
David Cernat
7f6c5e2f48 [Client] Only send PlayerJournal packets for new journal entries 2017-05-27 22:49:11 +03:00
David Cernat
11369f6513 [General] Implement sending and reading of PlayerTopic packets 2017-05-24 21:43:34 +03:00
David Cernat
a82646a130 [Client] Delineate tes3mp-only code more clearly, part 2 2017-04-24 19:46:12 +03:00
David Cernat
a58601fb2b [Client] Delineate tes3mp-only code more clearly, part 1 2017-02-26 16:59:53 +02:00
David Cernat
e2c595fc5d Add preliminary structure for journal changes 2017-01-20 12:05:45 +02:00
scrawl
f315a4386f Accept an implicit reference in Journal (Fixes #3135) 2016-01-11 23:07:01 +01:00
scrawl
67bd6cd708 Remove empty line at the beginning of files 
git ls-files -z | xargs -0 sed -i '1{/^$/d}'
 2015-08-18 23:06:12 +02:00
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
 2015-02-09 17:45:48 +01:00
scrawl
431f540791 ESSImport: fix NPC factions 2015-01-27 23:12:21 +01:00
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.
 2015-01-20 00:53:31 +01:00
MiroslavR
a4d0068e29 Make forcegreeting no-op for disabled references (Fixes #2093) 2014-11-02 15:36:13 +01:00
scrawl
aa02974d3b Fix Journal instruction for non-existing journal indices (Fixes #2063) 2014-10-27 21:52:59 +01:00
scrawl
b259c5def2 Make GetFactionReaction garbage argument optional 2014-06-25 01:12:57 +02:00
scrawl
2dd54dbcfc Implement ClearInfoActor script instruction (Fixes #1422) 2014-06-10 18:49:41 +02:00
scrawl
3e2eed9269 Implement getFactionReaction function 
Strange bug when using value != 0 for the garbage argument?
 2014-05-27 15:23:22 +02:00
scrawl
e266c39c5d Implement modFactionReaction instruction (Closes #1347) 2014-05-27 14:54:29 +02:00
scrawl
b47b2b84f3 Merge branch 'master' of https://github.com/OpenMW/openmw 
Conflicts:
	apps/openmw/mwdialogue/filter.cpp
	apps/openmw/mwgui/waitdialog.cpp
 2014-05-23 08:39:48 +02:00
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. :)
 2014-05-22 20:50:00 +02:00
scrawl
3a7e2f8bb5 Allow invoking Journal instruction with non-existing index 
This is used by the MG_EscortScholar1 quest.
 2014-05-21 14:18:14 +02:00
scrawl
098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 2014-01-08 18:39:44 +01:00
Alex
de1f423bd7 initial move of script opcodes and registerExtensions functions to components/compiler 2013-08-06 20:38:41 -04:00
scrawl
9c170af30c SameFaction 2012-11-23 20:57:08 +01:00
scrawl
0af869c816 GetReputation 2012-11-23 20:22:51 +01:00
scrawl
eb29b1593b ModReputation, SetReputation 2012-11-23 19:56:45 +01:00
Marc Zinnschlag
d00d40cc3f Issue #107: Journal is accessed only through the interface class from now on 2012-08-09 12:56:03 +02:00
Marc Zinnschlag
923109b260 Issue #107: DialogueManager is accessed only through the interface class from now on 2012-08-09 10:35:53 +02:00
scrawl
c4aae96d94 implemented "goodbye" script function that force-cancels dialogue 2012-05-11 07:18:41 +02:00
Marc Zinnschlag
35f478071e Issue #255: deleted the old environment class and using the new one instead 2012-04-23 15:27:03 +02:00
Marc Zinnschlag
b5d12d0723 fixed ForceGreeting 2012-04-15 17:08:22 +02:00
gugus
c24a85848f forceGreeting script instruction 2012-04-15 15:56:36 +02:00
Marc Zinnschlag
187b8e58d6 fixed handling of optional instruction/function arguments; removed choice workaround 2012-03-17 19:32:44 +01:00
gugus
042d87f77f a lot of clean up 2012-03-16 17:53:34 +01:00
gugus
07d8d654cd one step toward function filters and end choices. 2012-03-14 18:47:29 +01:00
gugus
82c6b0f92a choice function. Do not work. 2012-03-07 18:52:27 +01:00
gugus
f1dc360720 added the script instruction addTopic 2012-02-10 22:02:24 +01:00