Merge branch 'fix/initialStage' into 'staging' (51245452) · Commits · Ahmad Nadil / IF3210-2024-Unity-SGK

Commit 51245452 authored 1 year ago by

Bernardus Willson

Merge branch 'fix/initialStage' into 'staging'

fix: initial stage

See merge request !75

parents f4f74df0 83198e11

2 merge requests!78RELEASE,!75fix: initial stage

Hide whitespace changes

Inline Side-by-side

Showing

Assets/Audio/Effects/Buy.mp3 3 additions, 0 deletions

Assets/Audio/Effects/Buy.mp3
Assets/Audio/Effects/Buy.mp3.meta 4 additions, 3 deletions

Assets/Audio/Effects/Buy.mp3.meta
Assets/Audio/Effects/OpenShop.mp3 3 additions, 0 deletions

Assets/Audio/Effects/OpenShop.mp3
Assets/Audio/Effects/OpenShop.mp3.meta 4 additions, 3 deletions

Assets/Audio/Effects/OpenShop.mp3.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_1_0_basecolor.jpg.meta 0 additions, 127 deletions

...aw-type-vol4/source/model/Material_1_0_basecolor.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_1_0_roughness.jpg.meta 0 additions, 127 deletions

...aw-type-vol4/source/model/Material_1_0_roughness.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_2_0_basecolor.jpg.meta 0 additions, 127 deletions

...aw-type-vol4/source/model/Material_2_0_basecolor.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_2_0_normal.jpg.meta 0 additions, 127 deletions

...l-saw-type-vol4/source/model/Material_2_0_normal.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_2_0_roughness.jpg.meta 0 additions, 127 deletions

...aw-type-vol4/source/model/Material_2_0_roughness.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_3_0_basecolor.jpg.meta 0 additions, 127 deletions

...aw-type-vol4/source/model/Material_3_0_basecolor.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_3_0_roughness.jpg.meta 0 additions, 127 deletions

...aw-type-vol4/source/model/Material_3_0_roughness.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_4_0_basecolor.jpg.meta 0 additions, 127 deletions

...aw-type-vol4/source/model/Material_4_0_basecolor.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_4_0_metallic.jpg.meta 0 additions, 127 deletions

...saw-type-vol4/source/model/Material_4_0_metallic.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_4_0_normal.jpg.meta 0 additions, 127 deletions

...l-saw-type-vol4/source/model/Material_4_0_normal.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/Material_4_0_roughness.jpg.meta 0 additions, 127 deletions

...aw-type-vol4/source/model/Material_4_0_roughness.jpg.meta
Assets/Import/arrow-model-saw-type-vol4/source/model/mesh.fbx.meta 0 additions, 109 deletions

...port/arrow-model-saw-type-vol4/source/model/mesh.fbx.meta
Assets/Import/arrow-model-saw-type-vol4/textures/Material_1_0_basecolor.jpeg.meta 0 additions, 127 deletions

...l-saw-type-vol4/textures/Material_1_0_basecolor.jpeg.meta
Assets/Import/arrow-model-saw-type-vol4/textures/Material_1_0_roughness.jpeg.meta 0 additions, 127 deletions

...l-saw-type-vol4/textures/Material_1_0_roughness.jpeg.meta
Assets/Import/arrow-model-saw-type-vol4/textures/Material_2_0_basecolor.jpeg.meta 0 additions, 127 deletions

...l-saw-type-vol4/textures/Material_2_0_basecolor.jpeg.meta
Assets/Import/arrow-model-saw-type-vol4/textures/Material_2_0_normal.jpeg.meta 0 additions, 127 deletions

...odel-saw-type-vol4/textures/Material_2_0_normal.jpeg.meta

with 14 additions and 2020 deletions

Please register or to comment

Admin message

Merge branch 'fix/initialStage' into 'staging'