Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
257 Commits 1 Branch 15 Tags
Commit Graph

133 Commits

Author SHA1 Message Date
PHILIP White
7c3a9e8725 Updated Combat System to Clear Battle Log on Combat Start 2023-01-31 02:19:11 +00:00
PHILIP White
ed0bcc7c76 Updated CombatCharacter to Spawn GunEffect onClick 2023-01-31 01:48:35 +00:00
PHILIP White
45374da8bb Updated Combat System to Disengage from Combat 2023-01-31 01:39:42 +00:00
PHILIP White
5b60412cf9 Updated TurnBaseCombat to Reset Resource Values 
Temp until resource gathering
 2023-01-31 01:25:54 +00:00
PHILIP White
b84a16e926 Updated TurnBaseCombat to Link Health Values 2023-01-31 01:21:49 +00:00
PHILIP White
f80f5f21ef Bugfix Action Point Count Down 2023-01-31 01:02:03 +00:00
PHILIP White
d18c547632 Bugfix Cursor Not Hiding After Combat 2023-01-31 00:56:53 +00:00
PHILIP White
7e81387247 Merge remote-tracking branch 'origin/merchant-system-v4' into Turn-Based-Combat 
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
 2023-01-31 00:50:59 +00:00
PHILIP White
3f8a2266c4 Updated InitCombat to Decrease Combat Range 2023-01-31 00:32:03 +00:00
PHILIP White
0de2753dff Bugfix Clicking Instantly Activates Combat 2023-01-31 00:30:45 +00:00
PHILIP White
e91d059c56 Bugfix Enemy Runs Away when User Init Combat 2023-01-31 00:30:14 +00:00
PHILIP White
6092c22a2b Updated TurnBasedCombat to Link Enemy Health 2023-01-31 00:04:24 +00:00
PHILIP White
8b2b9d56cb Updated HoldToInitCombat for Unreal Naming Conventions 2023-01-30 23:03:50 +00:00
PHILIP White
cd17363421 Removed Legacy Source Code to Reduce Compilation 2023-01-30 23:03:20 +00:00
MH261677
f33c43689b Updated Interaction,TempCharacter.cpp 
Fixed being able to open the text widget while the selector is open so merchant is fully working now.
 2023-01-30 21:07:36 +00:00
Marcel Hara
63e44f47e8 Changed Interaction.cpp comment change 
Changed the ref comment
 2023-01-30 17:23:19 +00:00
Marcel Hara
11e6393726 Updated Interaction,TempCharacter.cpp 
Removed the code from TempCharacter from last commit and created a new function Inside of Interaction that activates the TempCharacter.cpp InputEnabler()
 2023-01-30 17:21:10 +00:00
MARCEL HARA
810b4b1680 TemporarilyBroken TempCharacter.cpp 
Attempted to fix the close button currently it crashes.
 2023-01-26 18:12:24 +00:00
MARCEL HARA
6faa177f96 Updated Interaction.cpp 
Referenced the two buy confirms screen so I can just hide them and cache them upon the start of the game to optimize and fix many bugs such as being able to stack the buy screens.
 2023-01-26 17:43:07 +00:00
MARCEL HARA
ddc2ef526d Updated Interaction.cpp 
Optimized more code by caching more widgets and instead of creating new widgets I am just toggling them on and off.
 2023-01-23 17:41:55 +00:00
MARCEL HARA
3f4cdf5bfa Updated Interaction.cpp 
Optimized some functions and variables by storing them in beginplay
 2023-01-23 16:14:15 +00:00
PHILIP White
82c65b3fc4 Fix for Version Conflict 2023-01-17 08:46:31 +00:00
PHILIP White
faf37bce52 Bugfix Collisions on Tunnel Pathways Partially Corrected 2023-01-17 05:13:02 +00:00
PHILIP White
41bee1b0bd Merge remote-tracking branch 'origin/merchant-system-v3' into AI-Perception 2023-01-17 04:20:15 +00:00
MH261677
cba221ec82 Merge branch 'Beta-Level' into merchant-system-v3 
# Conflicts:
#	Content/Blueprints/Combat_UI/Combat_UI.uasset
 2023-01-17 02:46:42 +00:00
MH261677
e892260e32 Updated TempCharacter.cpp 
Changed ULOG in function LineTraceLogic
 2023-01-17 01:22:38 +00:00
MH261677
084ad419c5 Updated TempCharacter.cpp 
Fixed double linetracing issue
 2023-01-16 23:41:22 +00:00
MH261677
e15a7076c4 Updated TempCharacter.cpp 
Fixed the tracedistance not defaulting back once the player exits the shop
 2023-01-16 21:25:54 +00:00
MH261677
6f28d139ac Updated Interaction.cpp 
Created camera movement functions and updating input disabler functions
 2023-01-16 20:44:47 +00:00
MH261677
3752a24eab Updated TempCharacter 
Created camera function which pans the camera to the object and raises FOV, Fixed multiple bugs to do with disabling input, Created BuyItem function which raises the TraceDistance temporarily so user can purchase at longer distances
 2023-01-16 20:44:23 +00:00
MH261677
7aa3a702d6 Updated Interaction.cpp 
Script now looks for the camera on the player making it ready to start moving the camera to the items
 2023-01-16 17:35:11 +00:00
MH261677
ab2d2118dd Updated Interaction.cpp 
Added base functionality for both functions to make camera move
 2023-01-16 17:02:12 +00:00
PHILIP White
fdd9c5debe Updated AI for Hearing Perception 2023-01-15 19:50:39 +00:00
MH261677
52639d9af6 Updated TempCharacter.cpp, Interaction.cpp 
Added a function which can be called from blueprints to re-enable all input once a button is pressed
Fixed interaction boolean to reset itself back to false to make it so player can talk to NPC again without having to restart the game to interact with it.
 2023-01-15 16:15:06 +00:00
MH261677
4fa9ca74dd Updated Interaction.cpp 
Fixed the game crashing if there isnt any WBP inputted in tempchar
 2023-01-15 16:13:11 +00:00
MH261677
43db88c107 Updated BP_GoldCount 
Made it so it shows the gold count now that you can set in the BP_TempCharacter
 2023-01-14 22:05:20 +00:00
MH261677
29c3fdcf09 Updated Interaction, TempCharacter.cpp 
Created InputDisabler functions to disable player controls when dialouge box stops to start working on merchant
 2023-01-14 20:35:49 +00:00
MH261677
cd745b086b Updated BaseItem, InventoryComponent.cpp 
Fixed an issue where the final item was not dissapearing, added item stacking so when purchasing the same item it will stack instead of being seperate instances.
 2023-01-12 15:21:32 +00:00
MH261677
3710f33e74 Updated Inventory System 
Done it so the items from the inventory now get removed when used instead of one item never being able to be removed
 2023-01-12 13:56:30 +00:00
MH261677
c107c9a490 Updated Merchant 
Fixed crash error and merchant dialouge box pops up now, Started working on item stacking
 2023-01-12 13:05:43 +00:00
PHILIP White
320a74d4bb Added Stub for OnInteract Event 2023-01-06 13:55:38 +00:00
PHILIP White
6096d5a783 Added Interactable Environment Actor Component Class 2023-01-06 13:43:39 +00:00
MARCEL HARA
87e0bb06de Bugfix TimeToInit Combat to 0.1f 2022-11-29 17:38:02 +00:00
MARCEL HARA
2512a4950e Updated TempCharacter.cpp 
cleared unused header file
 2022-11-29 16:40:50 +00:00
PHILIP White
af1813fd9a Merge branch 'merchant-system' into Turn-Base-System-V2 
# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Merchant/BP_MerchantGameMode.uasset
 2022-11-29 15:53:39 +00:00
MH261677
7199ee76a3 Updated Items 
Started to create item stacks and fix item not dissapearing bug
 2022-11-29 15:44:00 +00:00
MH261677
ff733f2ab0 Revert "Updated BaseItem.h" 
This reverts commit d365fa6327f7ab6353cefc31cf7ed58f9b504924.
 2022-11-29 14:18:05 +00:00
MH261677
d365fa6327 Updated BaseItem.h 
Changed it so no one can edit the original value ID of an item
 2022-11-29 14:16:55 +00:00
MH261677
f52ea5efb8 Overhauled Items 
Gave every single item a unique ID so no matter the item the ID will always be different
 2022-11-29 14:15:20 +00:00
MH261677
3360ea2031 Updated TempCharacter,TempCharacter.cpp 
Gave a max inventory slots of 5 for testing purposes and Refactored code in TempCharacter.cpp
 2022-11-29 12:55:46 +00:00