Commit dca4f98

authored

Merge pull request #15 from ThatAmuzak/convert-to-upm

converts entire project to UPM

2 parents eed63bd + 39dac85 commit dca4f98Copy full SHA for dca4f98

File tree

94 files changed

+981

-6066

lines changed

.gitignore
.vsconfig
Assets
- Readme.txt
- Scripts
  - Runtime
  - Samples
CHANGELOG.md.meta
CHANGELOG.md
CONTRIBUTING.md.meta
CONTRIBUTING.md
LICENSE.meta
Logs
Packages
- manifest.json
- packages-lock.json
ProjectSettings
README.md.meta
README.md
Runtime.meta
Runtime
Samples~
UserSettings
package.json.meta
package.json

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

94 files changed

+981

-6066

lines changed

`‎.gitignore`

Lines changed: 44 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,36 @@`
	`1`	`+# This .gitignore file should be placed at the root of your Unity project directory`
	`2`	`+#`
	`3`	`+# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore`
	`4`	`+#`
`1`	`5`	`/[Ll]ibrary/`
`2`	`6`	`/[Tt]emp/`
`3`	`7`	`/[Oo]bj/`
`4`	`8`	`/[Bb]uild/`
`5`	`9`	`/[Bb]uilds/`
`6`		`-/Assets/AssetStoreTools*`
	`10`	`+/[Ll]ogs/`
	`11`	`+/[Uu]ser[Ss]ettings/`
`7`	`12`
`8`		`-# Visual Studio 2015 cache directory`
`9`		`-/.vs/`
	`13`	`+# MemoryCaptures can get excessive in size.`
	`14`	`+# They also could contain extremely sensitive data`
	`15`	`+/[Mm]emoryCaptures/`
	`16`	`+`
	`17`	`+# Asset meta data should only be ignored when the corresponding asset is also ignored`
	`18`	`+!/[Aa]ssets/*/.meta`
	`19`	`+`
	`20`	`+# Uncomment this line if you wish to ignore the asset store tools plugin`
	`21`	`+# /[Aa]ssets/AssetStoreTools*`
	`22`	`+`
	`23`	`+# Autogenerated Jetbrains Rider plugin`
	`24`	`+/[Aa]ssets/Plugins/Editor/JetBrains*`
	`25`	`+`
	`26`	`+# Visual Studio cache directory`
	`27`	`+.vs/`
	`28`	`+`
	`29`	`+# Jetbrains Rider cache directory`
	`30`	`+.idea/`
	`31`	`+`
	`32`	`+# Gradle cache directory`
	`33`	`+.gradle/`
`10`	`34`
`11`	`35`	`# Autogenerated VS/MD/Consulo solution and project files`
`12`	`36`	`ExportedObj/`
`@@ -22,13 +46,29 @@ ExportedObj/`
`22`	`46`	`*.booproj`
`23`	`47`	`*.svd`
`24`	`48`	`*.pdb`
	`49`	`+*.mdb`
	`50`	`+*.opendb`
	`51`	`+*.VC.db`
`25`	`52`
`26`	`53`	`# Unity3D generated meta files`
`27`	`54`	`*.pidb.meta`
	`55`	`+*.pdb.meta`
	`56`	`+*.mdb.meta`
`28`	`57`
`29`		`-# Unity3D Generated File On Crash Reports`
	`58`	`+# Unity3D generated file on crash reports`
`30`	`59`	`sysinfo.txt`
`31`	`60`
`32`	`61`	`# Builds`
`33`	`62`	`*.apk`
	`63`	`+*.aab`
`34`	`64`	`*.unitypackage`
	`65`	`+`
	`66`	`+# Crashlytics generated file`
	`67`	`+crashlytics-build.properties`
	`68`	`+`
	`69`	`+# Packed Addressables`
	`70`	`+/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata//.bin*`
	`71`	`+`
	`72`	`+# Temporary auto-generated Android Assets`
	`73`	`+/[Aa]ssets/[Ss]treamingAssets/aa.meta`
	`74`	`+/[Aa]ssets/[Ss]treamingAssets/aa/*`