github/VRCX
1
1
Fork 0
mirror of https://github.com/vrcx-team/VRCX.git synced 2026-04-05 16:21:59 +02:00
Code Issues 51 Packages Projects Releases Wiki Activity

Update year

Browse Source
This commit is contained in:
Natsumi
2026-01-12 09:49:34 +13:00
parent 2a31a1f988
commit 637201c8f7
33 changed files with 35 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Dotnet/AppApi/Cef/AppApiCef.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Collections.Generic;
using System.Collections.Specialized;
@@ -216,7 +210,7 @@ namespace VRCX
using var client = MainForm.Instance.Browser.GetDevToolsClient();
_ = client.Network.SetUserAgentOverrideAsync(Program.Version);
}
public override void SetTrayIconNotification(bool notify)
{
MainForm.Instance.BeginInvoke(new MethodInvoker(() => { MainForm.Instance.SetTrayIconNotification(notify); }));

6
Dotnet/AssetBundleManager.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Collections.Generic;
using System.Diagnostics;

8
Dotnet/Cef/CefCustomDownloadHandler.cs
View File

@@ -1,10 +1,4 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using CefSharp;
using CefSharp;
namespace VRCX
{

7
Dotnet/Cef/CefCustomMenuHandler.cs
View File

@@ -1,9 +1,4 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using CefSharp;
using CefSharp;
namespace VRCX
{

10
Dotnet/Cef/CefCustomRequestHandler.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System.Security.Cryptography.X509Certificates;
using CefSharp;
using NLog;
@@ -13,14 +7,14 @@ namespace VRCX
public class CustomRequestHandler : IRequestHandler
{
private readonly Logger _logger = LogManager.GetCurrentClassLogger();
public bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect)
{
if (Program.LaunchDebug ||
request.Url.StartsWith("file://vrcx/") ||
request.Url.StartsWith("chrome-extension://"))
return false;
_logger.Error("Blocking navigation to: {Url}", request.Url);
return true;
}

6
Dotnet/Cef/CefNoopDragHandler.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System.Collections.Generic;
using CefSharp;
using CefSharp.Enums;

7
Dotnet/Cef/MainForm.Designer.cs generated
View File

@@ -1,9 +1,4 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System;
using System.ComponentModel;
using System.Drawing;
using System.Windows.Forms;

8
Dotnet/Cef/MainForm.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Diagnostics.CodeAnalysis;
using System.Drawing;
@@ -243,7 +237,7 @@ namespace VRCX
{
Instance.Browser.ShowDevTools();
}
private void TrayMenu_ForceCrash_Click(object sender, System.EventArgs e)
{
Instance.Browser.LoadUrl("chrome://crash");

28
Dotnet/Discord.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using DiscordRPC;
using System.Text;
@@ -135,21 +129,21 @@ namespace VRCX
}
return Encoding.UTF8.GetString(bytesArr, 0, bytesArr.Length - bytesToRemove);
}
public void SetAssets(
string details,
string state,
string detailsUrl,
string largeKey,
string largeText,
string smallKey,
string smallText,
double startUnixMilliseconds,
double endUnixMilliseconds,
string partyId,
int partySize,
int partyMax,
@@ -171,21 +165,21 @@ namespace VRCX
_lock.ExitWriteLock();
return;
}
_presence.Details = LimitByteLength(details, 127);
_presence.DetailsUrl = !string.IsNullOrEmpty(detailsUrl) ? detailsUrl : null;
// _presence.StateUrl
_presence.State = LimitByteLength(state, 127);
_presence.Assets ??= new Assets();
_presence.Assets.LargeImageKey = largeKey;
_presence.Assets.LargeImageText = largeText;
_presence.Assets.LargeImageUrl = VrcxUrl;
_presence.Assets.SmallImageKey = smallKey;
_presence.Assets.SmallImageText = smallText;
// m_Presence.Assets.SmallImageUrl
if (startUnixMilliseconds == 0)
{
_presence.Timestamps = null;
@@ -214,7 +208,7 @@ namespace VRCX
_presence.Type = (ActivityType)activityType;
_presence.StatusDisplay = (StatusDisplayType)statusDisplayType;
Button[] buttons = [];
if (!string.IsNullOrEmpty(buttonUrl))
{
@@ -224,7 +218,7 @@ namespace VRCX
];
}
_presence.Buttons = buttons;
if (_discordAppId != appId)
{
_discordAppId = appId;

6
Dotnet/IPC/IPCClient.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Globalization;
using System.IO;

6
Dotnet/IPC/IPCServer.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;

6
Dotnet/JsonFileSerializer.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using Newtonsoft.Json;
using System.IO;
using System.Text;

6
Dotnet/LogWatcher.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;

16
Dotnet/Overlay/Cef/OffScreenBrowser.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using CefSharp;
using CefSharp.Enums;
using CefSharp.OffScreen;
@@ -100,22 +94,22 @@ namespace VRCX
{
if ((IntPtr)_device1.Handle == IntPtr.Zero)
return;
if ((IntPtr)_deviceContext.Handle == IntPtr.Zero)
return;
if ((IntPtr)_query.Handle == IntPtr.Zero)
return;
if ((IntPtr)_renderTarget.Handle == IntPtr.Zero)
return;
using ComPtr<ID3D11Texture2D> cefTexture =
_device1.OpenSharedResource1<ID3D11Texture2D>(paintInfo.SharedTextureHandle.ToPointer());
_deviceContext.CopyResource(_renderTarget, cefTexture);
_deviceContext.End(_query);
_deviceContext.Flush();
while (_deviceContext.GetData(_query, IntPtr.Zero.ToPointer(), 0, 0) == 1)
{
Thread.Yield();

6
Dotnet/Overlay/Cef/OffScreenBrowserLegacy.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using CefSharp;
using CefSharp.Enums;
using CefSharp.OffScreen;

6
Dotnet/Overlay/Cef/SystemMonitorCef.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Diagnostics;
using System.Threading;

8
Dotnet/Overlay/Cef/VRCXVRCef.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -33,7 +27,7 @@ namespace VRCX
private static readonly float[] _rotationRight = { -90f * (float)(Math.PI / 180f), -90f * (float)(Math.PI / 180f), -90f * (float)(Math.PI / 180f) };
private static OffScreenBrowser _wristOverlay;
private static OffScreenBrowser _hmdOverlay;
private readonly List<string[]> _deviceList;
private readonly ReaderWriterLockSlim _deviceListLock;
private bool _active;

10
Dotnet/Overlay/Cef/VRCXVRLegacy.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -33,7 +27,7 @@ namespace VRCX
private static readonly float[] _rotationRight = { -90f * (float)(Math.PI / 180f), -90f * (float)(Math.PI / 180f), -90f * (float)(Math.PI / 180f) };
private static OffScreenBrowserLegacy _wristOverlay;
private static OffScreenBrowserLegacy _hmdOverlay;
private readonly List<string[]> _deviceList;
private readonly ReaderWriterLockSlim _deviceListLock;
private bool _active;
@@ -43,7 +37,7 @@ namespace VRCX
private Thread _thread;
private bool _wristOverlayActive;
private DateTime _nextOverlayUpdate;
private DXGI _dxgi;
private D3D11 _d3d11;
private ComPtr<IDXGIFactory2> _factory;

6
Dotnet/Overlay/Cef/VRForm.Designer.cs generated
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
namespace VRCX
{
partial class VRForm

7
Dotnet/Overlay/Cef/VRForm.cs
View File

@@ -1,9 +1,4 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System.IO;
using System.IO;
using System.Windows.Forms;
using CefSharp;
using CefSharp.WinForms;

6
Dotnet/Overlay/Electron/SystemMonitorElectron.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.IO;
using System.Threading;

6
Dotnet/Overlay/Electron/VRCXVRElectron.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;

6
Dotnet/Program.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using NLog;
using NLog.Targets;
using System;

12
Dotnet/StartupArgs.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Diagnostics;
using System.IO;
@@ -74,7 +68,7 @@ namespace VRCX
{
if (arg == VrcxLaunchArguments.IsStartupPrefix)
arguments.IsStartup = true;
if (arg == VrcxLaunchArguments.IsUpgradePrefix)
arguments.IsUpgrade = true;
@@ -83,7 +77,7 @@ namespace VRCX
if (arg.StartsWith(VrcxLaunchArguments.LaunchCommandPrefix) && arg.Length > VrcxLaunchArguments.LaunchCommandPrefix.Length)
arguments.LaunchCommand = arg.Substring(VrcxLaunchArguments.LaunchCommandPrefix.Length);
if (arg.StartsWith(VrcxLaunchArguments.LinuxLaunchCommandPrefix) && arg.Length > VrcxLaunchArguments.LinuxLaunchCommandPrefix.Length)
arguments.LaunchCommand = arg.Substring(VrcxLaunchArguments.LinuxLaunchCommandPrefix.Length);
@@ -100,7 +94,7 @@ namespace VRCX
{
public const string IsStartupPrefix = "--startup";
public bool IsStartup { get; set; } = false;
public const string IsUpgradePrefix = "/Upgrade";
public bool IsUpgrade { get; set; } = false;

10
Dotnet/Update.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using System;
using System.Collections.Generic;
using System.IO;
@@ -56,7 +50,7 @@ namespace VRCX
{
if (Process.GetProcessesByName("VRCX_Setup").Length > 0)
Environment.Exit(0);
if (File.Exists(TempDownload))
File.Delete(TempDownload);
if (File.Exists(VrcxSetupExecutable))
@@ -194,7 +188,7 @@ namespace VRCX
await destination.WriteAsync(buffer.AsMemory(0, bytesRead), _cancellationToken);
totalBytesRead += bytesRead;
}
destination.Close();
var data = new FileInfo(TempDownload);

6
Dotnet/WinApi.cs
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
using Microsoft.Win32;
using System;
using System.Collections.Generic;

2
LICENSE
View File

@@ -1,6 +1,6 @@
MIT License
Copyright (c) 2019-2025 pypy and individual contributors.
Copyright (c) 2019-2026 pypy and individual contributors.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal

8
src/app.css
View File

@@ -1,11 +1,3 @@
/*
/* Copyright(c) 2019-2025 pypy and individual contributors.
/* All rights reserved.
/*
/* This work is licensed under the terms of the MIT license.
/* For a copy, see <https://opensource.org/licenses/MIT>.
*/
@import 'element-plus/dist/index.css';
@import 'element-plus/theme-chalk/dark/css-vars.css';

6
src/app.js
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
import { createApp } from 'vue';
import ElementPlus from 'element-plus';

2
src/views/Login/Login.vue
View File

@@ -133,7 +133,7 @@
}}</a>
</p>
<p>
&copy; 2019-2025
&copy; 2019-2026
<a class="x-link" @click="openExternalLink('https://github.com/pypy-vrc')">pypy</a> &amp;
<a class="x-link" @click="openExternalLink('https://github.com/Natsumi-sama')">Natsumi</a>
</p>

2
src/views/Settings/components/Tabs/GeneralTab.vue
View File

@@ -282,7 +282,7 @@
<span class="header">{{ t('view.settings.general.legal_notice.header') }}</span>
<div class="options-container-item" style="display: block">
<p>
&copy; 2019-2025
&copy; 2019-2026
<a class="x-link" @click="openExternalLink('https://github.com/pypy-vrc')">pypy</a> &amp;
<a class="x-link" @click="openExternalLink('https://github.com/Natsumi-sama')">Natsumi</a>
</p>

8
src/vr/vr.css
View File

@@ -1,11 +1,3 @@
/*
/* Copyright(c) 2019-2025 pypy and individual contributors.
/* All rights reserved.
/*
/* This work is licensed under the terms of the MIT license.
/* For a copy, see <https://opensource.org/licenses/MIT>.
*/
@import 'tailwindcss';
@import 'animate.css/animate.min.css';

6
src/vr/vr.js
View File

@@ -1,9 +1,3 @@
// Copyright(c) 2019-2025 pypy, Natsumi and individual contributors.
// All rights reserved.
//
// This work is licensed under the terms of the MIT license.
// For a copy, see <https://opensource.org/licenses/MIT>.
import { createApp } from 'vue';
import { i18n } from '../plugin/i18n';