Compare commits

base: neroberovero:c296638c453403ca93ef571f1e0a8dd1e2bca3c8

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

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

5 Commits

c296638c45 ... d1b6fe4c2a

Author	SHA1	Message	Date
benroshio	d1b6fe4c2a	Merge branch 'fmod-integration'	2024-12-07 02:19:42 -05:00
benroshio	c9d3deb757	Merge branch 'main' into fmod-integration	2024-12-07 02:16:51 -05:00
benroshio	aa99f726ef	merge fix	2024-12-07 02:15:12 -05:00
benroshio	b823fd4fe3	Map gen	2024-12-06 16:50:09 -05:00
benroshio	79df45fdec	spring level mountain start	2024-12-05 02:09:00 -05:00

88 changed files with 240 additions and 33 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/Characters/Mannequins/Rigs/CR_Mannequin_Body.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_l_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_calf_r_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_l_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_clavicle_r_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_l_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_foot_r_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_l_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_hand_r_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_l_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_lowerarm_r_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_l_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_thigh_r_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_l_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Characters/Mannequins/Rigs/Poses/Manny/Manny_upperarm_r_anim.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/ForestLandscape/Textures/4k/fl2_ground_II_albedo.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/MA_SpringLevel2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliage_Ground_2_LayerInfo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Foliaged_Ground_LayerInfo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Grass_LayerInfo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Near_Water_Ground_LayerInfo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Hwanyoung/Levels/Textures/Rock_LayerInfo.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/Illusions/.cache/{39497745-b64e-4d28-aac7-4c478a8d1d54}.pdc

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Materials/MF_ProcGrid.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Materials/MI_PrototypeGrid_Gray.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Materials/MI_PrototypeGrid_Gray_02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Materials/MI_PrototypeGrid_TopDark.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Materials/MI_Solid_Blue.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Materials/M_PrototypeGrid.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Materials/M_Solid.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Meshes/SM_ChamferCube.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Meshes/SM_Cube.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Meshes/SM_Cylinder.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Meshes/SM_QuarterCylinder.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Meshes/SM_Ramp.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/LevelPrototyping/Textures/T_GridChecker_A.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/ThirdPerson/Blueprints/BP_ThirdPersonGameMode.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/ThirdPerson/Input/IMC_Default.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

hwanyoung2/Content/ThirdPerson/Maps/ThirdPersonMap.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/43/HYQWORMY4JDQ5X3OKZXFLC.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/0/FG/C9C8NKPQ680JETAE5ROTT1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/AZ/A7GPT109Y6ZTTJD4A7TXER.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/HL/XWFFRCIJ8QK4NRO30ALA6J.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/1/WU/NB37RT5Q32Z8MJWD8BD2SO.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/EY/87SHEJN5UBEAN2K5OV1G6R.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/M3/7JQC72ZY37QM4IT43WD5CW.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/3/P3/O43ETCZTFMLWWH1CJ941H2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/60/5PI42YRDC8HSSG6BVV2GRR.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/LN/30UBDLYFFA5ZR7U4W4L4GG.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/4/PN/2QISIGK5DJNQ05US8O8FXW.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/11/IM858T68EBXCBX1T2FNR96.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/7E/BEYC27T14FHBU6LF2F60RR.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/9Q/U98KGKQ41NJYFOGFQM8ZDY.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/QO/CO9MG7REJF8N8AQFYRCI06.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/5/R1/TS5OQ5CRUWFZYL1ZQ7I416.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/CZ/K2YM0JIRZ78IHGM8W2QBAF.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/HF/9H7TKAXH9DD8KI3TIXGI2I.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/IR/OTJMGDDXDV5TI7982YKZ5P.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/J7/N10XDC9G27EMLS5AGZ6AVV.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/NC/UUYHDUFQAXTRRN4RVOPIUF.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/XB/9VVR39MG0K7W5GQIEFE7SO.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/6/YO/NG2R9BPZVA7ZDN0Z4VSTG6.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/8/3J/6B9RJI3FDPCETRKXUXCQ4C.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/8/S1/DXUWD12MD3HRWVVXX076BY.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/9/U7/H8YL2PPHZPBTI74SUD0RNL.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/A/16/Q7Y1URWWFS0TXGWUTO3S61.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/A/17/6LXV4Y6DE3LUT705XNU4DZ.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/A/MS/MRHJREJ6H7USQYWF1KO8F6.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/4D/BBOCKSZY1GVHTFRX0PR0O8.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/8K/1IKKDYS7RULH8FRYRPPF04.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/EA/9BWDWCNL7OZT2HTML9LK1Y.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/B/FB/8RB55FM1HBEUVO4IOQC4YN.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/C/QF/BY1DA5CRGQSAMOTK8RA8KR.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/C/YT/CQR16QFDKKEYP53M51TV4F.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/0G/JNKFA4X9LRMSF343ESPF6Q.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/3V/NMHOKL5LGQDOAAG00FUMZR.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/DE/SWSI13675DVYIZ0N4NF7Y3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/D/SY/Z4CTQ4LG3YV10EKPD0UE8Q.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/8O/GK06JAEJ82TQ0GA2QB0DJG.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalActors__/ThirdPerson/Maps/ThirdPersonMap/E/FR/LBG6LPN5JCL3FMVSI2CK6R.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalObjects__/ThirdPerson/Maps/ThirdPersonMap/4/VW/TY7TSUER9KKGHX2BMKSL0L.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalObjects__/ThirdPerson/Maps/ThirdPersonMap/6/D8/3MZ6M1DB94VN44C87D65WR.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalObjects__/ThirdPerson/Maps/ThirdPersonMap/6/TK/PIQ0B2FNWR15P52TECP27A.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalObjects__/ThirdPerson/Maps/ThirdPersonMap/9/KN/KHZG97SS6AL73U7AXDWH6J.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalObjects__/ThirdPerson/Maps/ThirdPersonMap/C/7N/FDH7Y28CQFXDK8P6MM1HXM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Content/__ExternalObjects__/ThirdPerson/Maps/ThirdPersonMap/E/GP/22PD314FCWY4ZK61DE3XZC.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

hwanyoung2/Saved/Autosaves/PackageRestoreData.json

View File

Binary file not shown.