diff --git a/.commitlintrc.yml b/.commitlintrc.yml deleted file mode 100644 index 143a92f..0000000 --- a/.commitlintrc.yml +++ /dev/null @@ -1,2 +0,0 @@ -extends: - - gitmoji diff --git a/.huskyrc.yml b/.huskyrc.yml deleted file mode 100644 index 4171caa..0000000 --- a/.huskyrc.yml +++ /dev/null @@ -1,2 +0,0 @@ -hooks: - commit-msg: commitlint -E HUSKY_GIT_PARAMS diff --git a/.releaserc.yml b/.releaserc.yml deleted file mode 100644 index 0aefd65..0000000 --- a/.releaserc.yml +++ /dev/null @@ -1,5 +0,0 @@ -plugins: - - semantic-release-gitmoji - - - '@semantic-release/github' - - assets: - - path: dist/ diff --git a/Assets.meta b/Assets.meta deleted file mode 100644 index 624f49f..0000000 --- a/Assets.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 658662fe5bd6aa3448453df9e9673714 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/.gitignore b/Assets/.gitignore new file mode 100644 index 0000000..f087fa8 --- /dev/null +++ b/Assets/.gitignore @@ -0,0 +1,3 @@ +/*/ +/*.meta +!InariUdon* diff --git a/Demo.unity b/Assets/InariUdon/Demo.unity similarity index 100% rename from Demo.unity rename to Assets/InariUdon/Demo.unity diff --git a/Demo.unity.meta b/Assets/InariUdon/Demo.unity.meta similarity index 100% rename from Demo.unity.meta rename to Assets/InariUdon/Demo.unity.meta diff --git a/Assets/InariUdon/InariUdonRuntime.asmdef b/Assets/InariUdon/InariUdonRuntime.asmdef new file mode 100644 index 0000000..c9c9b7f --- /dev/null +++ b/Assets/InariUdon/InariUdonRuntime.asmdef @@ -0,0 +1,18 @@ +{ + "name": "InariUdonRuntime", + "references": [ + "VRC.Udon", + "UdonSharp.Runtime", + "UdonToolkitRuntime", + "UdonSharp.Editor", + "Unity.TextMeshPro" + ], + "optionalUnityReferences": [], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [] +} \ No newline at end of file diff --git a/CHANGELOG.md.meta b/Assets/InariUdon/InariUdonRuntime.asmdef.meta similarity index 59% rename from CHANGELOG.md.meta rename to Assets/InariUdon/InariUdonRuntime.asmdef.meta index 8abb951..2e16113 100644 --- a/CHANGELOG.md.meta +++ b/Assets/InariUdon/InariUdonRuntime.asmdef.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7330f6cb26b33644a843560c6f004310 -TextScriptImporter: +guid: b733758ec60eacd468e4a43b899c2cc0 +AssemblyDefinitionImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/InariUdon/package.json b/Assets/InariUdon/package.json new file mode 100644 index 0000000..b02f81e --- /dev/null +++ b/Assets/InariUdon/package.json @@ -0,0 +1,13 @@ +{ + "name": "com.nekometer.esnya.inari-udon", + "displayName": "InariUdon", + "private": true, + "description": "", + "keywords": [ + "VRChat", + "Unity" + ], + "license": "MIT", + "author": "esnya", + "unity": "2018.4" +} diff --git a/package.json.meta b/Assets/InariUdon/package.json.meta similarity index 100% rename from package.json.meta rename to Assets/InariUdon/package.json.meta diff --git a/LICENSE.meta b/LICENSE.meta deleted file mode 100644 index f0a2acd..0000000 --- a/LICENSE.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4a86591a171c5104faa41fba93a24324 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Packages/.gitignore b/Packages/.gitignore new file mode 100644 index 0000000..9694046 --- /dev/null +++ b/Packages/.gitignore @@ -0,0 +1 @@ +/com.* diff --git a/Packages/manifest.json b/Packages/manifest.json index 49d6c9e..bc43e05 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,11 +1,16 @@ { "dependencies": { + "com.orels1.udon-toolkit": "https://github.com/esnya/UdonToolkit.git#feature/upm", "com.unity.ads": "2.0.8", "com.unity.analytics": "3.2.3", + "com.unity.cinemachine": "2.6.1", "com.unity.collab-proxy": "1.2.15", "com.unity.package-manager-ui": "2.0.8", + "com.unity.postprocessing": "3.0.3", "com.unity.purchasing": "2.0.3", - "com.unity.textmeshpro": "1.4.1", + "com.unity.textmeshpro": "1.5.1", + "com.unity.xr.oculus.standalone": "1.38.4", + "com.unity.xr.openvr.standalone": "1.0.5", "com.unity.modules.ai": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", @@ -36,5 +41,11 @@ "com.unity.modules.vr": "1.0.0", "com.unity.modules.wind": "1.0.0", "com.unity.modules.xr": "1.0.0" + }, + "lock": { + "com.orels1.udon-toolkit": { + "revision": "feature/upm", + "hash": "10495a581de75ccf6858c125e78b7d2a35ad689f" + } } } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index aff0601..c94d9cd 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/graphicssettings.asset b/ProjectSettings/graphicssettings.asset index e11bc8b..7d2b579 100644 Binary files a/ProjectSettings/graphicssettings.asset and b/ProjectSettings/graphicssettings.asset differ diff --git a/README.md b/README.md index d7ee294..ca4859e 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ Useful prefabs and Udon scripts for VRChat World SDK 3.0 Place prefabs into Scene in [Assets/InariUdon/Components/](Assets/InariUdon/Components) or add UdonScript in Script directory. ## Setup -1. Install requirements in below. +1. Install requirements in below. (Do not forget Setup UdonToolkit). 2. Download latest non-pre-release `InariUdon-.zip` from [Releases](https://github.com/esnya/InariUdon/releases). 3. Unzip and drag and drop .unitypackage into Project window of Unity. diff --git a/README.md.meta b/README.md.meta deleted file mode 100644 index 6c5933c..0000000 --- a/README.md.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d2e91707759d7d44994c00dac2446665 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/package-lock.json.meta b/package-lock.json.meta deleted file mode 100644 index 52c88b5..0000000 --- a/package-lock.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3c4e47f1db5d0904599dfbcba345cb2c -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/package.json b/package.json index 9fe78cc..f9269bb 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,5 @@ { - "name": "com.nekometer.esnya.inari-udon", - "displayName": "InariUdon", - "version": "2.2.1", + "name": "inari-udon-dev", "private": true, "description": "", "keywords": [ @@ -10,10 +8,6 @@ ], "license": "MIT", "author": "esnya", - "scripts": { - "version": "npx cross-var npx gitmoji-changelog $npm_package_version && git add CHANGELOG.md" - }, - "unity": "2018.4", "devDependencies": { "@commitlint/cli": "^11.0.0", "@commitlint/config-conventional": "^11.0.0", @@ -23,5 +17,31 @@ "husky": "^4.3.8", "semantic-release": "^17.4.2", "semantic-release-gitmoji": "^1.3.4" + }, + + "husky": { + "hooks": { + "commit-msg": "commitlint -E HUSKY_GIT_PARAMS" + } + }, + "commitlint": { + "extends": [ + "gitmoji" + ] + }, + "release": { + "plugins": [ + "semantic-release-gitmoji", + [ + "@semantic-release/github", + { + "assets": [ + { + "path": "dist/" + } + ] + } + ] + ] } }