diff --git a/README.md b/README.md index a3e656cfe..c1310bc5e 100644 --- a/README.md +++ b/README.md @@ -20,10 +20,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 --------------- 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 }; 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()); diff --git a/tes3mp-credits.md b/tes3mp-credits.md index 87d718776..a221528e7 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 @@ -57,11 +58,13 @@ Special thanks -------------- Aesylwinn + Battlerax - Various small fixes Boyos Brandon Guffey Caledonii Camul David Wery + Delphik DestinedToDie Donovan Ando DrunkenMonk @@ -70,7 +73,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 @@ -87,7 +90,8 @@ Special thanks Swims-in-Shadows aka StrayHALO_MAN Texafornian Thrud + Wraith Zach Wild Zaphida - All the developers of OpenMW for creating an amazing open source project + OpenMW for creating an amazing open source project