mirror of
https://gitlab.com/ProcyonLotor/vrchat-template.git
synced 2026-08-25 18:53:53 +05:00
Compare commits
1 Commits
unity-2022
...
535d71b22a
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
535d71b22a |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -8,7 +8,6 @@
|
|||||||
/[Bb]uilds/
|
/[Bb]uilds/
|
||||||
/[Ll]ogs/
|
/[Ll]ogs/
|
||||||
/[Uu]ser[Ss]ettings/
|
/[Uu]ser[Ss]ettings/
|
||||||
*.log
|
|
||||||
|
|
||||||
# MemoryCaptures can get excessive in size.
|
# MemoryCaptures can get excessive in size.
|
||||||
# They also could contain extremely sensitive data
|
# They also could contain extremely sensitive data
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
{
|
{
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"com.vrchat.avatars": {
|
||||||
|
"version": "3.x"
|
||||||
|
},
|
||||||
"com.vrchat.core.vpm-resolver": {
|
"com.vrchat.core.vpm-resolver": {
|
||||||
"version": "0.1.x"
|
"version": "0.1.x"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -17,7 +17,7 @@ PhysicsManager:
|
|||||||
m_ClothInterCollisionDistance: 0
|
m_ClothInterCollisionDistance: 0
|
||||||
m_ClothInterCollisionStiffness: 0
|
m_ClothInterCollisionStiffness: 0
|
||||||
m_ContactsGeneration: 1
|
m_ContactsGeneration: 1
|
||||||
m_LayerCollisionMatrix: dfaff7ffdfaff7ffdfaff7ffffffffffdfaff7ffc800c0ffffffffffffffffffdfaff7ffdf09f4ffdf09f4ffdfaff7ffc800c0ffdfe9c3ffc820c0ffdfa9f7ffdfa9f7ffdfa9f7ffdf8ff7ffc800c0ffdf8ff7ffdf8ff7ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
m_LayerCollisionMatrix: dfafffffdfafffffdfafffffffffffffdfafffffc800c0ffffffffffffffffffdfafffffdf09fcffdf09fcffdfafffffc800c0ffdfe9c3ffc820c0ffdfa9ffffdfa9ffffdfa9ffffdf8fffffdf8fffffdf8fffffdf8fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
||||||
m_AutoSimulation: 1
|
m_AutoSimulation: 1
|
||||||
m_AutoSyncTransforms: 0
|
m_AutoSyncTransforms: 0
|
||||||
m_ReuseCollisionCallbacks: 1
|
m_ReuseCollisionCallbacks: 1
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
--- !u!129 &1
|
--- !u!129 &1
|
||||||
PlayerSettings:
|
PlayerSettings:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 26
|
serializedVersion: 20
|
||||||
productGUID: 9e59d35066069f1469c7165423087ff5
|
productGUID: 9e59d35066069f1469c7165423087ff5
|
||||||
AndroidProfiler: 0
|
AndroidProfiler: 0
|
||||||
AndroidFilterTouchesWhenObscured: 0
|
AndroidFilterTouchesWhenObscured: 0
|
||||||
@@ -48,15 +48,12 @@ PlayerSettings:
|
|||||||
defaultScreenHeightWeb: 600
|
defaultScreenHeightWeb: 600
|
||||||
m_StereoRenderingPath: 1
|
m_StereoRenderingPath: 1
|
||||||
m_ActiveColorSpace: 1
|
m_ActiveColorSpace: 1
|
||||||
m_SpriteBatchVertexThreshold: 300
|
|
||||||
m_MTRendering: 1
|
m_MTRendering: 1
|
||||||
mipStripping: 0
|
|
||||||
numberOfMipsStripped: 0
|
|
||||||
numberOfMipsStrippedPerMipmapLimitGroup: {}
|
|
||||||
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
|
m_StackTraceTypes: 010000000100000001000000010000000100000001000000
|
||||||
iosShowActivityIndicatorOnLoading: -1
|
iosShowActivityIndicatorOnLoading: -1
|
||||||
androidShowActivityIndicatorOnLoading: -1
|
androidShowActivityIndicatorOnLoading: -1
|
||||||
iosUseCustomAppBackgroundBehavior: 0
|
iosUseCustomAppBackgroundBehavior: 0
|
||||||
|
iosAllowHTTPDownload: 1
|
||||||
allowedAutorotateToPortrait: 1
|
allowedAutorotateToPortrait: 1
|
||||||
allowedAutorotateToPortraitUpsideDown: 1
|
allowedAutorotateToPortraitUpsideDown: 1
|
||||||
allowedAutorotateToLandscapeRight: 1
|
allowedAutorotateToLandscapeRight: 1
|
||||||
@@ -120,19 +117,19 @@ PlayerSettings:
|
|||||||
switchNVNShaderPoolsGranularity: 33554432
|
switchNVNShaderPoolsGranularity: 33554432
|
||||||
switchNVNDefaultPoolsGranularity: 16777216
|
switchNVNDefaultPoolsGranularity: 16777216
|
||||||
switchNVNOtherPoolsGranularity: 16777216
|
switchNVNOtherPoolsGranularity: 16777216
|
||||||
switchGpuScratchPoolGranularity: 2097152
|
|
||||||
switchAllowGpuScratchShrinking: 0
|
|
||||||
switchNVNMaxPublicTextureIDCount: 0
|
switchNVNMaxPublicTextureIDCount: 0
|
||||||
switchNVNMaxPublicSamplerIDCount: 0
|
switchNVNMaxPublicSamplerIDCount: 0
|
||||||
switchNVNGraphicsFirmwareMemory: 32
|
|
||||||
stadiaPresentMode: 0
|
stadiaPresentMode: 0
|
||||||
stadiaTargetFramerate: 0
|
stadiaTargetFramerate: 0
|
||||||
vulkanNumSwapchainBuffers: 3
|
vulkanNumSwapchainBuffers: 3
|
||||||
vulkanEnableSetSRGBWrite: 0
|
vulkanEnableSetSRGBWrite: 0
|
||||||
vulkanEnablePreTransform: 0
|
|
||||||
vulkanEnableLateAcquireNextImage: 0
|
vulkanEnableLateAcquireNextImage: 0
|
||||||
vulkanEnableCommandBufferRecycling: 1
|
m_SupportedAspectRatios:
|
||||||
loadStoreDebugModeEnabled: 0
|
4:3: 1
|
||||||
|
5:4: 1
|
||||||
|
16:10: 1
|
||||||
|
16:9: 1
|
||||||
|
Others: 1
|
||||||
bundleVersion: 0.1
|
bundleVersion: 0.1
|
||||||
preloadedAssets: []
|
preloadedAssets: []
|
||||||
metroInputSource: 0
|
metroInputSource: 0
|
||||||
@@ -141,27 +138,45 @@ PlayerSettings:
|
|||||||
xboxOneDisableKinectGpuReservation: 1
|
xboxOneDisableKinectGpuReservation: 1
|
||||||
xboxOneEnable7thCore: 1
|
xboxOneEnable7thCore: 1
|
||||||
vrSettings:
|
vrSettings:
|
||||||
|
cardboard:
|
||||||
|
depthFormat: 0
|
||||||
|
enableTransitionView: 0
|
||||||
|
daydream:
|
||||||
|
depthFormat: 0
|
||||||
|
useSustainedPerformanceMode: 0
|
||||||
|
enableVideoLayer: 0
|
||||||
|
useProtectedVideoMemory: 0
|
||||||
|
minimumSupportedHeadTracking: 0
|
||||||
|
maximumSupportedHeadTracking: 1
|
||||||
|
hololens:
|
||||||
|
depthFormat: 1
|
||||||
|
depthBufferSharingEnabled: 1
|
||||||
|
lumin:
|
||||||
|
depthFormat: 0
|
||||||
|
frameTiming: 2
|
||||||
|
enableGLCache: 0
|
||||||
|
glCacheMaxBlobSize: 524288
|
||||||
|
glCacheMaxFileSize: 8388608
|
||||||
|
oculus:
|
||||||
|
sharedDepthBuffer: 1
|
||||||
|
dashSupport: 1
|
||||||
|
lowOverheadMode: 0
|
||||||
|
protectedContext: 0
|
||||||
|
v2Signing: 1
|
||||||
enable360StereoCapture: 0
|
enable360StereoCapture: 0
|
||||||
isWsaHolographicRemotingEnabled: 0
|
isWsaHolographicRemotingEnabled: 0
|
||||||
enableFrameTimingStats: 0
|
enableFrameTimingStats: 0
|
||||||
enableOpenGLProfilerGPURecorders: 1
|
|
||||||
useHDRDisplay: 0
|
useHDRDisplay: 0
|
||||||
hdrBitDepth: 0
|
D3DHDRBitDepth: 0
|
||||||
m_ColorGamuts: 00000000
|
m_ColorGamuts: 00000000
|
||||||
targetPixelDensity: 30
|
targetPixelDensity: 30
|
||||||
resolutionScalingMode: 0
|
resolutionScalingMode: 0
|
||||||
resetResolutionOnWindowResize: 0
|
|
||||||
androidSupportedAspectRatio: 1
|
androidSupportedAspectRatio: 1
|
||||||
androidMaxAspectRatio: 2.1
|
androidMaxAspectRatio: 2.1
|
||||||
applicationIdentifier: {}
|
applicationIdentifier: {}
|
||||||
buildNumber:
|
buildNumber: {}
|
||||||
Standalone: 0
|
|
||||||
VisionOS: 0
|
|
||||||
iPhone: 0
|
|
||||||
tvOS: 0
|
|
||||||
overrideDefaultApplicationIdentifier: 0
|
|
||||||
AndroidBundleVersionCode: 1
|
AndroidBundleVersionCode: 1
|
||||||
AndroidMinSdkVersion: 22
|
AndroidMinSdkVersion: 19
|
||||||
AndroidTargetSdkVersion: 0
|
AndroidTargetSdkVersion: 0
|
||||||
AndroidPreferredInstallLocation: 1
|
AndroidPreferredInstallLocation: 1
|
||||||
aotOptions:
|
aotOptions:
|
||||||
@@ -174,15 +189,12 @@ PlayerSettings:
|
|||||||
APKExpansionFiles: 0
|
APKExpansionFiles: 0
|
||||||
keepLoadedShadersAlive: 0
|
keepLoadedShadersAlive: 0
|
||||||
StripUnusedMeshComponents: 1
|
StripUnusedMeshComponents: 1
|
||||||
strictShaderVariantMatching: 0
|
|
||||||
VertexChannelCompressionMask: 4054
|
VertexChannelCompressionMask: 4054
|
||||||
iPhoneSdkVersion: 988
|
iPhoneSdkVersion: 988
|
||||||
iOSTargetOSVersionString: 12.0
|
iOSTargetOSVersionString: 10.0
|
||||||
tvOSSdkVersion: 0
|
tvOSSdkVersion: 0
|
||||||
tvOSRequireExtendedGameController: 0
|
tvOSRequireExtendedGameController: 0
|
||||||
tvOSTargetOSVersionString: 12.0
|
tvOSTargetOSVersionString: 10.0
|
||||||
VisionOSSdkVersion: 0
|
|
||||||
VisionOSTargetOSVersionString: 1.0
|
|
||||||
uIPrerenderedIcon: 0
|
uIPrerenderedIcon: 0
|
||||||
uIRequiresPersistentWiFi: 0
|
uIRequiresPersistentWiFi: 0
|
||||||
uIRequiresFullScreen: 1
|
uIRequiresFullScreen: 1
|
||||||
@@ -216,11 +228,10 @@ PlayerSettings:
|
|||||||
iOSLaunchScreeniPadFillPct: 100
|
iOSLaunchScreeniPadFillPct: 100
|
||||||
iOSLaunchScreeniPadSize: 100
|
iOSLaunchScreeniPadSize: 100
|
||||||
iOSLaunchScreeniPadCustomXibPath:
|
iOSLaunchScreeniPadCustomXibPath:
|
||||||
|
iOSUseLaunchScreenStoryboard: 0
|
||||||
iOSLaunchScreenCustomStoryboardPath:
|
iOSLaunchScreenCustomStoryboardPath:
|
||||||
iOSLaunchScreeniPadCustomStoryboardPath:
|
|
||||||
iOSDeviceRequirements: []
|
iOSDeviceRequirements: []
|
||||||
iOSURLSchemes: []
|
iOSURLSchemes: []
|
||||||
macOSURLSchemes: []
|
|
||||||
iOSBackgroundModes: 0
|
iOSBackgroundModes: 0
|
||||||
iOSMetalForceHardShadows: 0
|
iOSMetalForceHardShadows: 0
|
||||||
metalEditorSupport: 1
|
metalEditorSupport: 1
|
||||||
@@ -230,33 +241,21 @@ PlayerSettings:
|
|||||||
appleDeveloperTeamID:
|
appleDeveloperTeamID:
|
||||||
iOSManualSigningProvisioningProfileID:
|
iOSManualSigningProvisioningProfileID:
|
||||||
tvOSManualSigningProvisioningProfileID:
|
tvOSManualSigningProvisioningProfileID:
|
||||||
VisionOSManualSigningProvisioningProfileID:
|
|
||||||
iOSManualSigningProvisioningProfileType: 0
|
iOSManualSigningProvisioningProfileType: 0
|
||||||
tvOSManualSigningProvisioningProfileType: 0
|
tvOSManualSigningProvisioningProfileType: 0
|
||||||
VisionOSManualSigningProvisioningProfileType: 0
|
|
||||||
appleEnableAutomaticSigning: 0
|
appleEnableAutomaticSigning: 0
|
||||||
iOSRequireARKit: 0
|
iOSRequireARKit: 0
|
||||||
iOSAutomaticallyDetectAndAddCapabilities: 1
|
iOSAutomaticallyDetectAndAddCapabilities: 1
|
||||||
appleEnableProMotion: 0
|
appleEnableProMotion: 0
|
||||||
shaderPrecisionModel: 0
|
|
||||||
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
|
clonedFromGUID: c0afd0d1d80e3634a9dac47e8a0426ea
|
||||||
templatePackageId: com.vrchat.template.base@1.0.0
|
templatePackageId: com.vrchat.template.base@1.0.0
|
||||||
templateDefaultScene: Assets/VRCWelcome.unity
|
templateDefaultScene: Assets/VRCWelcome.unity
|
||||||
useCustomMainManifest: 0
|
|
||||||
useCustomLauncherManifest: 0
|
|
||||||
useCustomMainGradleTemplate: 0
|
|
||||||
useCustomLauncherGradleManifest: 0
|
|
||||||
useCustomBaseGradleTemplate: 0
|
|
||||||
useCustomGradlePropertiesTemplate: 0
|
|
||||||
useCustomGradleSettingsTemplate: 0
|
|
||||||
useCustomProguardFile: 0
|
|
||||||
AndroidTargetArchitectures: 1
|
AndroidTargetArchitectures: 1
|
||||||
AndroidTargetDevices: 0
|
AndroidTargetDevices: 0
|
||||||
AndroidSplashScreenScale: 0
|
AndroidSplashScreenScale: 0
|
||||||
androidSplashScreen: {fileID: 0}
|
androidSplashScreen: {fileID: 0}
|
||||||
AndroidKeystoreName:
|
AndroidKeystoreName:
|
||||||
AndroidKeyaliasName:
|
AndroidKeyaliasName:
|
||||||
AndroidEnableArmv9SecurityFeatures: 0
|
|
||||||
AndroidBuildApkPerCpuArchitecture: 0
|
AndroidBuildApkPerCpuArchitecture: 0
|
||||||
AndroidTVCompatibility: 0
|
AndroidTVCompatibility: 0
|
||||||
AndroidIsGame: 1
|
AndroidIsGame: 1
|
||||||
@@ -270,8 +269,6 @@ PlayerSettings:
|
|||||||
banner: {fileID: 0}
|
banner: {fileID: 0}
|
||||||
androidGamepadSupportLevel: 0
|
androidGamepadSupportLevel: 0
|
||||||
chromeosInputEmulation: 1
|
chromeosInputEmulation: 1
|
||||||
AndroidMinifyRelease: 0
|
|
||||||
AndroidMinifyDebug: 0
|
|
||||||
AndroidValidateAppBundleSize: 1
|
AndroidValidateAppBundleSize: 1
|
||||||
AndroidAppBundleSizeToValidate: 150
|
AndroidAppBundleSizeToValidate: 150
|
||||||
m_BuildTargetIcons: []
|
m_BuildTargetIcons: []
|
||||||
@@ -292,7 +289,6 @@ PlayerSettings:
|
|||||||
- m_BuildTarget: WebGL
|
- m_BuildTarget: WebGL
|
||||||
m_StaticBatching: 0
|
m_StaticBatching: 0
|
||||||
m_DynamicBatching: 0
|
m_DynamicBatching: 0
|
||||||
m_BuildTargetShaderSettings: []
|
|
||||||
m_BuildTargetGraphicsJobs:
|
m_BuildTargetGraphicsJobs:
|
||||||
- m_BuildTarget: MacStandaloneSupport
|
- m_BuildTarget: MacStandaloneSupport
|
||||||
m_GraphicsJobs: 0
|
m_GraphicsJobs: 0
|
||||||
@@ -334,7 +330,7 @@ PlayerSettings:
|
|||||||
m_Automatic: 1
|
m_Automatic: 1
|
||||||
- m_BuildTarget: AppleTVSupport
|
- m_BuildTarget: AppleTVSupport
|
||||||
m_APIs: 10000000
|
m_APIs: 10000000
|
||||||
m_Automatic: 1
|
m_Automatic: 0
|
||||||
- m_BuildTarget: WebGLSupport
|
- m_BuildTarget: WebGLSupport
|
||||||
m_APIs: 0b000000
|
m_APIs: 0b000000
|
||||||
m_Automatic: 1
|
m_Automatic: 1
|
||||||
@@ -348,8 +344,6 @@ PlayerSettings:
|
|||||||
- None
|
- None
|
||||||
- OpenVR
|
- OpenVR
|
||||||
- Oculus
|
- Oculus
|
||||||
m_DefaultShaderChunkSizeInMB: 16
|
|
||||||
m_DefaultShaderChunkCount: 0
|
|
||||||
openGLRequireES31: 0
|
openGLRequireES31: 0
|
||||||
openGLRequireES31AEP: 0
|
openGLRequireES31AEP: 0
|
||||||
openGLRequireES32: 0
|
openGLRequireES32: 0
|
||||||
@@ -359,11 +353,7 @@ PlayerSettings:
|
|||||||
iPhone: 1
|
iPhone: 1
|
||||||
tvOS: 1
|
tvOS: 1
|
||||||
m_BuildTargetGroupLightmapEncodingQuality: []
|
m_BuildTargetGroupLightmapEncodingQuality: []
|
||||||
m_BuildTargetGroupHDRCubemapEncodingQuality: []
|
|
||||||
m_BuildTargetGroupLightmapSettings: []
|
m_BuildTargetGroupLightmapSettings: []
|
||||||
m_BuildTargetGroupLoadStoreDebugModeSettings: []
|
|
||||||
m_BuildTargetNormalMapEncoding: []
|
|
||||||
m_BuildTargetDefaultTextureCompressionFormat: []
|
|
||||||
playModeTestRunnerEnabled: 0
|
playModeTestRunnerEnabled: 0
|
||||||
runPlayModeTestAsEditModeTest: 0
|
runPlayModeTestAsEditModeTest: 0
|
||||||
actionOnDotNetUnhandledException: 1
|
actionOnDotNetUnhandledException: 1
|
||||||
@@ -373,20 +363,14 @@ PlayerSettings:
|
|||||||
cameraUsageDescription:
|
cameraUsageDescription:
|
||||||
locationUsageDescription:
|
locationUsageDescription:
|
||||||
microphoneUsageDescription:
|
microphoneUsageDescription:
|
||||||
bluetoothUsageDescription:
|
|
||||||
macOSTargetOSVersion: 10.13.0
|
|
||||||
switchNMETAOverride:
|
|
||||||
switchNetLibKey:
|
switchNetLibKey:
|
||||||
switchSocketMemoryPoolSize: 6144
|
switchSocketMemoryPoolSize: 6144
|
||||||
switchSocketAllocatorPoolSize: 128
|
switchSocketAllocatorPoolSize: 128
|
||||||
switchSocketConcurrencyLimit: 14
|
switchSocketConcurrencyLimit: 14
|
||||||
switchScreenResolutionBehavior: 2
|
switchScreenResolutionBehavior: 2
|
||||||
switchUseCPUProfiler: 0
|
switchUseCPUProfiler: 0
|
||||||
switchUseGOLDLinker: 0
|
|
||||||
switchLTOSetting: 0
|
|
||||||
switchApplicationID: 0x01004b9000490000
|
switchApplicationID: 0x01004b9000490000
|
||||||
switchNSODependencies:
|
switchNSODependencies:
|
||||||
switchCompilerFlags:
|
|
||||||
switchTitleNames_0:
|
switchTitleNames_0:
|
||||||
switchTitleNames_1:
|
switchTitleNames_1:
|
||||||
switchTitleNames_2:
|
switchTitleNames_2:
|
||||||
@@ -460,6 +444,7 @@ PlayerSettings:
|
|||||||
switchReleaseVersion: 0
|
switchReleaseVersion: 0
|
||||||
switchDisplayVersion: 1.0.0
|
switchDisplayVersion: 1.0.0
|
||||||
switchStartupUserAccount: 0
|
switchStartupUserAccount: 0
|
||||||
|
switchTouchScreenUsage: 0
|
||||||
switchSupportedLanguagesMask: 0
|
switchSupportedLanguagesMask: 0
|
||||||
switchLogoType: 0
|
switchLogoType: 0
|
||||||
switchApplicationErrorCodeCategory:
|
switchApplicationErrorCodeCategory:
|
||||||
@@ -501,7 +486,6 @@ PlayerSettings:
|
|||||||
switchNativeFsCacheSize: 32
|
switchNativeFsCacheSize: 32
|
||||||
switchIsHoldTypeHorizontal: 0
|
switchIsHoldTypeHorizontal: 0
|
||||||
switchSupportedNpadCount: 8
|
switchSupportedNpadCount: 8
|
||||||
switchEnableTouchScreen: 1
|
|
||||||
switchSocketConfigEnabled: 0
|
switchSocketConfigEnabled: 0
|
||||||
switchTcpInitialSendBufferSize: 32
|
switchTcpInitialSendBufferSize: 32
|
||||||
switchTcpInitialReceiveBufferSize: 64
|
switchTcpInitialReceiveBufferSize: 64
|
||||||
@@ -513,12 +497,8 @@ PlayerSettings:
|
|||||||
switchSocketInitializeEnabled: 1
|
switchSocketInitializeEnabled: 1
|
||||||
switchNetworkInterfaceManagerInitializeEnabled: 1
|
switchNetworkInterfaceManagerInitializeEnabled: 1
|
||||||
switchPlayerConnectionEnabled: 1
|
switchPlayerConnectionEnabled: 1
|
||||||
switchUseNewStyleFilepaths: 1
|
|
||||||
switchUseLegacyFmodPriorities: 0
|
|
||||||
switchUseMicroSleepForYield: 1
|
switchUseMicroSleepForYield: 1
|
||||||
switchEnableRamDiskSupport: 0
|
|
||||||
switchMicroSleepForYieldTime: 25
|
switchMicroSleepForYieldTime: 25
|
||||||
switchRamDiskSpaceSize: 12
|
|
||||||
ps4NPAgeRating: 12
|
ps4NPAgeRating: 12
|
||||||
ps4NPTitleSecret:
|
ps4NPTitleSecret:
|
||||||
ps4NPTrophyPackPath:
|
ps4NPTrophyPackPath:
|
||||||
@@ -594,6 +574,31 @@ PlayerSettings:
|
|||||||
ps4attribEyeToEyeDistanceSettingVR: 0
|
ps4attribEyeToEyeDistanceSettingVR: 0
|
||||||
ps4IncludedModules: []
|
ps4IncludedModules: []
|
||||||
ps4attribVROutputEnabled: 0
|
ps4attribVROutputEnabled: 0
|
||||||
|
ps5ParamFilePath:
|
||||||
|
ps5VideoOutPixelFormat: 0
|
||||||
|
ps5VideoOutInitialWidth: 1920
|
||||||
|
ps5VideoOutOutputMode: 1
|
||||||
|
ps5BackgroundImagePath:
|
||||||
|
ps5StartupImagePath:
|
||||||
|
ps5Pic2Path:
|
||||||
|
ps5StartupImagesFolder:
|
||||||
|
ps5IconImagesFolder:
|
||||||
|
ps5SaveDataImagePath:
|
||||||
|
ps5SdkOverride:
|
||||||
|
ps5BGMPath:
|
||||||
|
ps5ShareOverlayImagePath:
|
||||||
|
ps5NPConfigZipPath:
|
||||||
|
ps5Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
|
||||||
|
ps5UseResolutionFallback: 0
|
||||||
|
ps5UseAudio3dBackend: 0
|
||||||
|
ps5ScriptOptimizationLevel: 2
|
||||||
|
ps5Audio3dVirtualSpeakerCount: 14
|
||||||
|
ps5UpdateReferencePackage:
|
||||||
|
ps5disableAutoHideSplash: 0
|
||||||
|
ps5OperatingSystemCanDisableSplashScreen: 0
|
||||||
|
ps5IncludedModules: []
|
||||||
|
ps5SharedBinaryContentLabels: []
|
||||||
|
ps5SharedBinarySystemFolders: []
|
||||||
monoEnv:
|
monoEnv:
|
||||||
splashScreenBackgroundSourceLandscape: {fileID: 0}
|
splashScreenBackgroundSourceLandscape: {fileID: 0}
|
||||||
splashScreenBackgroundSourcePortrait: {fileID: 0}
|
splashScreenBackgroundSourcePortrait: {fileID: 0}
|
||||||
@@ -602,7 +607,6 @@ PlayerSettings:
|
|||||||
webGLMemorySize: 16
|
webGLMemorySize: 16
|
||||||
webGLExceptionSupport: 1
|
webGLExceptionSupport: 1
|
||||||
webGLNameFilesAsHashes: 0
|
webGLNameFilesAsHashes: 0
|
||||||
webGLShowDiagnostics: 0
|
|
||||||
webGLDataCaching: 1
|
webGLDataCaching: 1
|
||||||
webGLDebugSymbols: 0
|
webGLDebugSymbols: 0
|
||||||
webGLEmscriptenArgs:
|
webGLEmscriptenArgs:
|
||||||
@@ -611,45 +615,21 @@ PlayerSettings:
|
|||||||
webGLAnalyzeBuildSize: 0
|
webGLAnalyzeBuildSize: 0
|
||||||
webGLUseEmbeddedResources: 0
|
webGLUseEmbeddedResources: 0
|
||||||
webGLCompressionFormat: 1
|
webGLCompressionFormat: 1
|
||||||
webGLWasmArithmeticExceptions: 0
|
|
||||||
webGLLinkerTarget: 1
|
webGLLinkerTarget: 1
|
||||||
webGLThreadsSupport: 0
|
webGLThreadsSupport: 0
|
||||||
webGLDecompressionFallback: 0
|
webGLWasmStreaming: 0
|
||||||
webGLInitialMemorySize: 32
|
|
||||||
webGLMaximumMemorySize: 2048
|
|
||||||
webGLMemoryGrowthMode: 2
|
|
||||||
webGLMemoryLinearGrowthStep: 16
|
|
||||||
webGLMemoryGeometricGrowthStep: 0.2
|
|
||||||
webGLMemoryGeometricGrowthCap: 96
|
|
||||||
webGLPowerPreference: 2
|
|
||||||
scriptingDefineSymbols: {}
|
scriptingDefineSymbols: {}
|
||||||
additionalCompilerArguments: {}
|
|
||||||
platformArchitecture: {}
|
platformArchitecture: {}
|
||||||
scriptingBackend: {}
|
scriptingBackend: {}
|
||||||
il2cppCompilerConfiguration: {}
|
il2cppCompilerConfiguration: {}
|
||||||
il2cppCodeGeneration: {}
|
managedStrippingLevel: {}
|
||||||
managedStrippingLevel:
|
|
||||||
EmbeddedLinux: 1
|
|
||||||
GameCoreScarlett: 1
|
|
||||||
GameCoreXboxOne: 1
|
|
||||||
Nintendo Switch: 1
|
|
||||||
PS4: 1
|
|
||||||
PS5: 1
|
|
||||||
QNX: 1
|
|
||||||
Stadia: 1
|
|
||||||
VisionOS: 1
|
|
||||||
WebGL: 1
|
|
||||||
Windows Store Apps: 1
|
|
||||||
XboxOne: 1
|
|
||||||
iPhone: 1
|
|
||||||
tvOS: 1
|
|
||||||
incrementalIl2cppBuild: {}
|
incrementalIl2cppBuild: {}
|
||||||
suppressCommonWarnings: 1
|
suppressCommonWarnings: 1
|
||||||
allowUnsafeCode: 0
|
allowUnsafeCode: 0
|
||||||
useDeterministicCompilation: 1
|
|
||||||
additionalIl2CppArgs:
|
additionalIl2CppArgs:
|
||||||
scriptingRuntimeVersion: 1
|
scriptingRuntimeVersion: 1
|
||||||
gcIncremental: 1
|
gcIncremental: 1
|
||||||
|
assemblyVersionValidation: 1
|
||||||
gcWBarrierValidation: 0
|
gcWBarrierValidation: 0
|
||||||
apiCompatibilityLevelPerPlatform:
|
apiCompatibilityLevelPerPlatform:
|
||||||
Standalone: 3
|
Standalone: 3
|
||||||
@@ -682,7 +662,6 @@ PlayerSettings:
|
|||||||
metroFTAName:
|
metroFTAName:
|
||||||
metroFTAFileTypes: []
|
metroFTAFileTypes: []
|
||||||
metroProtocolName:
|
metroProtocolName:
|
||||||
vcxProjDefaultLanguage:
|
|
||||||
XboxOneProductId:
|
XboxOneProductId:
|
||||||
XboxOneUpdateKey:
|
XboxOneUpdateKey:
|
||||||
XboxOneSandboxId:
|
XboxOneSandboxId:
|
||||||
@@ -710,7 +689,10 @@ PlayerSettings:
|
|||||||
XboxOneXTitleMemory: 8
|
XboxOneXTitleMemory: 8
|
||||||
XboxOneOverrideIdentityName:
|
XboxOneOverrideIdentityName:
|
||||||
XboxOneOverrideIdentityPublisher:
|
XboxOneOverrideIdentityPublisher:
|
||||||
vrEditorSettings: {}
|
vrEditorSettings:
|
||||||
|
daydream:
|
||||||
|
daydreamIconForeground: {fileID: 0}
|
||||||
|
daydreamIconBackground: {fileID: 0}
|
||||||
cloudServicesEnabled:
|
cloudServicesEnabled:
|
||||||
UNet: 1
|
UNet: 1
|
||||||
luminIcon:
|
luminIcon:
|
||||||
@@ -724,22 +706,12 @@ PlayerSettings:
|
|||||||
luminVersion:
|
luminVersion:
|
||||||
m_VersionCode: 1
|
m_VersionCode: 1
|
||||||
m_VersionName:
|
m_VersionName:
|
||||||
hmiPlayerDataPath:
|
|
||||||
hmiForceSRGBBlit: 1
|
|
||||||
embeddedLinuxEnableGamepadInput: 1
|
|
||||||
hmiLogStartupTiming: 0
|
|
||||||
hmiCpuConfiguration:
|
|
||||||
apiCompatibilityLevel: 6
|
apiCompatibilityLevel: 6
|
||||||
activeInputHandler: 2
|
|
||||||
windowsGamepadBackendHint: 0
|
|
||||||
cloudProjectId:
|
cloudProjectId:
|
||||||
framebufferDepthMemorylessMode: 0
|
framebufferDepthMemorylessMode: 0
|
||||||
qualitySettingsNames: []
|
|
||||||
projectName:
|
projectName:
|
||||||
organizationId:
|
organizationId:
|
||||||
cloudEnabled: 0
|
cloudEnabled: 0
|
||||||
|
enableNativePlatformBackendsForNewInputSystem: 1
|
||||||
|
disableOldInputManagerSupport: 0
|
||||||
legacyClampBlendShapeWeights: 0
|
legacyClampBlendShapeWeights: 0
|
||||||
hmiLoadingImage: {fileID: 0}
|
|
||||||
platformRequiresReadableAssets: 0
|
|
||||||
virtualTexturingSupportEnabled: 0
|
|
||||||
insecureHttpOption: 0
|
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
m_EditorVersion: 2022.3.22f1
|
m_EditorVersion: 2019.4.31f1
|
||||||
|
|||||||
@@ -4,13 +4,13 @@
|
|||||||
QualitySettings:
|
QualitySettings:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
serializedVersion: 5
|
serializedVersion: 5
|
||||||
m_CurrentQuality: 2
|
m_CurrentQuality: 3
|
||||||
m_QualitySettings:
|
m_QualitySettings:
|
||||||
- serializedVersion: 2
|
- serializedVersion: 2
|
||||||
name: VRC Low
|
name: VRC Low
|
||||||
pixelLightCount: 4
|
pixelLightCount: 4
|
||||||
shadows: 2
|
shadows: 2
|
||||||
shadowResolution: 1
|
shadowResolution: 2
|
||||||
shadowProjection: 1
|
shadowProjection: 1
|
||||||
shadowCascades: 2
|
shadowCascades: 2
|
||||||
shadowDistance: 75
|
shadowDistance: 75
|
||||||
@@ -58,7 +58,7 @@ QualitySettings:
|
|||||||
skinWeights: 4
|
skinWeights: 4
|
||||||
textureQuality: 0
|
textureQuality: 0
|
||||||
anisotropicTextures: 2
|
anisotropicTextures: 2
|
||||||
antiAliasing: 2
|
antiAliasing: 4
|
||||||
softParticles: 1
|
softParticles: 1
|
||||||
softVegetation: 1
|
softVegetation: 1
|
||||||
realtimeReflectionProbes: 1
|
realtimeReflectionProbes: 1
|
||||||
@@ -86,6 +86,43 @@ QualitySettings:
|
|||||||
shadows: 2
|
shadows: 2
|
||||||
shadowResolution: 3
|
shadowResolution: 3
|
||||||
shadowProjection: 1
|
shadowProjection: 1
|
||||||
|
shadowCascades: 2
|
||||||
|
shadowDistance: 75
|
||||||
|
shadowNearPlaneOffset: 2
|
||||||
|
shadowCascade2Split: 0.33333334
|
||||||
|
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
|
||||||
|
shadowmaskMode: 0
|
||||||
|
skinWeights: 4
|
||||||
|
textureQuality: 0
|
||||||
|
anisotropicTextures: 2
|
||||||
|
antiAliasing: 4
|
||||||
|
softParticles: 1
|
||||||
|
softVegetation: 1
|
||||||
|
realtimeReflectionProbes: 1
|
||||||
|
billboardsFaceCameraPosition: 1
|
||||||
|
vSyncCount: 0
|
||||||
|
lodBias: 2
|
||||||
|
maximumLODLevel: 0
|
||||||
|
streamingMipmapsActive: 0
|
||||||
|
streamingMipmapsAddAllCameras: 1
|
||||||
|
streamingMipmapsMemoryBudget: 512
|
||||||
|
streamingMipmapsRenderersPerFrame: 512
|
||||||
|
streamingMipmapsMaxLevelReduction: 2
|
||||||
|
streamingMipmapsMaxFileIORequests: 1024
|
||||||
|
particleRaycastBudget: 4096
|
||||||
|
asyncUploadTimeSlice: 2
|
||||||
|
asyncUploadBufferSize: 128
|
||||||
|
asyncUploadPersistentBuffer: 1
|
||||||
|
resolutionScalingFixedDPIFactor: 1
|
||||||
|
customRenderPipeline: {fileID: 0}
|
||||||
|
excludedTargetPlatforms:
|
||||||
|
- Android
|
||||||
|
- serializedVersion: 2
|
||||||
|
name: VRC Ultra
|
||||||
|
pixelLightCount: 8
|
||||||
|
shadows: 2
|
||||||
|
shadowResolution: 3
|
||||||
|
shadowProjection: 1
|
||||||
shadowCascades: 4
|
shadowCascades: 4
|
||||||
shadowDistance: 150
|
shadowDistance: 150
|
||||||
shadowNearPlaneOffset: 2
|
shadowNearPlaneOffset: 2
|
||||||
|
|||||||
@@ -8,11 +8,11 @@ TagManager:
|
|||||||
- Default
|
- Default
|
||||||
- TransparentFX
|
- TransparentFX
|
||||||
- Ignore Raycast
|
- Ignore Raycast
|
||||||
- Item
|
-
|
||||||
- Water
|
- Water
|
||||||
- UI
|
- UI
|
||||||
- reserved6
|
-
|
||||||
- reserved7
|
-
|
||||||
- Interactive
|
- Interactive
|
||||||
- Player
|
- Player
|
||||||
- PlayerLocal
|
- PlayerLocal
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
%YAML 1.1
|
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
|
||||||
--- !u!890905787 &1
|
|
||||||
VersionControlSettings:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_Mode: Visible Meta Files
|
|
||||||
m_CollabEditorSettings:
|
|
||||||
inProgressEnabled: 1
|
|
||||||
25
README.md
25
README.md
@@ -41,34 +41,15 @@ The repository have separate branches for separate content types, the only diffe
|
|||||||
1. Check that you have git-lfs installed `git lfs status`
|
1. Check that you have git-lfs installed `git lfs status`
|
||||||
2. Pull existing repo `git pull https://gitlab.com/ProcyonLotor/vrchat-template.git` and optionally pull all LFS objects `git lfs fetch --all`
|
2. Pull existing repo `git pull https://gitlab.com/ProcyonLotor/vrchat-template.git` and optionally pull all LFS objects `git lfs fetch --all`
|
||||||
(repo will take much more disk space, but will have complete project history)
|
(repo will take much more disk space, but will have complete project history)
|
||||||
3. (Optional) Some VPM packages may come from Community Repositories,
|
3. (Optional) Some VPM packages might come from Community Repositories,
|
||||||
add them from project's [vpm-repositories.txt](./vpm-repositories.txt) file to CreatorCompanion,
|
add them from project's [vpm-repositories.txt](./vpm-repositories.txt) file to CreatorCompanion,
|
||||||
or run this command in project's folder on Windows
|
or run this command in project's folder `FOR /F %L IN (.\vpm-repositories.txt) DO vpm add repo %L`
|
||||||
|
(command requires `vpm` tool installed, see [vpm cli](https://vcc.docs.vrchat.com/vpm/cli/))
|
||||||
```cmd
|
|
||||||
FOR /F %l IN (.\vpm-repositories.txt) DO vpm add repo %l
|
|
||||||
```
|
|
||||||
|
|
||||||
and Linux
|
|
||||||
|
|
||||||
```bash
|
|
||||||
for l in $(cat ./vpm-repositories.txt); do vpm add repo "$l"; done
|
|
||||||
```
|
|
||||||
|
|
||||||
> The command requires `vpm` tool installed, see [vpm cli](https://vcc.docs.vrchat.com/vpm/cli/)
|
|
||||||
|
|
||||||
> **IMPORTANT**: When opening a previously worked on project on a new machine, Unity may warn you about script errors and suggest you enter Safe Mode,
|
> **IMPORTANT**: When opening a previously worked on project on a new machine, Unity may warn you about script errors and suggest you enter Safe Mode,
|
||||||
> this is because VPM has not loaded yet and didn't resolved the required packages, ignore the errors and continue loading.
|
> this is because VPM has not loaded yet and didn't resolved the required packages, ignore the errors and continue loading.
|
||||||
> Sometimes you may need to reopen the project couple times for all packages to resolve and scripts to recompile.
|
> Sometimes you may need to reopen the project couple times for all packages to resolve and scripts to recompile.
|
||||||
|
|
||||||
## Convenience scripts
|
|
||||||
|
|
||||||
The template also have some convenience shell scripts for both Windows and Linux:
|
|
||||||
|
|
||||||
- `./repo-cleanup.*` - Cleans up all untracked trash in the working tree (i.e. `Library/`, `Build/`, etc.)
|
|
||||||
- `./repo-discard.*` - Reverts all changed files back to the state of the last commit
|
|
||||||
- `./repo-reset.*` - Completely resets the state of the local repo to the state of the remote repository (dangerous, use with caution!)
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
For project's license see [LICENSE](./LICENSE) file.
|
For project's license see [LICENSE](./LICENSE) file.
|
||||||
|
|||||||
@@ -2,17 +2,13 @@
|
|||||||
TITLE Clean up Unity Project repo
|
TITLE Clean up Unity Project repo
|
||||||
SETLOCAL EnableDelayedExpansion
|
SETLOCAL EnableDelayedExpansion
|
||||||
|
|
||||||
CD "%~dp0"
|
CALL :cleanup --dry-run || GOTO die
|
||||||
git rev-parse --is-inside-work-tree >NUL || GOTO die
|
|
||||||
|
|
||||||
git clean -dfX --dry-run "%~dp0." || GOTO die
|
|
||||||
|
|
||||||
ECHO.
|
|
||||||
CHOICE /M "Execute"
|
CHOICE /M "Execute"
|
||||||
IF !ERRORLEVEL! NEQ 1 (
|
IF !ERRORLEVEL! NEQ 1 (
|
||||||
ECHO Aborting cleanup...
|
ECHO Aborting cleanup...
|
||||||
) ELSE (
|
) ELSE (
|
||||||
git clean -dfX "%~dp0." || GOTO die
|
CALL :cleanup || GOTO die
|
||||||
ECHO Done.
|
ECHO Done.
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -23,3 +19,8 @@ EXIT /B 0
|
|||||||
:die
|
:die
|
||||||
PAUSE
|
PAUSE
|
||||||
EXIT /B %ERRORLEVEL%
|
EXIT /B %ERRORLEVEL%
|
||||||
|
|
||||||
|
|
||||||
|
:cleanup
|
||||||
|
git clean -dfX %* "%~dp0." || EXIT /B
|
||||||
|
EXIT /B 0
|
||||||
|
|||||||
@@ -1,13 +1,24 @@
|
|||||||
#!/bin/sh -e
|
#!/bin/sh
|
||||||
|
|
||||||
repository="$(dirname "$(readlink -f "$0")")/."
|
me="$(realpath "$0")"
|
||||||
|
repository="$(dirname "$me")/."
|
||||||
|
|
||||||
cd "${repository}"
|
# I have no mouth but i must scream
|
||||||
git rev-parse --is-inside-work-tree >/dev/null
|
if [ ! -t 0 ]; then
|
||||||
|
if command -v x-terminal-emulator >/dev/null 2>&1; then
|
||||||
|
x-terminal-emulator -e "$me"
|
||||||
|
elif command -v xdg-terminal >/dev/null 2>&1; then
|
||||||
|
xdg-terminal "$me"
|
||||||
|
else
|
||||||
|
echo "Run me from the fucking terminal!" >"${me}.README"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
git clean -dfX --dry-run "${repository}"
|
git clean -dfX --dry-run "${repository}"
|
||||||
|
|
||||||
printf "\nExecute [Y,N]?"; read -r yn
|
printf "Execute [Y,N]?"; read -r yn
|
||||||
if [ "$yn" = "${yn#[Yy]}" ] ;then
|
if [ "$yn" = "${yn#[Yy]}" ] ;then
|
||||||
echo "Aborting cleanup..."
|
echo "Aborting cleanup..."
|
||||||
else
|
else
|
||||||
@@ -15,4 +26,5 @@ else
|
|||||||
echo "Done."
|
echo "Done."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
printf "Press any key to continue..."; read -r _
|
||||||
exit 0
|
exit 0
|
||||||
|
|||||||
@@ -1,26 +0,0 @@
|
|||||||
@ECHO OFF
|
|
||||||
TITLE Restore Unity Project repo
|
|
||||||
SETLOCAL
|
|
||||||
|
|
||||||
CD "%~dp0"
|
|
||||||
git rev-parse --is-inside-work-tree >NUL || GOTO die
|
|
||||||
|
|
||||||
ECHO The following files were changed and will be reverted:
|
|
||||||
git diff --name-only HEAD
|
|
||||||
|
|
||||||
ECHO.
|
|
||||||
CHOICE /M "Execute"
|
|
||||||
IF %ERRORLEVEL% NEQ 1 (
|
|
||||||
ECHO Aborting restore...
|
|
||||||
) ELSE (
|
|
||||||
git restore "%~dp0." || GOTO die
|
|
||||||
ECHO Done.
|
|
||||||
)
|
|
||||||
|
|
||||||
:end
|
|
||||||
PAUSE
|
|
||||||
EXIT /B 0
|
|
||||||
|
|
||||||
:die
|
|
||||||
PAUSE
|
|
||||||
EXIT /B %ERRORLEVEL%
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
#!/bin/sh -e
|
|
||||||
|
|
||||||
repository="$(dirname "$(readlink -f "$0")")/."
|
|
||||||
|
|
||||||
cd "${repository}"
|
|
||||||
git rev-parse --is-inside-work-tree >/dev/null
|
|
||||||
|
|
||||||
echo "The following files were changed and will be reverted:"
|
|
||||||
git diff --name-only HEAD
|
|
||||||
|
|
||||||
printf "\nExecute [Y,N]?"; read -r yn
|
|
||||||
if [ "$yn" = "${yn#[Yy]}" ]; then
|
|
||||||
echo "Aborting restore..."
|
|
||||||
else
|
|
||||||
git restore "${repository}"
|
|
||||||
echo "Done."
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
@ECHO OFF
|
|
||||||
TITLE Reset Unity Project repo
|
|
||||||
SETLOCAL
|
|
||||||
|
|
||||||
CD "%~dp0"
|
|
||||||
git rev-parse --is-inside-work-tree >NUL || GOTO die
|
|
||||||
|
|
||||||
FOR /F "delims=" %%x IN ('git rev-parse --abbrev-ref "@{u}" 2^>NUL') DO SET "upstream=%%x"
|
|
||||||
IF NOT DEFINED upstream (
|
|
||||||
ECHO *** ERROR: No upstream is configured for current branch
|
|
||||||
GOTO die
|
|
||||||
)
|
|
||||||
|
|
||||||
ECHO Going to reset current branch to: %upstream%
|
|
||||||
ECHO *** WARNING: All local changes and commits will be lost!
|
|
||||||
|
|
||||||
ECHO.
|
|
||||||
CHOICE /M "Execute"
|
|
||||||
IF %ERRORLEVEL% NEQ 1 (
|
|
||||||
ECHO Aborting reset...
|
|
||||||
) ELSE (
|
|
||||||
git fetch --all || GOTO die
|
|
||||||
git reset --hard "%upstream%" || GOTO die
|
|
||||||
ECHO Done.
|
|
||||||
)
|
|
||||||
|
|
||||||
:end
|
|
||||||
PAUSE
|
|
||||||
EXIT /B 0
|
|
||||||
|
|
||||||
:die
|
|
||||||
PAUSE
|
|
||||||
EXIT /B %ERRORLEVEL%
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
#!/bin/sh -e
|
|
||||||
|
|
||||||
cd "$(dirname "$(readlink -f "$0")")"
|
|
||||||
git rev-parse --is-inside-work-tree >/dev/null
|
|
||||||
|
|
||||||
upstream="$(git rev-parse --abbrev-ref "@{u}" 2>/dev/null || true)"
|
|
||||||
if [ -z "$upstream" ]; then
|
|
||||||
echo "*** ERROR: No upstream is configured for current branch"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "Going to reset current branch to: ${upstream}"
|
|
||||||
echo "*** WARNING: All local changes and commits will be lost!"
|
|
||||||
|
|
||||||
printf "\nExecute [Y,N]?"; read -r yn
|
|
||||||
if [ "$yn" = "${yn#[Yy]}" ]; then
|
|
||||||
echo "Aborting reset..."
|
|
||||||
else
|
|
||||||
git fetch --all
|
|
||||||
git reset --hard "$upstream"
|
|
||||||
echo "Done."
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
Reference in New Issue
Block a user