Archived
Merge branch 'marlon' into Noah
* marlon: marlon neuster branch. workt!! fully functioning marlon-branch. sick! blabla various additions sick. a looot of changes! marlon file setup Revert "Readme rausgelöscht" Readme rausgelöscht neues Readme test # Conflicts: # ProjectSettings/ProjectSettings.asset
This commit is contained in:
commit
a86e27ed2a
537 files changed
+17422
-1327
No files matched your search
@@ -1,5 +1,6 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"com.unity.2d.sprite": "1.0.0",
|
||||
"com.unity.collab-proxy": "1.17.2",
|
||||
"com.unity.feature.development": "1.0.1",
|
||||
"com.unity.ide.rider": "3.0.15",
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
{
|
||||
"dependencies": {
|
||||
"com.unity.2d.sprite": {
|
||||
"version": "1.0.0",
|
||||
"depth": 0,
|
||||
"source": "builtin",
|
||||
"dependencies": {}
|
||||
},
|
||||
"com.unity.burst": {
|
||||
"version": "1.7.3",
|
||||
"depth": 1,
|
||||
|
||||
Reference in new issue
Block a user