Merge branch 'main' into 'terrain-scene1'
# Conflicts: # src/Assets/Import.meta
Showing
- src/.vs/src/FileContentIndex/fdf97531-0557-4053-ba4e-f2b371fe1df4.vsidx 0 additions, 0 deletions...leContentIndex/fdf97531-0557-4053-ba4e-f2b371fe1df4.vsidx
- src/.vs/src/v17/.suo 0 additions, 0 deletionssrc/.vs/src/v17/.suo
- src/.vs/src/v17/DocumentLayout.json 54 additions, 0 deletionssrc/.vs/src/v17/DocumentLayout.json
- src/Assembly-CSharp.csproj 374 additions, 314 deletionssrc/Assembly-CSharp.csproj
- src/Assets/Fonts.meta 8 additions, 0 deletionssrc/Assets/Fonts.meta
- src/Assets/Fonts/SF Distant Galaxy SDF.asset 2727 additions, 0 deletionssrc/Assets/Fonts/SF Distant Galaxy SDF.asset
- src/Assets/Fonts/SF Distant Galaxy SDF.asset.meta 8 additions, 0 deletionssrc/Assets/Fonts/SF Distant Galaxy SDF.asset.meta
- src/Assets/Fonts/SF Distant Galaxy.ttf 0 additions, 0 deletionssrc/Assets/Fonts/SF Distant Galaxy.ttf
- src/Assets/Fonts/SF Distant Galaxy.ttf.meta 21 additions, 0 deletionssrc/Assets/Fonts/SF Distant Galaxy.ttf.meta
- src/Assets/Import.meta 1 addition, 1 deletionsrc/Assets/Import.meta
- src/Assets/Import/BB8_Droid.meta 8 additions, 0 deletionssrc/Assets/Import/BB8_Droid.meta
- src/Assets/Import/BB8_Droid/BB8_Droid.prefab 433 additions, 0 deletionssrc/Assets/Import/BB8_Droid/BB8_Droid.prefab
- src/Assets/Import/BB8_Droid/BB8_Droid.prefab.meta 7 additions, 0 deletionssrc/Assets/Import/BB8_Droid/BB8_Droid.prefab.meta
- src/Assets/Import/BB8_Droid/license.txt 11 additions, 0 deletionssrc/Assets/Import/BB8_Droid/license.txt
- src/Assets/Import/BB8_Droid/license.txt.meta 7 additions, 0 deletionssrc/Assets/Import/BB8_Droid/license.txt.meta
- src/Assets/Import/BB8_Droid/materials.meta 8 additions, 0 deletionssrc/Assets/Import/BB8_Droid/materials.meta
- src/Assets/Import/BB8_Droid/materials/m7_ref_3.mat 86 additions, 0 deletionssrc/Assets/Import/BB8_Droid/materials/m7_ref_3.mat
- src/Assets/Import/BB8_Droid/materials/m7_ref_3.mat.meta 8 additions, 0 deletionssrc/Assets/Import/BB8_Droid/materials/m7_ref_3.mat.meta
- src/Assets/Import/BB8_Droid/materials/material_0.mat 85 additions, 0 deletionssrc/Assets/Import/BB8_Droid/materials/material_0.mat
- src/Assets/Import/BB8_Droid/materials/material_0.mat.meta 8 additions, 0 deletionssrc/Assets/Import/BB8_Droid/materials/material_0.mat.meta
Please register or sign in to comment