Merge branch 'dev' into Enemies

Browse Source

# Conflicts:
#	Content/FirstPerson/Blueprints/BP_FirstPersonCharacter.uasset

...

This commit is contained in:

Rafal 2024-12-15 13:57:03 +00:00

parent 620d480dc0 221d31fb85

commit 4b79d10184

30 changed files with 74 additions and 30 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

2

Config/DefaultEditor.ini

View File

File diff suppressed because one or more lines are too long

BIN

Content/Assets/ChaosAssets/LargeBuilding.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/ChaosAssets/LargeBuildingCombined.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/ChaosAssets/MediumBuilding.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/ChaosAssets/MediumBuildingCombined.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Assets/ChaosAssets/SmallBuildingDestruction.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/BPF_CommonFunctionLibrary.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Enemies/Flats/BP_FlatsMonster.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Levels/PrototypeLevelRework.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Monolith/BPI_Monolith.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Monster.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/QuestSystem/LocationMarker.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Boss_diffuse.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Boss_normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Boss_specular.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Cigar_Mat.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Clothes_MAT.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Clothes_MAT_ncl_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Eyes_MAT.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Eyes_MAT_ncl_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/MrGamblingQuestGiver.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Sad_Idle.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Sad_Idle_Anim.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Sad_Idle_PhysicsAsset.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Sad_Idle_Skeleton.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/MrGambling/Skin_MAT.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/QuestSystem/NPCs/TestNPC.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/QuestSystem/QuestData.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/QuestSystem/Quest_Base.uasset (Stored with Git LFS)

View File

Binary file not shown.