Merge branch 'develop'

config.py

@@ -960,7 +960,7 @@ class Config:
 
     def init_config(self):
         # Read Only
-        self._VERSION = "2.2.5"
+        self._VERSION = "2.2.6"
         self._ENABLE_SPEAKER2CHATBOX = False # Speaker2Chatbox
         self._ENABLE_SPEAKER2CHATBOX_PASS_CONFIRMATION = "VRCT=0YEN"
         self._PATH_LOCAL = os_path.dirname(sys.argv[0])

models/overlay/overlay.py

@@ -91,7 +91,7 @@ class Overlay:
             self.system = openvr.init(openvr.VRApplication_Background)
             self.overlay = openvr.IVROverlay()
             self.overlay_system = openvr.IVRSystem()
-            self.handle = self.overlay.createOverlay("Overlay_Speaker2log", "SOverlay_Speaker2log_UI")
+            self.handle = self.overlay.createOverlay("Overlay_Speaker2log", "Overlay_Speaker2log_UI")
             self.overlay.showOverlay(self.handle)
             self.initialized = True
 
@@ -116,7 +116,16 @@ class Overlay:
             width, height = img.size
             img = img.tobytes()
             img = (ctypes.c_char * len(img)).from_buffer_copy(img)
-            self.overlay.setOverlayRaw(self.handle, img, width, height, 4)
+
+            try:
+                self.overlay.setOverlayRaw(self.handle, img, width, height, 4)
+            except Exception as e:
+                print("Could not update image", e)
+                self.initialized = False
+                self.reStartOverlay()
+                while self.initialized is False:
+                    time.sleep(0.1)
+                self.overlay.setOverlayRaw(self.handle, img, width, height, 4)
             self.updateOpacity(self.settings["opacity"])
             self.lastUpdate = time.monotonic()
 
@@ -254,6 +263,10 @@ class Overlay:
             self.system = None
         self.initialized = False
 
+    def reStartOverlay(self):
+        self.shutdownOverlay()
+        self.startOverlay()
+
     @staticmethod
     def checkSteamvrRunning() -> bool:
         _proc_name = "vrmonitor.exe" if os.name == "nt" else "vrmonitor"

vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/_SettingBoxGenerator.py

@@ -1126,7 +1126,7 @@ class _SettingBoxGenerator():
             button_fg_color=self.settings.ctm.SB__BUTTON_COLOR,
             button_enter_color=self.settings.ctm.SB__BUTTON_HOVERED_COLOR,
             button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
-            button_image_file=self.settings.image_file.ARROW_LEFT.rotate(270),
+            button_image_file=self.settings.image_file.ARROW_LEFT.rotate(90),
             button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE,
             corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS,
             button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY,
@@ -1141,7 +1141,7 @@ class _SettingBoxGenerator():
             button_fg_color=self.settings.ctm.SB__BUTTON_COLOR,
             button_enter_color=self.settings.ctm.SB__BUTTON_HOVERED_COLOR,
             button_clicked_color=self.settings.ctm.SB__BUTTON_CLICKED_COLOR,
-            button_image_file=self.settings.image_file.ARROW_LEFT.rotate(90),
+            button_image_file=self.settings.image_file.ARROW_LEFT.rotate(270),
             button_image_size=self.settings.uism.SB__BUTTON_ICON_SIZE,
             corner_radius=self.settings.uism.SB__BUTTON_CORNER_RADIUS,
             button_ipadxy=self.settings.uism.SB__BUTTON_IPADXY,

vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/about_vrct_store.py

@@ -19,6 +19,8 @@ poster_showcase_worlds_settings = [
             { "image_file_name": "uj_club.png", "x_post_num": "1780791654196388201" },
             { "image_file_name": "sushi_stand_guruguru.png", "x_post_num": "1788523302404952218" },
             { "image_file_name": "sushi_guru_annex.png", "x_post_num": None },
+            { "image_file_name": "una_yosh.png", "x_post_num": "1820329216598311065" },
+            { "image_file_name": "cam.png", "x_post_num": None },
         ]
     },
 
@@ -42,10 +44,11 @@ poster_showcase_worlds_settings = [
     {
         "author_name": "ichiya",
         "data": [
+            { "image_file_name": "ehon_no_heikousekai.png", "x_post_num": None },
             { "image_file_name": "ehon_no_heikousekai_jimusho.png", "x_post_num": "1780792306976850285" },
             { "image_file_name": "ikoiba.png", "x_post_num": "1782723006923780580" },
             { "image_file_name": "kimodameshi.png", "x_post_num": "1781224391692714133" },
-            { "image_file_name": "parallel_collar.png", "x_post_num": None },
+            { "image_file_name": "parallel_collar.png", "x_post_num": "1820693442105934068" },
         ]
     },
 
@@ -77,7 +80,7 @@ poster_showcase_worlds_settings = [
     {
         "author_name": "chakamoto",
         "data": [
-            { "image_file_name": "chakachaka_multipurpose_room.png", "x_post_num": None },
+            { "image_file_name": "chakachaka_multipurpose_room.png", "x_post_num": "1818107831289295065" },
         ]
     },
 
@@ -101,7 +104,7 @@ poster_showcase_worlds_settings = [
     {
         "author_name": "eenkoo",
         "data": [
-            { "image_file_name": "tyuuniti_kouryuukai.png", "x_post_num": None },
+            { "image_file_name": "tyuuniti_kouryuukai.png", "x_post_num": "1818109101731422617" },
         ]
     },
 
@@ -132,9 +135,9 @@ poster_showcase_worlds_settings = [
 
     # MiMi_Sorahana # VRC日韓交流会 (KRJPEX.1355)
     {
-        "author_name": "tommie_500",
+        "author_name": "mimi_sorahana",
         "data": [
-            { "image_file_name": "kr_jp_exchange.png", "x_post_num": None },
+            { "image_file_name": "kr_jp_exchange.png", "x_post_num": "1820328755950473668" },
         ]
     },
 
@@ -145,4 +148,36 @@ poster_showcase_worlds_settings = [
             { "image_file_name": "smokerz_guild_v2.png", "x_post_num": None },
         ]
     },
+
+    # KokiM1018
+    {
+        "author_name": "kokim1018",
+        "data": [
+            { "image_file_name": "poker_room_elysion.png", "x_post_num": "1818880695344980208" },
+        ]
+    },
+
+    # NEET ENGINEER
+    {
+        "author_name": "neet_engineer",
+        "data": [
+            { "image_file_name": "japan_street.png", "x_post_num": "1818881593114861924" },
+        ]
+    },
+
+    # RIKU_VR
+    {
+        "author_name": "riku_vr",
+        "data": [
+            { "image_file_name": "celestial_blooms.png", "x_post_num": "1820694531568001061" },
+        ]
+    },
+
+    # ღKAEDEಇ
+    {
+        "author_name": "kaede",
+        "data": [
+            { "image_file_name": "omoshiro_kotoba_asobi_game.png", "x_post_num": None },
+        ]
+    },
 ]

vrct_gui/config_window/widgets/createSideMenuAndSettingsBoxContainers/setting_box_containers/setting_box_about_vrct/createSettingBox_AboutVrct.py

@@ -279,15 +279,15 @@ def createSettingBox_AboutVrct(setting_box_wrapper, config_window, settings, vie
     special_thanks_message = settings.about_vrct.embedImageCTkLabel(special_thanks_contents_wrapper, settings.about_vrct.image_file.SPECIAL_THANKS_MESSAGE)
     special_thanks_message.grid(column=0, row=1, padx=0, pady=(0,about_vrct_uism.SPECIAL_THANKS_MESSAGE_BOTTOM_PADY), sticky="nsew")
 
-    special_thanks_message_and_you = settings.about_vrct.embedImageCTkLabel(special_thanks_contents_wrapper, "special_thanks_message_and_you.png")
-    special_thanks_message_and_you.grid(column=0, row=2, padx=0, pady=(0,about_vrct_uism.SPECIAL_THANKS_MESSAGE_AND_YOU_BOTTOM_PADY), sticky="nsw")
+    # special_thanks_message_and_you = settings.about_vrct.embedImageCTkLabel(special_thanks_contents_wrapper, "special_thanks_message_and_you.png")
+    # special_thanks_message_and_you.grid(column=0, row=2, padx=0, pady=(0,about_vrct_uism.SPECIAL_THANKS_MESSAGE_AND_YOU_BOTTOM_PADY), sticky="nsw")
 
-    special_thanks_tell_us_message = createTellUsButton(
-        parent_frame=special_thanks_contents_wrapper,
-        image_file_name=settings.about_vrct.image_file.SPECIAL_THANKS_TELL_US_MESSAGE,
-        callback=lambda _e: callFunctionIfCallable(view_variable.CALLBACK_OPEN_WEBPAGE_ABOUT_VRCT, "SUPPORTER_REGISTRATION"),
-    )
-    special_thanks_tell_us_message.grid(column=0, row=3)
+    # special_thanks_tell_us_message = createTellUsButton(
+    #     parent_frame=special_thanks_contents_wrapper,
+    #     image_file_name=settings.about_vrct.image_file.SPECIAL_THANKS_TELL_US_MESSAGE,
+    #     callback=lambda _e: callFunctionIfCallable(view_variable.CALLBACK_OPEN_WEBPAGE_ABOUT_VRCT, "SUPPORTER_REGISTRATION"),
+    # )
+    # special_thanks_tell_us_message.grid(column=0, row=3)