mirror of
https://gitlab.com/ProcyonLotor/vrchat-template.git
synced 2026-08-25 10:43:53 +05:00
Compare commits
2 Commits
cf656f47a8
...
d2d579d576
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d2d579d576 | ||
|
|
d0fac4ebfb |
@@ -1,5 +1,8 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"com.vrchat.worlds": {
|
||||||
|
"version": "3.x"
|
||||||
|
},
|
||||||
"com.vrchat.core.vpm-resolver": {
|
"com.vrchat.core.vpm-resolver": {
|
||||||
"version": "0.1.x"
|
"version": "0.1.x"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,8 +13,8 @@ AudioManager:
|
|||||||
m_VirtualVoiceCount: 64
|
m_VirtualVoiceCount: 64
|
||||||
m_RealVoiceCount: 32
|
m_RealVoiceCount: 32
|
||||||
m_EnableOutputSuspension: 1
|
m_EnableOutputSuspension: 1
|
||||||
m_SpatializerPlugin:
|
m_SpatializerPlugin: OculusSpatializer
|
||||||
m_AmbisonicDecoderPlugin:
|
m_AmbisonicDecoderPlugin: OculusSpatializer
|
||||||
m_DisableAudio: 0
|
m_DisableAudio: 0
|
||||||
m_VirtualizeEffects: 1
|
m_VirtualizeEffects: 1
|
||||||
m_RequestedDSPBufferSize: 0
|
m_RequestedDSPBufferSize: 0
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -618,7 +618,20 @@ PlayerSettings:
|
|||||||
webGLLinkerTarget: 1
|
webGLLinkerTarget: 1
|
||||||
webGLThreadsSupport: 0
|
webGLThreadsSupport: 0
|
||||||
webGLWasmStreaming: 0
|
webGLWasmStreaming: 0
|
||||||
scriptingDefineSymbols: {}
|
scriptingDefineSymbols:
|
||||||
|
1: UNITY_POST_PROCESSING_STACK_V2;UDON;VRC_SDK_VRCSDK3;UDONSHARP
|
||||||
|
7: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
13: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
14: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
19: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
21: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
25: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
27: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
28: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
29: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
30: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
32: UNITY_POST_PROCESSING_STACK_V2
|
||||||
|
33: UNITY_POST_PROCESSING_STACK_V2
|
||||||
platformArchitecture: {}
|
platformArchitecture: {}
|
||||||
scriptingBackend: {}
|
scriptingBackend: {}
|
||||||
il2cppCompilerConfiguration: {}
|
il2cppCompilerConfiguration: {}
|
||||||
|
|||||||
@@ -5,13 +5,14 @@ SETLOCAL
|
|||||||
CD "%~dp0"
|
CD "%~dp0"
|
||||||
git rev-parse --is-inside-work-tree >NUL || GOTO die
|
git rev-parse --is-inside-work-tree >NUL || GOTO die
|
||||||
|
|
||||||
ECHO The following files were changed and will be reverted:
|
ECHO.
|
||||||
|
ECHO *** WARNING: The following files were changed and will be reverted:
|
||||||
git diff --name-only HEAD
|
git diff --name-only HEAD
|
||||||
|
|
||||||
ECHO.
|
ECHO.
|
||||||
CHOICE /M "Execute"
|
CHOICE /M "Execute"
|
||||||
IF %ERRORLEVEL% NEQ 1 (
|
IF %ERRORLEVEL% NEQ 1 (
|
||||||
ECHO Aborting restore...
|
ECHO Aborting discard...
|
||||||
) ELSE (
|
) ELSE (
|
||||||
git restore "%~dp0." || GOTO die
|
git restore "%~dp0." || GOTO die
|
||||||
ECHO Done.
|
ECHO Done.
|
||||||
|
|||||||
@@ -5,12 +5,13 @@ repository="$(dirname "$(readlink -f "$0")")/."
|
|||||||
cd "${repository}"
|
cd "${repository}"
|
||||||
git rev-parse --is-inside-work-tree >/dev/null
|
git rev-parse --is-inside-work-tree >/dev/null
|
||||||
|
|
||||||
echo "The following files were changed and will be reverted:"
|
echo ""
|
||||||
|
echo "*** WARNING: The following files were changed and will be reverted:"
|
||||||
git diff --name-only HEAD
|
git diff --name-only HEAD
|
||||||
|
|
||||||
printf "\nExecute [Y,N]?"; read -r yn
|
printf "\nExecute [Y,N]?"; read -r yn
|
||||||
if [ "$yn" = "${yn#[Yy]}" ]; then
|
if [ "$yn" = "${yn#[Yy]}" ]; then
|
||||||
echo "Aborting restore..."
|
echo "Aborting discard..."
|
||||||
else
|
else
|
||||||
git restore "${repository}"
|
git restore "${repository}"
|
||||||
echo "Done."
|
echo "Done."
|
||||||
|
|||||||
@@ -11,15 +11,24 @@ IF NOT DEFINED upstream (
|
|||||||
GOTO die
|
GOTO die
|
||||||
)
|
)
|
||||||
|
|
||||||
|
git fetch --all || GOTO die
|
||||||
|
|
||||||
|
ECHO.
|
||||||
ECHO Going to reset current branch to: %upstream%
|
ECHO Going to reset current branch to: %upstream%
|
||||||
ECHO *** WARNING: All local changes and commits will be lost!
|
|
||||||
|
ECHO.
|
||||||
|
ECHO *** WARNING: These local commits will be lost:
|
||||||
|
git log "%upstream%..HEAD" --oneline
|
||||||
|
|
||||||
|
ECHO.
|
||||||
|
ECHO *** WARNING: These local files will be reset:
|
||||||
|
git diff "HEAD..%upstream%" --name-only
|
||||||
|
|
||||||
ECHO.
|
ECHO.
|
||||||
CHOICE /M "Execute"
|
CHOICE /M "Execute"
|
||||||
IF %ERRORLEVEL% NEQ 1 (
|
IF %ERRORLEVEL% NEQ 1 (
|
||||||
ECHO Aborting reset...
|
ECHO Aborting reset...
|
||||||
) ELSE (
|
) ELSE (
|
||||||
git fetch --all || GOTO die
|
|
||||||
git reset --hard "%upstream%" || GOTO die
|
git reset --hard "%upstream%" || GOTO die
|
||||||
ECHO Done.
|
ECHO Done.
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -9,8 +9,16 @@ if [ -z "$upstream" ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
echo ""
|
||||||
echo "Going to reset current branch to: ${upstream}"
|
echo "Going to reset current branch to: ${upstream}"
|
||||||
echo "*** WARNING: All local changes and commits will be lost!"
|
|
||||||
|
echo ""
|
||||||
|
echo "*** WARNING: These local commits will be lost:"
|
||||||
|
git log "${upstream}..HEAD" --oneline
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "*** WARNING: These local files will be reset:"
|
||||||
|
git diff "HEAD..${upstream}" --name-only
|
||||||
|
|
||||||
printf "\nExecute [Y,N]?"; read -r yn
|
printf "\nExecute [Y,N]?"; read -r yn
|
||||||
if [ "$yn" = "${yn#[Yy]}" ]; then
|
if [ "$yn" = "${yn#[Yy]}" ]; then
|
||||||
|
|||||||
Reference in New Issue
Block a user