Compare commits

base: neroberovero:0c5e97cd700c746dd2a30ad5b10b41ce1e3f2c92

Branches Tags

neroberovero:main

neroberovero:fmod-integration

neroberovero:sharon_saving_loading_3

neroberovero:sharon_saving_loading_2

neroberovero:sharon_saving_loading

neroberovero:angela-inventory

neroberovero:origin/ken-movement

neroberovero:pan-branch

..

compare: neroberovero:79a0aec0277abade209bf924a7a84439c295b865

Branches Tags

neroberovero:main

neroberovero:fmod-integration

neroberovero:sharon_saving_loading_3

neroberovero:sharon_saving_loading_2

neroberovero:sharon_saving_loading

neroberovero:angela-inventory

neroberovero:origin/ken-movement

neroberovero:pan-branch

No commits in common. "0c5e97cd700c746dd2a30ad5b10b41ce1e3f2c92" and "79a0aec0277abade209bf924a7a84439c295b865" have entirely different histories.

0c5e97cd70 ... 79a0aec027

846 changed files with 114 additions and 2643 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

BIN

hwanyoung2/Content/FMOD/Desktop/Master.bank

View File

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Desktop/Master.strings.bank

View File

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/UI/Craft_open.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Events/SFX/UI/Crafting.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/PrivateIntegrationData/AssetLookup.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/PrivateIntegrationData/BankLookup.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_ThunderBallHit.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_aquaStorm.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_darkStorm.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_explosion.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_fireBall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_fireStorm.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_healAura.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_hit1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_hit2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_laser01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_lightning1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_lightning2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_lightning3.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_magicCircle1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_shootingStar1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_shotSpawn.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_storm.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_thunderBall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_thunderStorm.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_waterBall.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Blueprints/BP_ky_waterBallHit.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Map/Overview.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_aura011_4x4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_aura011_4x4_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_aura9.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_auraWall02_two.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_chantDecoAc.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_circle9_4x4c2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_circleDust.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_dynDust.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_dynDust2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_flare25_4x4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_flareVertical03b_4x4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_flare_flash_trs.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_lightning02_4x4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_lightningDust01_4x4_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_polarC_two.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_polarG_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_polar_two.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_primitive2b_trs.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_primitive_dynB_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_primitive_dynB_two.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_shine01B.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_shine01R.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_shine01R_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_shockWave03g_4x4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_shockwave10R_4x4_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_shockwave12_4x4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_smoke01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_smoke01b.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_smoke01c.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_starDust_dis.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_starDust_sq.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_storm01_aqua.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_storm01_aqua_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_storm01_dark.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_storm01_dark_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_storm01_fire.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_storm01_fire_nonD1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_storm01_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_storm01_thunder.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_storm01_thunder_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_stormDeco01_aqua.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_stormDeco01_dark.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_stormDeco01_fire.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_turbulence_smoke2d_trs.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/MI_ky_vortex04B_4x4_two.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_Fresnel.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_aura9.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_auraWall02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_base.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_base_anime.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_base_turbulence.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_chantDecoA.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_circle01_4x4G_nonD.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_dust01_4x4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_dynDust.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_empty.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_flare01_primitive.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_flarePillar.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_flareVert.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_flare_flash.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_laser01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_magicCircle020.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_polar.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_polar_primitive.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_primitive.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_primitive_dyn2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_shockWave03_4x4.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_smoke01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_starDust.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_stone02.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_storm01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/FXVarietyPack/Materials/M_ky_stormDeco01.uasset (Stored with Git LFS)

View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More