corrected merging conflit with bp_skill_node.uasset

Merge pull request 'origin/StatsAndAttributes' (#10 ) from origin/StatsAndAttributes into master
Reviewed-on: #10
2025-12-17 23:41:18 -07:00 · 2025-12-18 05:46:36 +00:00 · 2025-12-17 19:44:37 -07:00 · 2025-12-17 18:57:04 -07:00 · 2025-12-16 23:43:43 -07:00 · 2025-12-16 16:18:25 -07:00
51 changed files with 0 additions and 0 deletions
--- a/Content/Game/Blueprints/BP_DD_Op.uasset
+++ b/Content/Game/Blueprints/BP_DD_Op.uasset
--- a/Content/Game/Blueprints/Components/PickupLogic/BP_WorldPickup_Base.uasset
+++ b/Content/Game/Blueprints/Components/PickupLogic/BP_WorldPickup_Base.uasset
--- a/Content/Game/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentBase.uasset
+++ b/Content/Game/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentBase.uasset
--- a/Content/Game/Blueprints/WBP_DragVisual.uasset
+++ b/Content/Game/Blueprints/WBP_DragVisual.uasset
--- a/Content/Game/Data/DataTables/DT_Items.uasset
+++ b/Content/Game/Data/DataTables/DT_Items.uasset
--- a/Content/Game/Data/DataTables/DT_Reagents.uasset
+++ b/Content/Game/Data/DataTables/DT_Reagents.uasset
--- a/Content/Game/Data/Structures/S_CharacterStats.uasset
+++ b/Content/Game/Data/Structures/S_CharacterStats.uasset
--- a/Content/Game/Data/Structures/S_ItemData.uasset
+++ b/Content/Game/Data/Structures/S_ItemData.uasset
--- a/Content/Game/Data/Structures/S_ReagentData.uasset
+++ b/Content/Game/Data/Structures/S_ReagentData.uasset
--- a/Content/Game/Icons/Equipment/Amulets/Amulet1.uasset
+++ b/Content/Game/Icons/Equipment/Amulets/Amulet1.uasset
--- a/Content/Game/Icons/Equipment/Chests/Chest1.uasset
+++ b/Content/Game/Icons/Equipment/Chests/Chest1.uasset
--- a/Content/Game/Icons/Equipment/Helmets/Helmet1.uasset
+++ b/Content/Game/Icons/Equipment/Helmets/Helmet1.uasset
--- a/Content/Game/Icons/Equipment/Relics/LanternOfEchos.uasset
+++ b/Content/Game/Icons/Equipment/Relics/LanternOfEchos.uasset
--- a/Content/Game/Icons/Equipment/Weapons/broadsword.uasset
+++ b/Content/Game/Icons/Equipment/Weapons/broadsword.uasset
--- a/Content/Game/Icons/Equipment/Weapons/broadsword1.uasset
+++ b/Content/Game/Icons/Equipment/Weapons/broadsword1.uasset
--- a/Content/Game/Icons/Placeholders/Amulet.uasset
+++ b/Content/Game/Icons/Placeholders/Amulet.uasset
--- a/Content/Game/Icons/Placeholders/Belt.uasset
+++ b/Content/Game/Icons/Placeholders/Belt.uasset
--- a/Content/Game/Icons/Placeholders/Boots.uasset
+++ b/Content/Game/Icons/Placeholders/Boots.uasset
--- a/Content/Game/Icons/Placeholders/Chest.uasset
+++ b/Content/Game/Icons/Placeholders/Chest.uasset
--- a/Content/Game/Icons/Placeholders/Glove.uasset
+++ b/Content/Game/Icons/Placeholders/Glove.uasset
--- a/Content/Game/Icons/Placeholders/Helmet.uasset
+++ b/Content/Game/Icons/Placeholders/Helmet.uasset
--- a/Content/Game/Icons/Placeholders/Lock.uasset
+++ b/Content/Game/Icons/Placeholders/Lock.uasset
--- a/Content/Game/Icons/Placeholders/Relic.uasset
+++ b/Content/Game/Icons/Placeholders/Relic.uasset
--- a/Content/Game/Icons/Placeholders/Ring.uasset
+++ b/Content/Game/Icons/Placeholders/Ring.uasset
--- a/Content/Game/Icons/Placeholders/Weapon.uasset
+++ b/Content/Game/Icons/Placeholders/Weapon.uasset
--- a/Content/Game/Icons/Reagents/Slime.uasset
+++ b/Content/Game/Icons/Reagents/Slime.uasset
--- a/Content/Game/UI/CharacterSheet/WBP_CharacterSheet.uasset
+++ b/Content/Game/UI/CharacterSheet/WBP_CharacterSheet.uasset
--- a/Content/Game/UI/Common/WBP_ReagentRow.uasset
+++ b/Content/Game/UI/Common/WBP_ReagentRow.uasset
--- a/Content/Game/UI/Common/WBP_RelicSlot.uasset
+++ b/Content/Game/UI/Common/WBP_RelicSlot.uasset
--- a/Content/Icons/Equipment/Gloves/Gloves.uasset
+++ b/Content/Icons/Equipment/Gloves/Gloves.uasset
--- a/Content/UI/Charactersheet/Blueprints/Components/BP_Inventory.uasset
+++ b/Content/UI/Charactersheet/Blueprints/Components/BP_Inventory.uasset
--- a/Content/UI/Charactersheet/Blueprints/Components/BP_PlayerStats.uasset
+++ b/Content/UI/Charactersheet/Blueprints/Components/BP_PlayerStats.uasset
--- a/Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_Item.uasset
+++ b/Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_Item.uasset
--- a/Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentPH.uasset
+++ b/Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentPH.uasset
--- a/Content/UI/Charactersheet/Common/WBP_EquipSlot.uasset
+++ b/Content/UI/Charactersheet/Common/WBP_EquipSlot.uasset
--- a/Content/UI/Charactersheet/Common/WBP_ItemSlot.uasset
+++ b/Content/UI/Charactersheet/Common/WBP_ItemSlot.uasset
--- a/Content/UI/Charactersheet/Common/WBP_ReagentRow.uasset
+++ b/Content/UI/Charactersheet/Common/WBP_ReagentRow.uasset
--- a/Content/UI/Charactersheet/Common/WBP_RelicSlot.uasset
+++ b/Content/UI/Charactersheet/Common/WBP_RelicSlot.uasset
--- a/Content/UI/Charactersheet/Common/WBP_StatRow.uasset
+++ b/Content/UI/Charactersheet/Common/WBP_StatRow.uasset
--- a/Content/UI/Charactersheet/WBP_CharacterSheet.uasset
+++ b/Content/UI/Charactersheet/WBP_CharacterSheet.uasset
--- a/Content/UI/Data/DataTables/DT_Items.uasset
+++ b/Content/UI/Data/DataTables/DT_Items.uasset
--- a/Content/UI/Data/DataTables/DT_Passive_Starter_Magic.uasset
+++ b/Content/UI/Data/DataTables/DT_Passive_Starter_Magic.uasset
--- a/Content/UI/Data/DataTables/DT_Passive_Starter_Melee.uasset
+++ b/Content/UI/Data/DataTables/DT_Passive_Starter_Melee.uasset
--- a/Content/UI/Data/DataTables/DT_Passive_Starter_Ranged.uasset
+++ b/Content/UI/Data/DataTables/DT_Passive_Starter_Ranged.uasset
--- a/Content/UI/Data/DataTables/PassiveNodeDetails.uasset
+++ b/Content/UI/Data/DataTables/PassiveNodeDetails.uasset
--- a/Content/UI/Data/Enums/EPassiveTypes.uasset
+++ b/Content/UI/Data/Enums/EPassiveTypes.uasset
--- a/Content/UI/Data/Structs/S_ItemData.uasset
+++ b/Content/UI/Data/Structs/S_ItemData.uasset
--- a/Content/UI/Data/Structs/Struct_Attributes.uasset
+++ b/Content/UI/Data/Structs/Struct_Attributes.uasset
--- a/Content/UI/Data/Structs/Struct_PassiveNode.uasset
+++ b/Content/UI/Data/Structs/Struct_PassiveNode.uasset
--- a/Content/UI/PassivesTree/PassiveBackground.uasset
+++ b/Content/UI/PassivesTree/PassiveBackground.uasset
--- a/Content/ExternalActors/Maps/ThirdPersonMap/A/IG/FCU1Q05J5LWSW1KZJFQM6S.uasset
+++ b/Content/ExternalActors/Maps/ThirdPersonMap/A/IG/FCU1Q05J5LWSW1KZJFQM6S.uasset
Author	SHA1	Message	Date
Zhire	c060623dfa	corrected merging conflit with bp_skill_node.uasset	2025-12-17 23:41:18 -07:00
Zhire	f964f8f5e7	Merge pull request 'origin/StatsAndAttributes' (#10 ) from origin/StatsAndAttributes into master Reviewed-on: #10	2025-12-18 05:46:36 +00:00
GitBrad	202ac662a2	Made core stats changable from BP_Inventory, fixed derived stats ordering descrepency	2025-12-17 19:44:37 -07:00
GitBrad	79e2915201	Finished Core Stats, Derived Stats and the UI Element to hold them,	2025-12-17 18:57:04 -07:00
GitBrad	2bb66696be	Added Core and Secondary stats windows, core updates when helm equipped. Next: Secondary panel	2025-12-16 23:43:43 -07:00
GitBrad	07c4e74975	Revamped attribute recalculate function, bp_inventory now handles stat change refreshing. Next: Build Character Stats & Detail Stats UI	2025-12-16 16:18:25 -07:00
GitBrad	227b719d61	Completed Removing zero-value stats next Hook Inventory into Recalculate logic	2025-12-16 13:32:58 -07:00
GitBrad	82630736a8	Finished Adding Relic stats logic to playerstats, next will Remove zero-value stats from becoming an issue	2025-12-16 00:59:18 -07:00
GitBrad	a3fc755f81	Setup logic for stats, next Implement GetEquippedRelics_ForStats	2025-12-15 20:31:36 -07:00