Commit Graph

50 Commits

Author SHA1 Message Date
69dd199ad3 Updated Character to Expose Reaction Speed 2023-04-28 05:31:57 +01:00
9199db00df Bugfix Merchant Unable to Interact 2023-04-28 01:40:49 +01:00
15d2734c52 Bugfix Pointer Retaining Position After Combat Has Ended 2023-04-26 03:51:17 +01:00
18ceedfa03 Updated Character to Convert Screen Space to World for Interaction 2023-04-24 18:01:51 +01:00
3e34ab4c5c Bugfix Bridge Massive Gap 2023-04-24 12:18:04 +01:00
3f5c7bcf1c Bugfix Merchant Unable to Purchase Items 2023-03-28 03:43:31 +01:00
MH261677
093825dc0d Potential fix for merchant system UI
** POTENTIALLY FIXED NEED TO TEST**
2023-03-16 14:49:17 +00:00
Marcel Hara
6f9f95ab9d Attempted fix widget to merchant system 2023-03-14 13:04:33 +00:00
Marcel Hara
17df5728d9 Added WBP_Maps,WBP_Settings to MainMenuWidg
Added new widgets and now adding functionaity to escape button to make it close and re-open the menu
2023-03-06 17:27:16 +00:00
b16f632537 Updated Combat to Hide Gold & Health Text 2023-03-06 05:25:36 +00:00
d100a85a0d Updated Combat to Set Camera to Face Enemy 2023-03-06 04:28:13 +00:00
MH261677
4357537009 Updated TempCharacter to create NoiseEmitter
Got the NoiseEmitter component and then used the makenoise function to make it create noise everytime the player walks
2023-03-05 17:41:39 +00:00
9b0ef82e7c Updated TurnBasedCombat to Include New Combos 2023-02-27 04:07:19 +00:00
MH261677
3c2d057951 Updated TempCharacter to destory ammo ore
destroys ammo ore when the player presses e on it
2023-02-19 15:28:34 +00:00
MH261677
43ef8e2110 Updated TempCharacter to sneak functionality
Added sneak functionality which makes the sphere radius smaller near enemies.
2023-02-17 13:12:28 +00:00
MARCEL HARA
77c43ab3d1 Updated TempCharacter to find AI Sphere 2023-02-16 15:02:58 +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
MH261677
182f54a3c8 Updated TempCharacter.cpp
Added boolean to make inventory not open when in shop
2023-02-04 17:39:12 +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
MARCEL HARA
3f4cdf5bfa Updated Interaction.cpp
Optimized some functions and variables by storing them in beginplay
2023-01-23 16:14:15 +00:00
faf37bce52 Bugfix Collisions on Tunnel Pathways Partially Corrected 2023-01-17 05:13:02 +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
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
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
2a590c3e33 Updated InventoryComponent,TempCharacter
Commented InventoryComponent to understand logic easier and removed unused functions from TempCharacter
2022-11-29 12:43:58 +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
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
785974e169 Updated TempCharacter
Commented the headerFile for tempcharacter.h
2022-11-14 16:58:20 +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
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
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