Compare commits

base: neroberovero:499fc3ae1840e32237e5d16581e98868d81d7b7d

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:e7c2adfd89c8d9566a465c7d7d127f03c6589e66

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

17 Commits

499fc3ae18 ... e7c2adfd89

Author	SHA1	Message	Date
benroshio	e7c2adfd89	Merge branch 'Fmod-Intergration-V2' into Shiori	2025-04-16 12:35:08 -04:00
benroshio	6dfcbdfd48	Missing Sfx Fix	2025-04-16 12:25:39 -04:00
benroshio	c2c29e303f	Merge branch 'fmod-co' into Fmod-Intergration-V2	2025-04-12 14:05:17 -04:00
benroshio	feb0fee599	merge	2025-04-12 14:02:21 -04:00
benroshio	701d9bcb05	Merge branch 'fmod-co' into Shiori	2025-04-12 13:52:49 -04:00
benroshio	e25825931c	Sanin timing fix	2025-04-12 13:47:37 -04:00
benroshio	6d57eb432d	Fmod bank refresh	2025-04-11 11:35:03 -04:00
benroshio	552b32ed56	Merge branch 'Shiori' into Fmod-Intergration-V2	2025-04-11 11:31:27 -04:00
benroshio	5987dbc276	Merge branch 'main' into Shiori	2025-04-07 23:04:35 -04:00
benroshio	28dcf82cca	Auto stash before merge of "Shiori" and "main"	2025-04-07 23:04:18 -04:00
benroshio	08606779a8	Merge remote-tracking branch 'origin/main'	2025-04-07 20:18:46 -04:00
wonjoon	34ddeeea05	edit level, add campfire asset, plants asset	2025-04-08 04:31:42 +09:00
Ji Yoon Rhee	4480f56677	collision makes the player to bounce off; the exact numbers can be altered after playtesting	2025-04-06 22:53:08 +09:00
wonjoon	45a8be233a	Resolve conflict: Sharon=theirs, TEST=ours	2025-04-06 21:19:23 +09:00
wonjoon	1a8f87f2ec	edit landscape	2025-04-06 21:02:44 +09:00
Ji Yoon Rhee	4c233c7d0b	sanin's ultimate related AOE material + animation clean up	2025-04-05 23:52:46 +09:00
benroshio	5c975ddaa9	Arrow ult sound fix ... added to bp_haesol	2025-03-26 23:23:02 -04:00

642 changed files with 1035 additions and 984 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/ArcherAnimationSet/DEMO/Mannequin/Character/Mesh/IKRetargeter_MannyUE4.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequin_UE4/Rigs/RTG_UE4Manny_UE5Manny.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/RTG_Mannequin.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/FMOD/Desktop/Master.bank

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Fire_Pit/defaultMat.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Fire_Pit/defaultMat_baseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/damage/RootMotion/damage_large_b.uasset → hwanyoung2/Content/Fab/Fire_Pit/defaultMat_metallicRoughness.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Fire_Pit/defaultMat_normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Fire_Pit/scene.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/3D/Rock_shopk/Medium/shopk_tier_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/BP_GlobalFoliageActor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/FoliageTypes/FT_wiljearqx_VarA.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/FoliageTypes/FT_wiljearqx_VarB.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/FoliageTypes/FT_wiljearqx_VarC.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/FoliageTypes/FT_wiljearqx_VarD.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/FoliageTypes/FT_wiljearqx_VarE.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/FoliageTypes/FT_wiljearqx_VarF.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/FoliageTypes/FT_wiljearqx_VarG.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/FoliageTypes/FT_wiljearqx_VarH.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/MI_wiljearqx.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/MI_wiljearqx_Billboard.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/SM_wiljearqx_VarA.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/SM_wiljearqx_VarB.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/SM_wiljearqx_VarC.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/SM_wiljearqx_VarD.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/SM_wiljearqx_VarE.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/SM_wiljearqx_VarF.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/SM_wiljearqx_VarG.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/SM_wiljearqx_VarH.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/T_wiljearqx_2K_B.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/T_wiljearqx_2K_Billboard_B-O.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/T_wiljearqx_2K_Billboard_N-T.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/T_wiljearqx_2K_N.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Fab/Megascans/Plants/Kikuyu_Grass_wiljearqx/Medium/T_wiljearqx_2K_ORT.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/BP_LargeGonggiRange.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/AI-Weapon/SaninButterflyProjectile/BP_SaninButterflySwarm.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/BP_AggroNPCBase.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Behavior/BST/BST_SaninAttack.uasset (Stored with Git LFS)

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

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

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/01_idle.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/02_shot_Finish.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/02_shot_all.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/02_shot_all_Dup.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/02_shot_end.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/02_shot_loop.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/02_shot_start.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/03_shotS_all.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/03_shotS_end.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/03_shotS_end1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/03_shotS_loop.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/03_shotS_loop1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/03_shotS_start.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/03_shotS_start1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/04_beam_all.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/04_beam_end.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/04_beam_end1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/04_beam_loop.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/04_beam_loop1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/04_beam_start.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/04_beam_start1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/05_chanting_all.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/05_chanting_end.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/05_chanting_end1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/05_chanting_loop.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/05_chanting_loop1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/05_chanting_start.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/05_chanting_start1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_all.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_end.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_end1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_loopA.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_loopB.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_loopB1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_middle.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_middle1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/06_chanting_start.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/07_force.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/08_triplemagic.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/09_football.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/09_football1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/10_buff.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/11_emote_spin.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/11_emote_spin1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/12_emote_grace.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/13_combo_1.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/13_combo_1s.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/13_combo_2.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/13_combo_2s.uasset (Stored with Git LFS)

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Character/NPC/Spring-Sanin/Anims-Sanin/MagicalAnimSet/Animations/13_combo_3.uasset (Stored with Git LFS)

Binary file not shown.

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