Merge branch 'dev' into Hub-level-blockout

Browse Source

...

This commit is contained in:

Philip W 2023-02-28 15:34:49 +00:00

parent 70d0c545ed 98c07aab17

commit 06deee7b0b

155 changed files with 1035 additions and 143 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

ALICIA/building3.mb (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Art Misc/Kit1.mb (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Characters/Merchant.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Characters/Merchant_low_MerchantMat_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Characters/Merchant_low_MerchantMat_Emissive.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Characters/Merchant_low_MerchantMat_Normal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Characters/Merchant_low_MerchantMat_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Concept Art/Modular_test.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Goat Enemy/Goat.fbx (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Goat Enemy/GoatRefs.pur Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_BaseColor.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_Normal.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Characters/Goat Enemy/goat_low_GoatMat_OcclusionRoughnessMetallic.png (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/InventoryImages/Inventory_Symbol.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/Beams_1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/Beams_2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/Plank_Long.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/Plank_Short.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/Tutorial_Wood_Texture.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/lambert1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_BaseColor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Emissive.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Height.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Metallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Normal.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Assets/Objects/Tutrorial_Assets/tutorial_Wood_Texture/Plank_Long_lambert1_Roughness.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/BlueprintAI/AI/AIBruh.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/BlueprintAI/AI/AIControllerBruh.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Combat_UI/BP_TurnBaseCombatV2.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Combat_UI/CombatCharacter.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

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

View File

Binary file not shown.

BIN

Content/Blueprints/Inventory_UI/WBP_PlayerInventory.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/Player/BP_MyTempCharacter.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Blueprints/StatusEffects/BP_HealOverTime.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/StatusEffects/BP_Thorns.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Status_UI/StatusIcon.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Blueprints/Status_UI/StatusIndicator.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/BungeeMan/Mat_BungeeMan_Rubber.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Dialogue/DialogueTest.umap (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Dialogue/NPCTest.uasset (Stored with Git LFS)

View File

Binary file not shown.

BIN

Content/Environment/Test_imports/Modular_test.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Test_imports/lambert1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Plank_Long.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Plank_Short.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/lambert2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece10.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece3.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece4.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece5.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece6.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece7.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece8.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/Tutorial_modular/modularpiece9.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/lambert1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/lambert2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/tutorial_level_ceiling.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/tutorial_level_ceiling1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/tutorial_level_ceiling2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/tutorial_level_floor.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/tutorial_level_floor1.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Environment/Tutorial/tutorial_level_floor2.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Fonts/Hachicro.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Fonts/Hachicro_Font.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/attack_boost.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/attack_speed_boost.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/critical_boost.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/defense_boost.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/element_boost.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/enemy_spawn_down.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/exp_boost.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/ghost_form__physical_damage_immunity_.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/glow.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/knockback_boost.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/knockback_resistance.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/lucky_boost.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/magic_amplification.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/negative_status_resistance.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/regeneration.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Buffs/swiftness.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/attack_down.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/bleeding.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/blinded.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/confused.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/cursed__disarmed+silenced_.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/defense_down.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/disarmed.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/frozen.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/hungry.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/on_fire__burning_.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/paralyzed.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/poisoned.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/silenced.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/sleeping.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/slowed.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Debuffs/stunned.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Spells/blinding_light_spell.uasset (Stored with Git LFS) Normal file

View File

Binary file not shown.

BIN

Content/Images/Status/Spells/counterspell.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