Merge remote-tracking branch 'origin/Weapon-To-Inventory' into Inventory-System

Browse Source

# Conflicts:
#	EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset
#	EndlessVendetta/Content/Levels/TrainingFacility.umap
#	EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
#	EndlessVendetta/Source/EndlessVendetta/EndlessVendettaCharacter.h

...

This commit is contained in:

Philip W 2023-11-26 23:48:30 +00:00

parent 6ff29fa551 ad2d62dc73

commit e4ff0735df

165 changed files with 678 additions and 81 deletions

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

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

Assets/Bathroom/SM_Toilet.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Doorway.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Floor.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Floor_Small.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Pillar_1.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Pillar_2.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Wall.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_Wall_Short.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/SM_stairs.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/Modular_pieces/WallsFloors_maya.mb (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/cabinet_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/carpet_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/chair_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/coffee_table_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/fireplace_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/side_table_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/sofa_01.fbx (Stored with Git LFS)

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_Normal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_bl_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_or_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_re_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/coffee_table_01_ye_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_Normal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_bl_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_or_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_re_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Assets/living room/textures/side_table_01_ye_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bed01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/BedroomTable01_low.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/MakeupStand.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Mirror.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Bed02.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_BedroomTable01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Draws01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_MakeupStand01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Mirror01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Shelves01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_Stool01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Sm_lavalamp.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/LavaLamp/lavalamp_low_LavaLamp_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/LavaLamp/lavalamp_low_LavaLamp_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/LavaLamp/lavalamp_low_LavaLamp_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Lavalamp.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Shelves01.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Shelves01/Shelves_low_Shelves01_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Shelves01/Shelves_low_Shelves01_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/Shelves01/Shelves_low_Shelves01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_bl_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_or_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_re_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_01_ye_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_bl.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_or.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_re.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_ye.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_bl_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_or_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_re_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_01_ye_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_or.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_re.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_ye.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/cabinet_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/carpet_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/chair_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/coffee_table_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/fireplace_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/side_table_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Assets/Objects/Tutorial-Level/sofa_01.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_ARTEST1.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/AssaultRifles/BP_BaseAssaultRifle.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Pistols/BP_BasePistolWeapon.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Shotguns/BP_BaseShotgun.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/Snipers/BaseSniper.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_WeaponStatsPrompt.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/BP_Door.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/FirstPerson/Blueprints/DoorPrompt/WBP_DoorPrompt.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Levels/DoorTestLevel.umap (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Levels/TrainingFacility.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/Levels/_GENERATED/mh261677/Trim_1B41F361.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/41/3FZYKAJO60E8F4WVT8FV88.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/9Q/HY8HJRQIKTVOF3OHX80G7R.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/FO/HZW6GENZ4ORQO32631F0NM.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/QL/Q19K1NBEG07WR9W65AY9D3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/TK/733U54K7KZMUP4ETP0ISSO.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/0/UA/I2LCWFRMQSUPVR801L9OCF.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/68/WB21XHTYJYO4O9RIZ55LNU.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/86/2G0VVLAV19SLSWJ4KQ4NHI.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/GX/7KM4BQ68V5XZ7CLTNOGM9L.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/H3/OM1G439X65VZCEFTI9OEHP.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

EndlessVendetta/Content/__ExternalActors__/Levels/DoorTestLevel/2/MS/733DH0ELXQT8G5L1XOMMA4.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

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