Merge pull request 'Folder Restructure' (#9 ) from origin/StatsAndAttributes into master

Reviewed-on: #9
Folder Restructure
2025-12-15 22:57:32 +00:00 · 2025-12-15 15:54:57 -07:00 · 2025-12-15 21:38:11 +00:00 · 2025-12-15 14:36:27 -07:00 · 2025-12-15 18:35:56 +00:00 · 2025-12-15 11:34:12 -07:00
111 changed files with 41 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,41 @@
+# Unreal Engine auto-generated folders
+Binaries/
+DerivedDataCache/
+Intermediate/
+Saved/
+
+# Logs and temporary files
+*.log
+*.tmp
+*.obj
+*.pch
+*.sln
+*.suo
+*.xcodeproj
+*.xcworkspace
+*.VC.db
+*.VC.opendb
+
+# Backup and autosave files
+*.bak
+*.backup
+*.autosave
+
+# Build artifacts
+*.exe
+*.dll
+*.app
+*.dylib
+*.so
+
+# Ignore config backups
+Config/*.ini.bak
+
+# Ignore crash reports
+Saved/CrashReports/
+
+# Ignore local build data
+.vscode/
+.idea/
+.DS_Store
+Thumbs.db
--- a/Content/Enemies/BluePrints/BP_HostileEntity.uasset
+++ b/Content/Enemies/BluePrints/BP_HostileEntity.uasset
--- a/Content/Enemies/BluePrints/BP_OminousSphere.uasset
+++ b/Content/Enemies/BluePrints/BP_OminousSphere.uasset
--- a/Content/Enemies/BluePrints/BP_ThirdPersonCharacter1.uasset
+++ b/Content/Enemies/BluePrints/BP_ThirdPersonCharacter1.uasset
--- a/Content/Entities/Enemies/BluePrints/BP_HostileCube.uasset
+++ b/Content/Entities/Enemies/BluePrints/BP_HostileCube.uasset
--- a/Content/Entities/Enemies/BluePrints/BP_OminousSphere.uasset
+++ b/Content/Entities/Enemies/BluePrints/BP_OminousSphere.uasset
--- a/Content/Entities/Enemies/BluePrints/NewBlueprint.uasset
+++ b/Content/Entities/Enemies/BluePrints/NewBlueprint.uasset
--- a/Content/Game/Blueprints/BP_DD_Op.uasset
+++ b/Content/Game/Blueprints/BP_DD_Op.uasset
--- a/Content/Game/Blueprints/Components/BP_Inventory.uasset
+++ b/Content/Game/Blueprints/Components/BP_Inventory.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/Enums/E_EquipSlot.uasset
+++ b/Content/Game/Data/Enums/E_EquipSlot.uasset
--- a/Content/Game/Data/Enums/E_ItemCategory.uasset
+++ b/Content/Game/Data/Enums/E_ItemCategory.uasset
--- a/Content/Game/Data/Enums/E_ItemID.uasset
+++ b/Content/Game/Data/Enums/E_ItemID.uasset
--- a/Content/Game/Data/Enums/E_ReagentID.uasset
+++ b/Content/Game/Data/Enums/E_ReagentID.uasset
--- a/Content/Game/Data/Structures/S_ItemData.uasset
+++ b/Content/Game/Data/Structures/S_ItemData.uasset
--- a/Content/Game/Data/Structures/S_ItemStack.uasset
+++ b/Content/Game/Data/Structures/S_ItemStack.uasset
--- a/Content/Game/Data/Structures/S_ReagentData.uasset
+++ b/Content/Game/Data/Structures/S_ReagentData.uasset
--- a/Content/Game/Icons/Equipment/Relics/LanternOfEchos.uasset
+++ b/Content/Game/Icons/Equipment/Relics/LanternOfEchos.uasset
--- a/Content/Game/UI/Character/BP_HealthBar.uasset
+++ b/Content/Game/UI/Character/BP_HealthBar.uasset
--- a/Content/Game/UI/CharacterSheet/WBP_CharacterSheet.uasset
+++ b/Content/Game/UI/CharacterSheet/WBP_CharacterSheet.uasset
--- a/Content/Game/UI/Common/WBP_EquipSlot.uasset
+++ b/Content/Game/UI/Common/WBP_EquipSlot.uasset
--- a/Content/Game/UI/Common/WBP_ItemSlot.uasset
+++ b/Content/Game/UI/Common/WBP_ItemSlot.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/Game/UI/OnPaintOverride.uasset
+++ b/Content/Game/UI/OnPaintOverride.uasset
--- a/Content/Game/UI/PassivesTree/BP_AssetLoaderLibrary.uasset
+++ b/Content/Game/UI/PassivesTree/BP_AssetLoaderLibrary.uasset
--- a/Content/Game/UI/PassivesTree/BP_HoverText.uasset
+++ b/Content/Game/UI/PassivesTree/BP_HoverText.uasset
--- a/Content/Game/UI/PassivesTree/BP_Skill_Node.uasset
+++ b/Content/Game/UI/PassivesTree/BP_Skill_Node.uasset
--- a/Content/Game/UI/PassivesTree/Data/EPassiveTypes.uasset
+++ b/Content/Game/UI/PassivesTree/Data/EPassiveTypes.uasset
--- a/Content/Game/UI/PassivesTree/Data/Struct_Attributes.uasset
+++ b/Content/Game/UI/PassivesTree/Data/Struct_Attributes.uasset
--- a/Content/Game/UI/PassivesTree/PassiveBackground.uasset
+++ b/Content/Game/UI/PassivesTree/PassiveBackground.uasset
--- a/Content/Game/UI/PassivesTree/Resources/T_Node_Background.uasset
+++ b/Content/Game/UI/PassivesTree/Resources/T_Node_Background.uasset
--- a/Content/Game/UI/PassivesTree/Resources/T_PassivesBackground.uasset
+++ b/Content/Game/UI/PassivesTree/Resources/T_PassivesBackground.uasset
--- a/Content/Game/UI/PassivesTree/Resources/T_Skill_node_Circle_Outline.uasset
+++ b/Content/Game/UI/PassivesTree/Resources/T_Skill_node_Circle_Outline.uasset
--- a/Content/Game/UI/Struct_LineCoordPairs.uasset
+++ b/Content/Game/UI/Struct_LineCoordPairs.uasset
--- a/Content/Icons/Equipment/Amulets/Amulet1.uasset
+++ b/Content/Icons/Equipment/Amulets/Amulet1.uasset
--- a/Content/Icons/Equipment/Chests/Chest1.uasset
+++ b/Content/Icons/Equipment/Chests/Chest1.uasset
--- a/Content/Icons/Equipment/Helmets/Helmet1.uasset
+++ b/Content/Icons/Equipment/Helmets/Helmet1.uasset
--- a/Content/Icons/Equipment/Relics/LanternOfEchos.uasset
+++ b/Content/Icons/Equipment/Relics/LanternOfEchos.uasset
--- a/Content/Icons/Equipment/Weapons/broadsword.uasset
+++ b/Content/Icons/Equipment/Weapons/broadsword.uasset
--- a/Content/Icons/Equipment/Weapons/broadsword1.uasset
+++ b/Content/Icons/Equipment/Weapons/broadsword1.uasset
--- a/Content/Icons/Placeholders/Amulet.uasset
+++ b/Content/Icons/Placeholders/Amulet.uasset
--- a/Content/Icons/Placeholders/Belt.uasset
+++ b/Content/Icons/Placeholders/Belt.uasset
--- a/Content/Icons/Placeholders/Boots.uasset
+++ b/Content/Icons/Placeholders/Boots.uasset
--- a/Content/Icons/Placeholders/Chest.uasset
+++ b/Content/Icons/Placeholders/Chest.uasset
--- a/Content/Icons/Placeholders/Glove.uasset
+++ b/Content/Icons/Placeholders/Glove.uasset
--- a/Content/Icons/Placeholders/Helmet.uasset
+++ b/Content/Icons/Placeholders/Helmet.uasset
--- a/Content/Icons/Placeholders/Lock.uasset
+++ b/Content/Icons/Placeholders/Lock.uasset
--- a/Content/Icons/Placeholders/Relic.uasset
+++ b/Content/Icons/Placeholders/Relic.uasset
--- a/Content/Icons/Placeholders/Ring.uasset
+++ b/Content/Icons/Placeholders/Ring.uasset
--- a/Content/Icons/Placeholders/Weapon.uasset
+++ b/Content/Icons/Placeholders/Weapon.uasset
--- a/Content/Icons/Reagents/Slime.uasset
+++ b/Content/Icons/Reagents/Slime.uasset
--- a/Content/Player/BP_ThirdPersonCharacter.uasset
+++ b/Content/Player/BP_ThirdPersonCharacter.uasset
--- a/Content/Player/BluePrints/BP_ThirdPersonCharacter.uasset
+++ b/Content/Player/BluePrints/BP_ThirdPersonCharacter.uasset
--- a/Content/Procedural_Dungeon/SM_Arch.uasset
+++ b/Content/Procedural_Dungeon/SM_Arch.uasset
--- a/Content/Procedural_Dungeon/SM_LONGHALL.uasset
+++ b/Content/Procedural_Dungeon/SM_LONGHALL.uasset
--- a/Content/Procedural_Dungeon/SM_arch_01.uasset
+++ b/Content/Procedural_Dungeon/SM_arch_01.uasset
--- a/Content/SM_Arch.uasset
+++ b/Content/SM_Arch.uasset
--- a/Content/SM_LONGHALL.uasset
+++ b/Content/SM_LONGHALL.uasset
--- a/Content/SM_arch_01.uasset
+++ b/Content/SM_arch_01.uasset
--- a/Content/TOBeImported/SM_bench_02.uasset
+++ b/Content/TOBeImported/SM_bench_02.uasset
--- a/Content/UI/Character/BP_HealthBar.uasset
+++ b/Content/UI/Character/BP_HealthBar.uasset
--- a/Content/UI/Charactersheet/Blueprints/BP_DD_Op.uasset
+++ b/Content/UI/Charactersheet/Blueprints/BP_DD_Op.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_Base.uasset
+++ b/Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_Base.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_Reagent.uasset
+++ b/Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_Reagent.uasset
--- a/Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentBase.uasset
+++ b/Content/UI/Charactersheet/Blueprints/Components/PickupLogic/BP_WorldPickup_ReagentBase.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/Blueprints/WBP_DragVisual.uasset
+++ b/Content/UI/Charactersheet/Blueprints/WBP_DragVisual.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/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/Game/UI/PassivesTree/Data/DT_Passive_Starter_Melee.uasset
+++ b/Content/Game/UI/PassivesTree/Data/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/DT_Reagents.uasset
+++ b/Content/UI/Data/DataTables/DT_Reagents.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/Enums/E_DragArea.uasset
+++ b/Content/UI/Data/Enums/E_DragArea.uasset
--- a/Content/UI/Data/Enums/E_DragSourceType.uasset
+++ b/Content/UI/Data/Enums/E_DragSourceType.uasset
--- a/Content/UI/Data/Enums/E_EquipSlot.uasset
+++ b/Content/UI/Data/Enums/E_EquipSlot.uasset
--- a/Content/UI/Data/Enums/E_ItemCategory.uasset
+++ b/Content/UI/Data/Enums/E_ItemCategory.uasset
--- a/Content/UI/Data/Enums/E_ItemID.uasset
+++ b/Content/UI/Data/Enums/E_ItemID.uasset
--- a/Content/UI/Data/Enums/E_ReagentID.uasset
+++ b/Content/UI/Data/Enums/E_ReagentID.uasset
--- a/Content/UI/Data/Structs/S_CharacterStats.uasset
+++ b/Content/UI/Data/Structs/S_CharacterStats.uasset
--- a/Content/UI/Data/Structs/S_ItemData.uasset
+++ b/Content/UI/Data/Structs/S_ItemData.uasset
--- a/Content/UI/Data/Structs/S_ItemStack.uasset
+++ b/Content/UI/Data/Structs/S_ItemStack.uasset
--- a/Content/UI/Data/Structs/S_ReagentData.uasset
+++ b/Content/UI/Data/Structs/S_ReagentData.uasset
--- a/Content/UI/Data/Structs/Struct_Attributes.uasset
+++ b/Content/UI/Data/Structs/Struct_Attributes.uasset
--- a/Content/Game/UI/PassivesTree/Data/Struct_PassiveNode.uasset
+++ b/Content/Game/UI/PassivesTree/Data/Struct_PassiveNode.uasset
--- a/Content/UI/PassivesTree/BP_Skill_Node.uasset
+++ b/Content/UI/PassivesTree/BP_Skill_Node.uasset
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
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
GitBrad	0615dfc3ed	Merge pull request 'Fixed Reagent list not building bug.' (#7 ) from ItemLogic into master Reviewed-on: #7	2025-12-15 18:35:56 +00:00
GitBrad	ab4782d222	Fixed Reagent list not building bug.	2025-12-15 11:34:12 -07:00
GitBrad	7e61ca1e87	Merge pull request 'ItemLogic' (#6 ) from ItemLogic into master Reviewed-on: #6	2025-12-15 18:22:15 +00:00
GitBrad	3eee9abb88	Fixed reagent reorder functionality on drag and drop / pickup.	2025-12-15 11:20:45 -07:00
GitBrad	cb40c2c3a9	Fixed drop logic to drop outside inventory	2025-12-15 10:14:34 -07:00
GitBrad	482d6ba390	Implimented drop logic for reagents, added a global event for inventory refreshes "OninventoryChanged dispatcher"	2025-12-15 02:21:28 -07:00
Zhire	d8efe26c7f	Merge pull request 'EnemyLogic' (#5 ) from EnemyLogic into master Reviewed-on: #5	2025-12-15 07:45:20 +00:00
Zhire	619542f4d8	pushing the .gitignore to branch Merge branch 'master' into EnemyLogic	2025-12-15 00:43:11 -07:00
Zhire	431eb16b0f	Add .gitignore from master	2025-12-15 00:38:38 -07:00
Zhire	c17ec046eb	Add .gitignore	2025-12-15 07:34:45 +00:00
GitBrad	d913d990c2	Merge pull request 'Implimented Drop and pickup logic with unique world actors.' (#4 ) from ItemLogic into master Reviewed-on: #4	2025-12-15 07:02:09 +00:00
GitBrad	a6c9aace35	Implimented Drop and pickup logic with unique world actors.	2025-12-15 00:00:52 -07:00
Zhire	c18cb0b69a	Merge pull request 'ItemLogic' (#3 ) from ItemLogic into master Reviewed-on: #3	2025-12-15 04:57:29 +00:00
GitBrad	7ea414b628	Changed from default On Drag Drop to a custom made version of On Drag Drop	2025-12-14 21:43:35 -07:00
GitBrad	d8ff3bd531	Finished the relic section of the character sheet	2025-12-14 15:08:18 -07:00
GitBrad	8292d808d6	Fixed Ring Functionality, Rings behave as expected.	2025-12-14 10:32:27 -07:00
GitBrad	6d82a1351e	Finished Swap and placement logic for inventory and equipment	2025-12-13 21:34:34 -07:00
GitBrad	c9e6d6857e	Ploished the charactersheet, fixed inventory icons not appearing	2025-12-13 15:30:46 -07:00