From a9c3b3e6cc904d54b0201b6cd30202481b9e0a10 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Mon, 2 May 2022 11:58:09 +0300 Subject: [PATCH 1/5] [Documentation] Add mention of VR branch to README Mention current version in Project Status. --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 0f2e642ab..664ce81c5 100644 --- a/README.md +++ b/README.md @@ -18,10 +18,12 @@ Project status [Version changelog](https://github.com/TES3MP/TES3MP/blob/master/tes3mp-changelog.md) -As of version 0.8.0, TES3MP is fully playable, providing very extensive player, NPC, world and quest synchronization, as well as state saving and loading, all of which are highly customizable via [serverside Lua scripts](https://github.com/TES3MP/CoreScripts). +As of version 0.8.1, TES3MP is fully playable, providing very extensive player, NPC, world and quest synchronization, as well as state saving and loading, all of which are highly customizable via [serverside Lua scripts](https://github.com/TES3MP/CoreScripts). Remaining gameplay problems mostly relate to AI and the fact that clientside script variables need to be placed on a synchronization whitelist to avoid packet spam. +TES3MP now also has a [VR branch](https://github.com/TES3MP/TES3MP/tree/0.8.1-vr) that combines its code with that of Mads Buvik Sandvei's [OpenMW VR](https://gitlab.com/madsbuvi/openmw). + Donations --------------- From 89eb01f2dcf1239940c33633afb5ebeba245cb20 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 3 May 2022 13:35:15 +0300 Subject: [PATCH 2/5] [Documentation] Update credits --- tes3mp-credits.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tes3mp-credits.md b/tes3mp-credits.md index 87d718776..4d239f580 100644 --- a/tes3mp-credits.md +++ b/tes3mp-credits.md @@ -47,6 +47,7 @@ Super special thanks greetasdf Jason Ginther Learwolf + Mads Buvik Sandvei (madsbuvi) Marc Zinnschlag (Zini) Mitch (Zaberius) scrawl @@ -62,6 +63,7 @@ Special thanks Caledonii Camul David Wery + Delphik DestinedToDie Donovan Ando DrunkenMonk @@ -70,7 +72,7 @@ Special thanks Ignatious James Wards of Gore Corps LAN Club (gorecorps.co.nz) Jeff Russell - Jeremiah + Jeremy M. Kyle Willey of Loreshaper Games (steempeak.com/@loreshapergames) Lewis Sadlier Luc Keating @@ -89,5 +91,5 @@ Special thanks Thrud Zach Wild Zaphida - All the developers of OpenMW for creating an amazing open source project + OpenMW for creating an amazing open source project From eb1c89403881e97497b38720d788d2cf5392122f Mon Sep 17 00:00:00 2001 From: David Cernat Date: Tue, 3 May 2022 23:29:20 +0300 Subject: [PATCH 3/5] [Client] Add clearer debug for bad LiveCellRef casts --- apps/openmw/mwworld/ptr.hpp | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/apps/openmw/mwworld/ptr.hpp b/apps/openmw/mwworld/ptr.hpp index 9ab18d7f4..6f269ab3f 100644 --- a/apps/openmw/mwworld/ptr.hpp +++ b/apps/openmw/mwworld/ptr.hpp @@ -52,7 +52,16 @@ namespace MWWorld std::stringstream str; str<< "Bad LiveCellRef cast to "<mRef.getRefId().c_str() << " " << mRef->mRef.getRefNum().mIndex << "-" << mRef->mRef.getMpNum(); + /* + End of tes3mp change (major) + */ + else str<< "an empty object"; throw std::runtime_error(str.str()); @@ -128,7 +137,15 @@ namespace MWWorld std::stringstream str; str<< "Bad LiveCellRef cast to "<mRef.getRefId().c_str() << " " << mRef->mRef.getRefNum().mIndex << "-" << mRef->mRef.getMpNum(); + /* + End of tes3mp change (major) + */ else str<< "an empty object"; throw std::runtime_error(str.str()); From 346b4308b820af2fa260c228464566f530ad8ca1 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Fri, 6 May 2022 00:06:32 +0300 Subject: [PATCH 4/5] [Documentation] Update credits --- tes3mp-credits.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tes3mp-credits.md b/tes3mp-credits.md index 4d239f580..a221528e7 100644 --- a/tes3mp-credits.md +++ b/tes3mp-credits.md @@ -58,6 +58,7 @@ Special thanks -------------- Aesylwinn + Battlerax - Various small fixes Boyos Brandon Guffey Caledonii @@ -89,6 +90,7 @@ Special thanks Swims-in-Shadows aka StrayHALO_MAN Texafornian Thrud + Wraith Zach Wild Zaphida OpenMW for creating an amazing open source project From 3b355653d460117f3afe396f536c73ae81a0c9d4 Mon Sep 17 00:00:00 2001 From: David Cernat Date: Fri, 6 May 2022 00:12:59 +0300 Subject: [PATCH 5/5] [Client] Fix overlap of GuiMode IDs for VR meta menu and TES3MP InputBox --- apps/openmw/mwmp/GUIController.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/openmw/mwmp/GUIController.hpp b/apps/openmw/mwmp/GUIController.hpp index 44dedc4af..ef2f7713b 100644 --- a/apps/openmw/mwmp/GUIController.hpp +++ b/apps/openmw/mwmp/GUIController.hpp @@ -24,7 +24,8 @@ namespace mwmp public: enum GM { - GM_TES3MP_InputBox = MWGui::GM_QuickKeysMenu + 1, + GM_VR_MetaMenu = MWGui::GM_QuickKeysMenu + 1, // Put this dummy GuiMode here because it's used in VR + GM_TES3MP_InputBox, GM_TES3MP_ListBox };