Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-08-22 02:14:30 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'Particles'

Browse Source
This commit is contained in:
Vincent Wheat
2021-11-05 13:25:57 -05:00
parent 758f06f775 84a8d5134c
commit 81abd7bfe8
12 changed files with 15380 additions and 672 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Assets/Scripts/PlayerScripts/DebugPlayer.meta
View File

@@ -1,7 +1,12 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Scripts/PlayerScripts/DebugPlayer.meta
guid: 236528fef9e9ed54fa77a41f6facd741
folderAsset: yes
DefaultImporter:
=======
guid: 8cc08287d1ef0b94db826a6319e8bd6d
NativeFormatImporter:
>>>>>>> Particles:Assets/Materials/LightningBolt.mat.meta
externalObjects: {}
userData:
assetBundleName: