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

115 Commits

Author SHA1 Message Date
PHILIP White
939d1e8b92 Bugfix StatusEffects Not Being Added to Player 2023-02-25 00:20:49 +00:00
PHILIP White
88323e4ea6 Updated EatableItems to Add Status Effects 2023-02-23 17:48:20 +00:00
PHILIP White
2eae4b6c0e Added Status Indicator Widget for HUD Indication 2023-02-23 03:01:21 +00:00
PHILIP White
31a6a5d98e Added StatusEffect Stub for Multiple Status Effects 2023-02-20 17:58:32 +00:00
MARCEL HARA
5e448c897d Updated Widgets to fix scaling issue 
Fixed scaling issue on all widgets to fit all monitor types
 2023-02-20 16:03:25 +00:00
MH261677
618a9509ca Updated EatableItems to add ammo {UNSTABLE} 
Added functionality to the ammo count currently unstable as need to wait for other programmer to understand why it crashes.
 2023-02-19 15:29:16 +00:00
MARCEL HARA
77c43ab3d1 Updated TempCharacter to find AI Sphere 2023-02-16 15:02:58 +00:00
MH261677
a6436c9110 Added BP_AmmoItem 
Added Ammo into the game for the player to find
 2023-02-07 00:11:19 +00:00
MH261677
797c447d47 Added Ammo Icon to Images 2023-02-06 23:51:45 +00:00
MARCEL HARA
5b4da1f02e Updated TempCharacter for Jump and Sneak 
Added A sneak function and Jump function for the character
 2023-02-06 15:26:22 +00:00
MARCEL HARA
0cf4ace43a Updated TempCharacter 
Added Jump function which is using ACharacter and started working on custom Sneak function
 2023-02-06 14:30:13 +00:00
PHILIP White
a16de31aa2 Merge remote-tracking branch 'origin/merchant-system-v4' into dev 2023-02-06 13:53:22 +00:00
MH261677
5364f92edb Updated WBP_ItemDisplay 
Item_Stack now changes to however many stacks the player has bought of the item
 2023-02-04 17:49:17 +00:00
MH261677
f4e0511f5c Updated TempCharacter blueprint 
Added a check to make sure the player is not in the shop when opening inventory
 2023-02-04 17:41:09 +00:00
PHILIP White
9e451d4539 Bugfix Set Mouse Input to Only Poll Yaw Movement 2023-02-02 02:19:59 +00:00
PHILIP White
7a715c2e55 Bugfix Hard Reference for GunEffect not Saving 2023-01-31 03:13:17 +00:00
PHILIP White
8cf4d1d52e Built Lighting for Build 2023-01-31 02:45:23 +00:00
PHILIP White
75f373e0c4 Updated Beta Level Map for Temp Jelly Assets 2023-01-31 02:15:07 +00:00
PHILIP White
a15054656e Merge branch 'dev' into Shaders 
# Conflicts:
#	Content/Levels/Top_layer_level.umap
 2023-01-31 02:04:48 +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
d9584f3b55 Removed Escape To Main Menu 2023-01-31 01:23:28 +00:00
PHILIP White
ad91d6eac7 Updated GunEffect Changed Texture from White 2023-01-31 01:02:36 +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
0de2753dff Bugfix Clicking Instantly Activates Combat 2023-01-31 00:30:45 +00:00
Marcel Hara
d658c63627 Updated WBP_ShopSelector 
Got rid of it casting from tempcharacter but instead it casts from interaction which then activates a function in interaction which activates a different function in tempcharacter
 2023-01-30 17:20:22 +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
2f22ec811f Updated Merchant_UI 
Removed things being removed from parent and transferred it from code to fix many bugs, Also fixed text being instantly displayed once you talk to the merchant again
 2023-01-26 17:41:51 +00:00
MARCEL HARA
c58d5d5592 Updated BP_OPENDIAL 
Added a custom function which gets triggered in the Interaction.cpp
 2023-01-23 17:41:30 +00:00
MH261677
b9d87ee07b Updated Unreal version to 5.1 2023-01-21 14:19:49 +00:00
PHILIP White
82c65b3fc4 Fix for Version Conflict 2023-01-17 08:46:31 +00:00
MH261677
084ad419c5 Updated TempCharacter.cpp 
Fixed double linetracing issue
 2023-01-16 23:41:22 +00:00
MH261677
355dd06aae Updated BP_ShopSelector,WBP_BuyHealing 
Added it so when you click the arrows it swaps to the different widgets and made the widget remove from viewport
 2023-01-16 21:25:18 +00:00
MH261677
6b131213a6 Created WBP_BuyBuff 
Created the buy screen for the buff jelly
 2023-01-16 21:24:24 +00:00
MH261677
77328aa887 Created WBP_BuyHealing 
Created the buy healing jelly promt and gave it functionality to trigger buyitem which triggers linetrace logic
 2023-01-16 20:42:16 +00:00
MH261677
58243e8ccc Updated BP_ShopSelector, BP_MerchantInteraction 
Added interactivity for the buttons to activate functions in the interaction.cpp
 2023-01-16 17:01:04 +00:00
MH261677
e7fa8f4c63 Updated BP_ShopSelector 
Added a close button which re-enables all the input again by calling a function in TempChar
 2023-01-15 16:14:03 +00:00
MH261677
808b567d6f Created BP_ShopSelector 
Created the widget for the item selector when you are in the shop
 2023-01-15 15:06:30 +00:00
MH261677
b4e741bfd8 Changed BP_GoldCount to BP_ImportantStats 2023-01-14 22:11:15 +00:00
MH261677
f25b0b970d Updated BP_GoldCount 
Added health value and made it reflect the players health variable
 2023-01-14 22:10:29 +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
1d6e0171c4 Created BP_GoldCount in Blueprints/Display_UI 
Started to create the GoldCounter to display the players gold
 2023-01-14 20:38:02 +00:00
MH261677
a582a05a59 Changed BP_Interaction name to BP_MerchantInteract 
Changed BP_Interaction name to BP_MerchantInteraction
 2023-01-14 20:34:38 +00:00
MH261677
9878f0f370 Updated ItemDisplay WBP 
Added an item stack to the number to start creating stackable items
 2023-01-12 13:56:02 +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
MARCEL HARA
c7d1394e98 Updated Action Mapping from Right to Left Click 2022-11-29 17:38:39 +00:00
PHILIP White
3e93e686dd Updated Main Menu for Merchant 2022-11-29 16:13:30 +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
cc9384a9c1 Updated BP_BuffJelly 
Gave BuffJelly a unique ID of 1
 2022-11-29 14:19:43 +00:00