Compare commits

base: Zhire:0615dfc3ed871dd44bb7fb161ce44908865f9d15

Branches Tags

Zhire:master Zhire:origin/StatsAndAttributes Zhire:AddEnemySpawnersProdecuralMap

..

compare: Zhire:master

Branches Tags

Zhire:master Zhire:origin/StatsAndAttributes Zhire:AddEnemySpawnersProdecuralMap

15 Commits

0615dfc3ed ... master

Author	SHA1	Message	Date
Zhire	0c2ba2ae63	Merge pull request 'Removed dependency of tooltip widget to Skill Nodes widgets. Can now be used by other widgets.' (#13) from MigrateTooltip into master ... Reviewed-on: #13	2025-12-18 06:43:24 +00:00
Zhire	c060623dfa	corrected merging conflit with bp_skill_node.uasset	2025-12-17 23:41:18 -07:00
Zhire	d04bca8098	Removed dependency of tooltip widget to Skill Nodes widgets. Can now be used by other widgets. ... Added default constructors for blanket title/Details, as well as title/stats layout	2025-12-17 23:31:19 -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
Zhire	33752551f5	Merge pull request 'Folder Restructure' (#9) from origin/StatsAndAttributes into master ... Reviewed-on: #9	2025-12-15 22:57:32 +00:00
GitBrad	811346e744	Folder Restructure	2025-12-15 15:54:57 -07:00
GitBrad	7f867efd97	Merge pull request 'Finished item logic.' (#8) from ItemLogic into master ... Reviewed-on: #8	2025-12-15 21:38:11 +00:00
GitBrad	3a85294624	Finished item logic.	2025-12-15 14:36:27 -07:00

114 changed files with 0 additions and 0 deletions

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

Expand all files Collapse all files

BIN

Content/Enemies/BluePrints/BP_HostileEntity.uasset

Binary file not shown.

BIN

Content/Enemies/BluePrints/BP_OminousSphere.uasset

Binary file not shown.

BIN

Content/Enemies/BluePrints/BP_ThirdPersonCharacter1.uasset

Binary file not shown.

BIN

Content/Enemies/BluePrints/BP_HostileCube.uasset → Content/Entities/Enemies/BluePrints/BP_HostileCube.uasset

Binary file not shown.

BIN

Content/Entities/Enemies/BluePrints/BP_OminousSphere.uasset Normal file

Binary file not shown.

BIN

Content/Enemies/BluePrints/NewBlueprint.uasset → Content/Entities/Enemies/BluePrints/NewBlueprint.uasset

Binary file not shown.

BIN

Content/Game/Blueprints/Components/BP_Inventory.uasset

Binary file not shown.

BIN

Content/Game/Blueprints/Components/PickupLogic/BP_WorldPickup_Reagent.uasset

Binary file not shown.

BIN

Content/Game/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentPH.uasset

Binary file not shown.

BIN

Content/Game/Blueprints/DDO_ItemDrag.uasset

Binary file not shown.

BIN

Content/Game/Data/DataTables/DT_Items.uasset

Binary file not shown.

BIN

Content/Game/Data/DataTables/DT_Reagents.uasset

Binary file not shown.

BIN

Content/Game/Data/Enums/E_DragArea.uasset

Binary file not shown.

BIN

Content/Game/Data/Enums/E_DragSourceType.uasset

Binary file not shown.

BIN

Content/Game/Data/Enums/E_EquipSlot.uasset

Binary file not shown.

BIN

Content/Game/Data/Enums/E_ItemCategory.uasset

Binary file not shown.

BIN

Content/Game/Data/Enums/E_ItemID.uasset

Binary file not shown.

BIN

Content/Game/Data/Enums/E_ReagentID.uasset

Binary file not shown.

BIN

Content/Game/Data/Structures/S_ItemData.uasset

Binary file not shown.

BIN

Content/Game/Data/Structures/S_ItemStack.uasset

Binary file not shown.

BIN

Content/Game/UI/Character/BP_HealthBar.uasset

Binary file not shown.

BIN

Content/Game/UI/CharacterSheet/WBP_CharacterSheet.uasset

Binary file not shown.

BIN

Content/Game/UI/Common/WBP_EquipSlot.uasset

Binary file not shown.

BIN

Content/Game/UI/Common/WBP_ItemSlot.uasset

Binary file not shown.

BIN

Content/Game/UI/Common/WBP_ReagentRow.uasset

Binary file not shown.

BIN

Content/Game/UI/Common/WBP_RelicSlot.uasset

Binary file not shown.

BIN

Content/Game/UI/OnPaintOverride.uasset

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/BP_AssetLoaderLibrary.uasset

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/BP_HoverText.uasset

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/BP_Skill_Node.uasset

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/Data/EPassiveTypes.uasset

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/Data/Struct_Attributes.uasset

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/PassiveBackground.uasset

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/Resources/T_Node_Background.uasset

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/Resources/T_PassivesBackground.uasset

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/Resources/T_Skill_node_Circle_Outline.uasset

Binary file not shown.

BIN

Content/Game/UI/Struct_LineCoordPairs.uasset

Binary file not shown.

BIN

Content/Game/Icons/Equipment/Amulets/Amulet1.uasset → Content/Icons/Equipment/Amulets/Amulet1.uasset

Binary file not shown.

BIN

Content/Game/Icons/Equipment/Chests/Chest1.uasset → Content/Icons/Equipment/Chests/Chest1.uasset

Binary file not shown.

BIN

Content/Icons/Equipment/Gloves/Gloves.uasset Normal file

Binary file not shown.

BIN

Content/Game/Icons/Equipment/Helmets/Helmet1.uasset → Content/Icons/Equipment/Helmets/Helmet1.uasset

Binary file not shown.

BIN

Content/Game/Icons/Equipment/Relics/LanternOfEchos.uasset → Content/Icons/Equipment/Relics/LanternOfEchos.uasset

Binary file not shown.

BIN

Content/Game/Icons/Equipment/Weapons/broadsword.uasset → Content/Icons/Equipment/Weapons/broadsword.uasset

Binary file not shown.

BIN

Content/Game/Icons/Equipment/Weapons/broadsword1.uasset → Content/Icons/Equipment/Weapons/broadsword1.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Amulet.uasset → Content/Icons/Placeholders/Amulet.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Belt.uasset → Content/Icons/Placeholders/Belt.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Boots.uasset → Content/Icons/Placeholders/Boots.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Chest.uasset → Content/Icons/Placeholders/Chest.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Glove.uasset → Content/Icons/Placeholders/Glove.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Helmet.uasset → Content/Icons/Placeholders/Helmet.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Lock.uasset → Content/Icons/Placeholders/Lock.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Relic.uasset → Content/Icons/Placeholders/Relic.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Ring.uasset → Content/Icons/Placeholders/Ring.uasset

Binary file not shown.

BIN

Content/Game/Icons/Placeholders/Weapon.uasset → Content/Icons/Placeholders/Weapon.uasset

Binary file not shown.

BIN

Content/Game/Icons/Reagents/Slime.uasset → Content/Icons/Reagents/Slime.uasset

Binary file not shown.

BIN

Content/Player/BP_ThirdPersonCharacter.uasset Normal file

Binary file not shown.

BIN

Content/Player/BluePrints/BP_ThirdPersonCharacter.uasset

Binary file not shown.

BIN

Content/Procedural_Dungeon/SM_Arch.uasset Normal file

Binary file not shown.

BIN

Content/Procedural_Dungeon/SM_LONGHALL.uasset Normal file

Binary file not shown.

BIN

Content/Procedural_Dungeon/SM_arch_01.uasset Normal file

Binary file not shown.

BIN

Content/SM_Arch.uasset

Binary file not shown.

BIN

Content/SM_LONGHALL.uasset

Binary file not shown.

BIN

Content/SM_arch_01.uasset

Binary file not shown.

BIN

Content/TOBeImported/SM_bench_02.uasset

Binary file not shown.

BIN

Content/UI/Character/BP_HealthBar.uasset

Binary file not shown.

BIN

Content/Game/Blueprints/BP_DD_Op.uasset → Content/UI/Charactersheet/Blueprints/BP_DD_Op.uasset

Binary file not shown.

BIN

Content/UI/Charactersheet/Blueprints/Components/BP_Inventory.uasset Normal file

Binary file not shown.

BIN

Content/UI/Charactersheet/Blueprints/Components/BP_PlayerStats.uasset Normal file

Binary file not shown.

BIN

Content/Game/Blueprints/Components/PickupLogic/BP_WorldPickup_Base.uasset → Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_Base.uasset

Binary file not shown.

BIN

Content/Game/Blueprints/Components/PickupLogic/BP_WorldPickup_Item.uasset → Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_Item.uasset

Binary file not shown.

BIN

Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_Reagent.uasset Normal file

Binary file not shown.

BIN

Content/Game/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentBase.uasset → Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentBase.uasset

Binary file not shown.

BIN

Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentPH.uasset Normal file

Binary file not shown.

BIN

Content/Game/Blueprints/WBP_DragVisual.uasset → Content/UI/Charactersheet/Blueprints/WBP_DragVisual.uasset

Binary file not shown.

BIN

Content/UI/Charactersheet/Common/WBP_EquipSlot.uasset Normal file

Binary file not shown.

BIN

Content/UI/Charactersheet/Common/WBP_ItemSlot.uasset Normal file

Binary file not shown.

BIN

Content/UI/Charactersheet/Common/WBP_ReagentRow.uasset Normal file

Binary file not shown.

BIN

Content/UI/Charactersheet/Common/WBP_RelicSlot.uasset Normal file

Binary file not shown.

BIN

Content/UI/Charactersheet/Common/WBP_StatRow.uasset Normal file

Binary file not shown.

BIN

Content/UI/Charactersheet/WBP_CharacterSheet.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/DataTables/DT_Items.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/DataTables/DT_Passive_Starter_Magic.uasset Normal file

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/Data/DT_Passive_Starter_Melee.uasset → Content/UI/Data/DataTables/DT_Passive_Starter_Melee.uasset

Binary file not shown.

BIN

Content/UI/Data/DataTables/DT_Passive_Starter_Ranged.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/DataTables/DT_Reagents.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/DataTables/PassiveNodeDetails.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/Enums/EPassiveTypes.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/Enums/E_DragArea.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/Enums/E_DragSourceType.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/Enums/E_EquipSlot.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/Enums/E_ItemCategory.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/Enums/E_ItemID.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/Enums/E_ReagentID.uasset Normal file

Binary file not shown.

BIN

Content/Game/Data/Structures/S_CharacterStats.uasset → Content/UI/Data/Structs/S_CharacterStats.uasset

Binary file not shown.

BIN

Content/UI/Data/Structs/S_ItemData.uasset Normal file

Binary file not shown.

BIN

Content/UI/Data/Structs/S_ItemStack.uasset Normal file

Binary file not shown.

BIN

Content/Game/Data/Structures/S_ReagentData.uasset → Content/UI/Data/Structs/S_ReagentData.uasset

Binary file not shown.

BIN

Content/UI/Data/Structs/Struct_Attributes.uasset Normal file

Binary file not shown.

BIN

Content/Game/UI/PassivesTree/Data/Struct_PassiveNode.uasset → Content/UI/Data/Structs/Struct_PassiveNode.uasset

Binary file not shown.

BIN

Content/UI/PassivesTree/BP_HoverText.uasset

Binary file not shown.

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