Compare commits

base: neroberovero:e430feb2e0ba725a0c32e7ba3f6b3080df03a690

Branches Tags

neroberovero:main

neroberovero:Chaz

neroberovero:Shiori

neroberovero:Fmod-Intergration-V2

neroberovero:angela-haesol-ability

neroberovero:parry

neroberovero:reaven

neroberovero:sharon_saving_loading_3

..

compare: neroberovero:cff82b376fbb1f1e263e0ae940bbfe964aaa5577

Branches Tags

neroberovero:main

neroberovero:Chaz

neroberovero:Shiori

neroberovero:Fmod-Intergration-V2

neroberovero:angela-haesol-ability

neroberovero:parry

neroberovero:reaven

neroberovero:sharon_saving_loading_3

No commits in common. "e430feb2e0ba725a0c32e7ba3f6b3080df03a690" and "cff82b376fbb1f1e263e0ae940bbfe964aaa5577" have entirely different histories.

e430feb2e0 ... cff82b376f

39 changed files with 78 additions and 78 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Expand all files Collapse all files

hwanyoung2/Content

Asian_Village

materials

cliff_materials

M_cliff.uasset

trees_materials

M_bark.uassetM_foliage.uasset

meshes

cliff

SM_cliff_01.uassetSM_cliff_02.uassetSM_cliff_03.uasset

trees

SM_tree_01.uassetSM_tree_04.uasset

Hwanyoung

Character

NPC/Spring-Sanin

BP_SanIn.uasset

PlayerCharacter/Playables/Haesol

BP_Haesol.uasset

Illusions/GeneralizedBlueprints

AOEBP/ChildrenAOE

BP_SanInRockPillar.uasset

ItemBP/ChildrenItemBP

BP_Mugwort.uasset

Interactables

BP_HaetaeStatueBase.uasset

Levels

Sprink.umap

Trees

Azaleas

Materials

MI_12.uassetMI_12_Bark.uassetMI_Type01Billboard.uassetMI_Type02Billboard.uassetMI_Type03Billboard.uasset

Royal_Azalea_Type_01_LOD0.uassetRoyal_Azalea_Type_02_LOD0.uassetRoyal_Azalea_Type_03_LOD0.uasset

Elm

Elm_1.uassetbark.uassetfoliage.uasset

Magnolia_LOD

Kobus_Magnolia_Type_01_LOD0.uassetKobus_Magnolia_Type_02_LOD0.uassetKobus_Magnolia_Type_03_LOD0.uassetKobus_Magnolia_Type_04_LOD0.uasset

Materials

Bark.uassetBranch.uassetMI_Type01Billboard.uassetMI_Type02Billboard.uassetMI_Type03Billboard.uassetMI_Type04Billboard.uasset

Mugwort

Korean_Mugwort_Type_05.uasset

Material

Leaf.uasset

Pine_2

Merge_Pine_2.uasset

KT_Props/Meshes/Ancient_Statues

SM_Stone_Seated_Vairocana_Buddha.uasset

BIN

hwanyoung2/Content/Asian_Village/materials/cliff_materials/M_cliff.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Asian_Village/materials/trees_materials/M_bark.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Asian_Village/materials/trees_materials/M_foliage.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Asian_Village/meshes/cliff/SM_cliff_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Asian_Village/meshes/cliff/SM_cliff_02.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Asian_Village/meshes/cliff/SM_cliff_03.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Asian_Village/meshes/trees/SM_tree_01.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Asian_Village/meshes/trees/SM_tree_04.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/BP_SanIn.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/PlayerCharacter/Playables/Haesol/BP_Haesol.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/AOEBP/ChildrenAOE/BP_SanInRockPillar.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Illusions/GeneralizedBlueprints/ItemBP/ChildrenItemBP/BP_Mugwort.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Interactables/BP_HaetaeStatueBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Sprink.umap (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Azaleas/Materials/MI_12.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Azaleas/Materials/MI_12_Bark.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Azaleas/Materials/MI_Type01Billboard.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Azaleas/Materials/MI_Type02Billboard.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Azaleas/Materials/MI_Type03Billboard.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Azaleas/Royal_Azalea_Type_01_LOD0.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Azaleas/Royal_Azalea_Type_02_LOD0.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Azaleas/Royal_Azalea_Type_03_LOD0.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Elm/Elm_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Elm/bark.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Elm/foliage.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Kobus_Magnolia_Type_01_LOD0.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Kobus_Magnolia_Type_02_LOD0.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Kobus_Magnolia_Type_03_LOD0.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Kobus_Magnolia_Type_04_LOD0.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Materials/Bark.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Materials/Branch.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Materials/MI_Type01Billboard.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Materials/MI_Type02Billboard.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Materials/MI_Type03Billboard.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Magnolia_LOD/Materials/MI_Type04Billboard.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Mugwort/Korean_Mugwort_Type_05.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Mugwort/Material/Leaf.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Trees/Pine_2/Merge_Pine_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/KT_Props/Meshes/Ancient_Statues/SM_Stone_Seated_Vairocana_Buddha.uasset (Stored with Git LFS)

Binary file not shown.