janis/defrain-shooter-unity
1
0
Fork 0
mirror of https://github.com/DerTyp7/defrain-shooter-unity.git synced 2025-10-29 20:52:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merging

Browse Source
This commit is contained in:
DerTyp187
2021-12-16 22:01:55 +01:00
parent 14ad07036e
commit b180875539
54 changed files with 8378 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Packages/manifest.json
View File

@@ -10,7 +10,12 @@
"com.unity.render-pipelines.universal": "12.1.2",
"com.unity.test-framework": "1.1.29",
"com.unity.textmeshpro": "3.0.6",
<<<<<<< HEAD
"com.unity.timeline": "1.6.3",
=======
"com.unity.timeline": "1.6.2",
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview",
>>>>>>> parent of 131d40d (Revert "Merge branch 'Lobby-System'")
"com.unity.ugui": "1.0.0",
"com.unity.visualscripting": "1.7.6",
"com.unity.modules.ai": "1.0.0",