From ba26645e85586a6e7666264fd1575f16d8c18473 Mon Sep 17 00:00:00 2001 From: kurone-kito Date: Sat, 14 Sep 2024 11:14:47 +0900 Subject: [PATCH 1/6] feat: added the git configuration --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitconfig diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..22dd4d6 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,2 @@ +[core] + hideDotFiles = dotGitOnly From 2c30b6fdbef2ddea6b154fd697ab5af60c534e91 Mon Sep 17 00:00:00 2001 From: kurone-kito Date: Sat, 14 Sep 2024 14:05:35 +0900 Subject: [PATCH 2/6] ci: fixed the bug that the determination whether pre-release was wrong --- .github/workflows/release.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f6dd477..ae6f01d 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -57,6 +57,7 @@ jobs: text: ${{ steps.version.outputs.value }} - name: Configure the Environment Variables needed for releasing the Package run: | + echo "stableVersion=${{ steps.stable-match.outputs.match }}" >> $GITHUB_ENV echo "unityPackage=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}.unitypackage" >> $GITHUB_ENV echo "version=${{ steps.version.outputs.value }}" >> $GITHUB_ENV echo "zipFile=${{ vars.PACKAGE_NAME }}-${{ steps.version.outputs.value }}".zip >> $GITHUB_ENV From 5d7b20e4b29ec92fd069a04f4f41f066135506ec Mon Sep 17 00:00:00 2001 From: kurone-kito Date: Sat, 14 Sep 2024 15:52:46 +0900 Subject: [PATCH 3/6] feat: improved the vscode configuration --- .vscode/extensions.json | 4 ++- .vscode/settings.json | 79 +++++++++++++++++++++++++++++++++++++++-- cspell.config.yml | 1 + 3 files changed, 80 insertions(+), 4 deletions(-) diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 54b464b..d323e39 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,8 +1,10 @@ { "recommendations": [ "editorconfig.editorconfig", + "fernandoescolar.vscode-solution-explorer", "redhat.vscode-yaml", "streetsidesoftware.code-spell-checker", - "visualstudiotoolsforunity.vstuc" + "visualstudiotoolsforunity.vstuc", + "zbecknell.t4-support" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index a4b0834..dc53117 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,14 +1,51 @@ { - "dotnet.preferCSharpExtension": true, + "explorer.fileNesting.enabled": true, + "explorer.fileNesting.expand": false, + "explorer.fileNesting.patterns": { + "*": "${capture}.meta, ${capture}.md5", + "*.dll": "${capture}.pdb", + "*.md": "${capture}.*.md", + "*.sln": "*.csproj", + ".gitconfig": ".gitattributes, .gitignore", + ".tool-versions": "global.json", + "LICENSE*": "LICENSE${capture}.meta" + }, "files.associations": { + "*.anim": "yaml", "*.asmdef": "json", + "*.asmref": "json", "*.asset": "yaml", + "*.buildreport": "yaml", + "*.config": "xml", + "*.controller": "yaml", + "*.dwlt": "yaml", + "*.info": "json", + "*.index": "json", + "*.inputactions": "json", + "*.lighting": "yaml", "*.mat": "yaml", "*.meta": "yaml", + "*.outputdata": "json", + "*.physicmaterial": "yaml", + "*.playable": "yaml", "*.prefab": "yaml", + "*.renderTexture": "yaml", + "*.scenetemplate": "yaml", + "*.signal": "yaml", + "*.terrainlayer": "yaml", + "*.tlh": "c", + "*.traceevents": "jsonl", + "*.unity": "yaml", "*.uss": "css", ".imgbotconfig": "json", - "LICENSE": "plaintext" + ".settings": "plist", + ".signature": "json", + "LastSceneManagerSetup.txt": "yaml", + "LibraryFormatVersion.txt": "yaml", + "LICENSE": "plaintext", + "ProjectVersion.txt": "yaml", + "XRPackageSettings.asset": "json", + "XRSettings.asset": "json" }, "files.readonlyInclude": { "Packages/com.*/**": true, @@ -37,25 +74,61 @@ }, "yaml.customTags": [ "tag:unity3d.com,2011:1 mapping", + "tag:unity3d.com,2011:4 mapping", "tag:unity3d.com,2011:5 mapping", "tag:unity3d.com,2011:11 mapping", "tag:unity3d.com,2011:13 mapping", "tag:unity3d.com,2011:19 mapping", + "tag:unity3d.com,2011:20 mapping", + "tag:unity3d.com,2011:21 mapping", + "tag:unity3d.com,2011:23 mapping", + "tag:unity3d.com,2011:28 mapping", + "tag:unity3d.com,2011:29 mapping", "tag:unity3d.com,2011:30 mapping", + "tag:unity3d.com,2011:33 mapping", "tag:unity3d.com,2011:47 mapping", "tag:unity3d.com,2011:55 mapping", + "tag:unity3d.com,2011:64 mapping", + "tag:unity3d.com,2011:74 mapping", "tag:unity3d.com,2011:78 mapping", + "tag:unity3d.com,2011:81 mapping", + "tag:unity3d.com,2011:84 mapping", + "tag:unity3d.com,2011:91 mapping", + "tag:unity3d.com,2011:95 mapping", + "tag:unity3d.com,2011:104 mapping", + "tag:unity3d.com,2011:108 mapping", "tag:unity3d.com,2011:114 mapping", "tag:unity3d.com,2011:126 mapping", "tag:unity3d.com,2011:129 mapping", + "tag:unity3d.com,2011:134 mapping", + "tag:unity3d.com,2011:157 mapping", "tag:unity3d.com,2011:159 mapping", + "tag:unity3d.com,2011:162 mapping", + "tag:unity3d.com,2011:196 mapping", + "tag:unity3d.com,2011:222 mapping", + "tag:unity3d.com,2011:223 mapping", + "tag:unity3d.com,2011:224 mapping", "tag:unity3d.com,2011:236 mapping", "tag:unity3d.com,2011:310 mapping", + "tag:unity3d.com,2011:1001 mapping", + "tag:unity3d.com,2011:1002 mapping", "tag:unity3d.com,2011:1045 mapping", + "tag:unity3d.com,2011:1101 mapping", + "tag:unity3d.com,2011:1102 mapping", + "tag:unity3d.com,2011:1107 mapping", + "tag:unity3d.com,2011:1125 mapping", + "tag:unity3d.com,2011:1126 mapping", + "tag:unity3d.com,2011:382020655 mapping", "tag:unity3d.com,2011:387306366 mapping", + "tag:unity3d.com,2011:641289076 mapping", + "tag:unity3d.com,2011:668709126 mapping", + "tag:unity3d.com,2011:850595691 mapping", "tag:unity3d.com,2011:890905787 mapping", "tag:unity3d.com,2011:937362698 mapping", - "tag:unity3d.com,2011:1386491679 mapping" + "tag:unity3d.com,2011:1386491679 mapping", + "tag:unity3d.com,2011:1521398425 mapping", + "tag:unity3d.com,2011:1660057539 mapping", + "tag:unity3d.com,2011:1953259897 mapping" ], "yaml.schemas": { "https://coderabbit.ai/integrations/coderabbit-overrides.v2.json": [ diff --git a/cspell.config.yml b/cspell.config.yml index d3b71f0..7df23a1 100644 --- a/cspell.config.yml +++ b/cspell.config.yml @@ -28,6 +28,7 @@ language: en,ja useGitignore: true version: "0.2" words: + - dwlt - kito - kuroné - nunit From ef09f5214725598d93b9eddc9dad14c295f09953 Mon Sep 17 00:00:00 2001 From: kurone-kito Date: Sat, 14 Sep 2024 19:06:46 +0900 Subject: [PATCH 4/6] feat: added the markdownlint configuration --- .markdownlint-cli2.yaml | 10 ++++++++++ .markdownlint.yml | 17 +++++++++++++++++ .vscode/extensions.json | 1 + .vscode/settings.json | 1 + 4 files changed, 29 insertions(+) create mode 100644 .markdownlint-cli2.yaml create mode 100644 .markdownlint.yml diff --git a/.markdownlint-cli2.yaml b/.markdownlint-cli2.yaml new file mode 100644 index 0000000..518d293 --- /dev/null +++ b/.markdownlint-cli2.yaml @@ -0,0 +1,10 @@ +ignores: + - .github/CODE_OF_CONDUCT* + - Assets/** + - Library/** + - Logs/** + - Packages/com.*/** + - Packages/dev.*/** + - ProjectSettings/** + - Temp/** + - UserSettings/** diff --git a/.markdownlint.yml b/.markdownlint.yml new file mode 100644 index 0000000..ace673c --- /dev/null +++ b/.markdownlint.yml @@ -0,0 +1,17 @@ +default: true +# Allow limit breakthroughs in the code block and table row lengths. The +# default is unconditional prohibition. It is exceptionally allowed in +# these elements due to folding difficulties. +line-length: + code_blocks: false + tables: false +# Allows the use of duplicate headings. The default is unconditional +# prohibition. Due to the `siblings_only` flag not working, it is necessary +# to enable duplicate headings in the entire document. +no-duplicate-heading: false +# Allows embedding of the specified HTML tag. The default is unconditional +# prohibition. Allow for some valuable features, such as folding. +no-inline-html: + allowed_elements: + - details + - summary diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d323e39..7adcb62 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,5 +1,6 @@ { "recommendations": [ + "davidanson.vscode-markdownlint", "editorconfig.editorconfig", "fernandoescolar.vscode-solution-explorer", "redhat.vscode-yaml", diff --git a/.vscode/settings.json b/.vscode/settings.json index dc53117..97c2a47 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,6 +7,7 @@ "*.md": "${capture}.*.md", "*.sln": "*.csproj", ".gitconfig": ".gitattributes, .gitignore", + ".markdownlint.*": ".markdownlint-cli2.*", ".tool-versions": "global.json", "LICENSE*": "LICENSE${capture}.meta" }, From a75ae76be3d1313a5850365fb2b556ca00ad37e2 Mon Sep 17 00:00:00 2001 From: kurone-kito Date: Sun, 15 Sep 2024 09:56:48 +0900 Subject: [PATCH 5/6] style: linted --- .vscode/launch.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index a56490c..f6754f4 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -3,8 +3,8 @@ "configurations": [ { "name": "Attach to Unity", - "type": "vstuc", - "request": "attach" + "request": "attach", + "type": "vstuc" } ] } From 15957b9420f08274076f1301d1d32729c8b85de6 Mon Sep 17 00:00:00 2001 From: kurone-kito Date: Mon, 16 Sep 2024 15:38:02 +0900 Subject: [PATCH 6/6] feat: updated the dependencies --- Packages/packages-lock.json | 3 ++- Packages/vpm-manifest.json | 31 ++++++++++++++----------------- 2 files changed, 16 insertions(+), 18 deletions(-) diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 228af64..063d14f 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -211,7 +211,8 @@ "com.unity.cinemachine": "2.9.7", "com.unity.textmeshpro": "3.0.6", "com.unity.inputsystem": "1.2.0", - "com.unity.ai.navigation": "1.1.5" + "com.unity.ai.navigation": "1.1.5", + "com.unity.ugui": "1.0.0" } }, "dev.onevr.vrworldtoolkit": { diff --git a/Packages/vpm-manifest.json b/Packages/vpm-manifest.json index 297d63f..34b6d3e 100644 --- a/Packages/vpm-manifest.json +++ b/Packages/vpm-manifest.json @@ -1,36 +1,33 @@ { "dependencies": { - "dev.onevr.vrworldtoolkit": { - "version": "3.1.0" - }, "com.vrchat.core.vpm-resolver": { "version": "0.1.29" }, - "com.vrchat.base": { - "version": "3.6.1" - }, "com.vrchat.worlds": { - "version": "3.6.1" + "version": "3.7.0" + }, + "dev.onevr.vrworldtoolkit": { + "version": "3.2.0" } }, "locked": { - "dev.onevr.vrworldtoolkit": { - "version": "3.1.0", - "dependencies": {} - }, "com.vrchat.core.vpm-resolver": { "version": "0.1.29", "dependencies": {} }, - "com.vrchat.base": { - "version": "3.6.1", - "dependencies": {} - }, "com.vrchat.worlds": { - "version": "3.6.1", + "version": "3.7.0", "dependencies": { - "com.vrchat.base": "3.6.1" + "com.vrchat.base": "3.7.0" } + }, + "com.vrchat.base": { + "version": "3.7.0", + "dependencies": {} + }, + "dev.onevr.vrworldtoolkit": { + "version": "3.2.0", + "dependencies": {} } } } \ No newline at end of file