Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
296 Commits 1 Branch 15 Tags 5.3 GiB
797c447d47
Commit Graph

45 Commits

Author SHA1 Message Date
MH261677
797c447d47 Added Ammo Icon to Images 2023-02-06 23:51:45 +00:00
MARCEL HARA
36c18382a2 Updated TempCharacter for sneaking vignette effect 
Added a Vignette effect when crouching
 2023-02-06 15:55:12 +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
14c7d6b6d7 Updated TempCharacter.cpp 
Cached the camera reference isntead of constantly casting for it
 2023-02-04 18:34:53 +00:00
MH261677
182f54a3c8 Updated TempCharacter.cpp 
Added boolean to make inventory not open when in shop
 2023-02-04 17:39:12 +00:00
PHILIP White
9e451d4539 Bugfix Set Mouse Input to Only Poll Yaw Movement 2023-02-02 02:19:59 +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
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
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
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
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
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
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
2512a4950e Updated TempCharacter.cpp 
cleared unused header file
 2022-11-29 16:40:50 +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
MH261677
783e13075c Updated TempCharacter 
Made the linetrace boolean a global in the headerfile for potential future enemy detection
 2022-11-23 00:55:55 +00:00
MH261677
49a24325ea Updated TempCharacter, WBPHealth 
Made the health and gold variables for the character blueprintable to start implimenting them into basic UI for visual representation.
 2022-11-19 20:08:00 +00:00
MH261677
cb9c2bcb27 Updated BaseItem, TempCharacter 
Removed more unused code to make the scripts more readable and optimized.
 2022-11-18 19:25:10 +00:00
MH261677
7623976bd3 Updated TempCharacter 
Cleaned Up Script 18/11/2022
 2022-11-18 19:19:04 +00:00
MH261677
811856b219 Updated InventoryComponent & TempCharacter 
Made it so the buy system is universal meaning any devs will not have to keep adding more if statements just to set the items price. It can all be done in editor now and it all handles itself in the code.
 2022-11-18 14:53:22 +00:00
MH261677
cee5188d47 Updated TempCharacter 
Updated the buy function and made it more accessible to adding other items.
 2022-11-18 13:28:22 +00:00
MH261677
900feee5a9 Updated InventoryComponent and Shop 
Fixed InventoryComponent to now work with singular items so you can purchase items from the shop!
 2022-11-18 13:07:44 +00:00
MH261677
0c0876770b Updated Inventory System 
Added BuffJelly
 2022-11-15 03:27:44 +00:00
MH261677
593badeca9 Updated AllInventory BP's 
Updated all the blueprints
 2022-11-14 22:40:09 +00:00
MH261677
a40aa57f70 Added all BP Items in the game and updated scripts 
All Items are added in BP with the values they are meant to have. Starting to now actually implement them into the inventory UI and creating the Inventory UI
 2022-11-14 17:42:26 +00:00
MH261677
83d4d16588 Updated BaseItem,Jelly1,Inventory Component,Temp 
Updated all the scripts adding more functionality, Currently just added a very basic Use item and it giving the character health.
 2022-11-14 16:52:57 +00:00
MH261677
7699a088ae Added Jelly1 and ItemPurchaseComponent class 
Jelly1 is the test item i am creating and i also added a health variable for the temp character
 2022-11-14 15:53:50 +00:00
MH261677
d29bb501c7 Updated Interaction,TempCharacter to cleanup 
I cleaned up and removed unused functions in both interaction and tempcharacter scripts.
 2022-11-13 22:21:51 +00:00
MH261677
846b21e4e9 Fixed Interaction Pop-Ups 
Interaction is now working with the merchant also added interaction class to setup this up.
 2022-11-13 16:43:01 +00:00
MH261677
eeaf52df89 Attempted to reference UserWidget 2022-11-13 03:00:21 +00:00
MH261677
4d53a2cdda Cant even get a widget to open after 4 hours 2022-11-12 18:47:13 +00:00
MH261677
cdab08dcdf Added Dialouge box for Shop 2022-11-11 23:33:37 +00:00
MH261677
f632a010a4 Refactored TempCharacter code 2022-11-11 22:21:10 +00:00
MH261677
2c7a717617 Interaction between player and merchant works. 2022-11-11 20:35:41 +00:00
MH261677
8ee792226c LineTrace works and is detecting objects. 
LineTrace works and is detecting objects from the player using the interact button. Also cleaned up some scripts and deleted unused MerchantTriggerBox script.
 2022-11-11 20:21:44 +00:00
MH261677
ca90d5fc6e Working on TraceChannel for merchant hit detect 2022-11-10 16:38:38 +00:00
MH261677
ba713ddb2e Cleaned up scripts 2022-11-10 12:57:31 +00:00
MH261677
38ab588226 Added comments on what next to do for merchant 2022-11-10 11:56:19 +00:00
MH261677
fb981ce2d6 Created Custom FP Character with custom Interact 
Created a Temp Character script and gave it functionallity, also gave it the custom keybind E so when pressed it displays a log message so I know it works. Also created a temporary gamemode for merchant level
 2022-11-10 11:52:10 +00:00