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
9bfb07fbba
Updated DialogueNPC to Add Ids for Dialogue Paths
2023-02-09 17:01:03 +00:00
d1fab9f9a1
Updated DialogueNPC for Structs and Dialogue Paths
2023-02-09 03:12:27 +00:00
MH261677
324f062cc7
Updated EatableItems for AmmoFunctionality
...
Added ammo base functionality for using the ammo item in game
2023-02-07 00:11:00 +00:00
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
a16de31aa2
Merge remote-tracking branch 'origin/merchant-system-v4' into dev
2023-02-06 13:53:22 +00:00
d21486797d
Merge branch 'Dialogue-System' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
2023-02-06 13:53:15 +00:00
ce78e1d53b
Merge remote-tracking branch 'origin/Turn-Based-Combat' into dev
2023-02-06 13:52:46 +00:00
7f3e3cbb52
Updated DialogueNPC to Add Dialogue via Blueprints
2023-02-06 03:28:53 +00:00
6310050647
Updated DialogueNPC for Text Animation Speed Property
2023-02-06 01:13:17 +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
81d926ffb3
Updated EatableItems.cpp
...
Made it so when the players health is above 100 they cant heal anymore. (Removed healing stacking)
2023-02-04 17:56:25 +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
acefce8bbc
Added InteractNPC to Line Trace for Interact
2023-02-02 03:15:50 +00:00
5c5b915225
Updated DialogueNPC to Disable Character Movement
2023-02-02 02:39:35 +00:00
9e451d4539
Bugfix Set Mouse Input to Only Poll Yaw Movement
2023-02-02 02:19:59 +00:00
014a670ec5
Bugfix Widget Focus Not Correctly Being Set
2023-02-02 02:06:55 +00:00
3433254463
Added DialogueNPC Actor Component with Text Animation
2023-02-02 01:59:33 +00:00
7a715c2e55
Bugfix Hard Reference for GunEffect not Saving
2023-01-31 03:13:17 +00:00
7c3a9e8725
Updated Combat System to Clear Battle Log on Combat Start
2023-01-31 02:19:11 +00:00
ed0bcc7c76
Updated CombatCharacter to Spawn GunEffect onClick
2023-01-31 01:48:35 +00:00
45374da8bb
Updated Combat System to Disengage from Combat
2023-01-31 01:39:42 +00:00
5b60412cf9
Updated TurnBaseCombat to Reset Resource Values
...
Temp until resource gathering
2023-01-31 01:25:54 +00:00
b84a16e926
Updated TurnBaseCombat to Link Health Values
2023-01-31 01:21:49 +00:00
f80f5f21ef
Bugfix Action Point Count Down
2023-01-31 01:02:03 +00:00
d18c547632
Bugfix Cursor Not Hiding After Combat
2023-01-31 00:56:53 +00:00
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
3f8a2266c4
Updated InitCombat to Decrease Combat Range
2023-01-31 00:32:03 +00:00
0de2753dff
Bugfix Clicking Instantly Activates Combat
2023-01-31 00:30:45 +00:00
e91d059c56
Bugfix Enemy Runs Away when User Init Combat
2023-01-31 00:30:14 +00:00
6092c22a2b
Updated TurnBasedCombat to Link Enemy Health
2023-01-31 00:04:24 +00:00
8b2b9d56cb
Updated HoldToInitCombat for Unreal Naming Conventions
2023-01-30 23:03:50 +00:00
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
82c65b3fc4
Fix for Version Conflict
2023-01-17 08:46:31 +00:00
faf37bce52
Bugfix Collisions on Tunnel Pathways Partially Corrected
2023-01-17 05:13:02 +00:00
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
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
320a74d4bb
Added Stub for OnInteract Event
2023-01-06 13:55:38 +00:00
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
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 d365fa6327
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
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
07e7f8c70f
Added NiagaraSystem for Gun Particle Effect
2022-11-29 01:54:45 +00:00
fdfe4a660c
Bugfix Movement Not being Reenabled on Combat End
2022-11-29 00:34:47 +00:00
1300c99a3f
Added HoldToInitCombat Actor Component for Manual Combat Init
2022-11-29 00:23:15 +00:00
MH261677
120da84a3e
Updated Interaction
...
Hard coded the 6 second wait timer after testing in engine
2022-11-28 23:21:36 +00:00
MH261677
8c69f58a97
Updated BP_OPENDIAL, Interaction.cpp
...
Changed the text in the widget and gave it a little animation. Made the Wait timer in interaction changeable in the editor.
2022-11-28 23:15:41 +00:00
MH261677
b5772a024c
Updated Interaction.cpp
...
Added a wait timer to close the widget once open automatically
2022-11-28 22:52:51 +00:00
06492d69d5
Updated TurnBaseCombat for Keyboard Hotkeys
...
Crit Feedback
2022-11-24 02:49:37 +00:00
MH261677
5dce4dc603
Updated InventoryComponent
...
Added comment
2022-11-24 00:13:20 +00:00
MH261677
7140faf22b
Updated EatableItems
...
Seperated Items into functional sub-variables that do other stuff instead of just healing the player no matte the item you make
2022-11-23 00:56:33 +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
168a43d751
Updated BaseItem and ItemBPS
...
Gave both items booleans to make the code differentiate what the item does to the player.
2022-11-23 00:51:00 +00:00
c6cba80a07
Bugfix Debug Lines Marked Green on Missed Traces
2022-11-21 22:35:04 +00:00
22c13a8c25
Bugfix Movement Enabled During Combat in TBCv2
2022-11-21 22:34:33 +00:00
6a041e4621
Updated RTCombat for Shooting Accuracy via LineTrace
2022-11-21 20:59:29 +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
ba2b6b599c
Merge branch 'dev' into merchant-system
2022-11-18 19:20:20 +00:00
MH261677
7623976bd3
Updated TempCharacter
...
Cleaned Up Script 18/11/2022
2022-11-18 19:19:04 +00:00
MH261677
3572f066c1
Updated EatableItems
...
Deleted unused code
2022-11-18 18:19:14 +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
dabaf24c65
Updated RealTimeCombat Script for Action Points Regen
2022-11-17 04:52:23 +00:00
d73a0fbd83
Updated RealTimeCombat to Map Functions to Keys
2022-11-17 04:16:44 +00:00
55607a594a
Updated RealTimeCombat to Disable Cursor in Combat
2022-11-17 03:48:56 +00:00
89e9e58453
Added Base Combat Script
2022-11-17 03:47:20 +00:00
5486fdc8ab
Added Base TurnBaseCombat Script
2022-11-17 03:02:58 +00:00
9b9cc6f02b
Merge branch 'merchant-system' into Turn-Base-System
...
# Conflicts:
# Content/Blueprints/WBP_PlayerInventory.uasset
# Content/Merchant/BP_MerchantGameMode.uasset
2022-11-15 03:28:55 +00:00
MH261677
0c0876770b
Updated Inventory System
...
Added BuffJelly
2022-11-15 03:27:44 +00:00
c852de30ec
Updated TurnBaseCombat for Simple Combat AI
2022-11-15 02:02:59 +00:00
e57c99d103
Bugfix TurnBaseCombat Not Checking Resource Count
2022-11-15 01:21:47 +00:00
9d72f60208
Updated TurnBaseCombat for ResourceBar Functionality
2022-11-15 01:12:45 +00:00
MH261677
e602d83a31
Updated Inventory system for Items in UI
...
The Inventory System is working fully with the healing jelly working
2022-11-15 00:04:46 +00:00
a976775e61
Updated TurnBaseCombat for Enemy Death onHealthZero
2022-11-14 23:41:55 +00:00
521ab6c089
Updated TurnBaseCombat to End Combat onDeath
2022-11-14 23:29:16 +00:00
b20004e599
Updated TurnBaseCombat to Start Combat onCollision
2022-11-14 23:24:37 +00:00
d8dcef64e8
Merge branch 'merchant-system' into Turn-Base-System
...
# Conflicts:
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2022-11-14 22:41:33 +00:00
7be90cc087
Updated Combo List for New Combos
2022-11-14 22:40:22 +00:00
MH261677
593badeca9
Updated AllInventory BP's
...
Updated all the blueprints
2022-11-14 22:40:09 +00:00
f2857b3c57
Updated Combat_UI for Battle Log
2022-11-14 22:30:31 +00:00
MH261677
7a8dead59b
Added Default Item to test
...
Added a default item to the inventory BP.
2022-11-14 20:28:34 +00:00
MH261677
83da7265d5
Added HealingJelly Item, Added PlayerInventory
...
Added healing jelly item blueprint and started working on the playerinventory UI
2022-11-14 19:22:50 +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
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
8f0a770bfb
Removed ItemPurchaseComponent script
...
Removed the script as I am not using it for now and solely sticking to creating the inventory system and items currently.
2022-11-14 16:52:04 +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
e070b32f0e
Created BaseItem and InventoryComponent for Items
...
Created both the baseitem and inventorycomponent class to start adding in the custom items to the game.
2022-11-14 14:57:02 +00:00
b765f633d6
Bugfix Unreal Compliation Workaround for TQueues
2022-11-14 11:55:11 +00:00
bb544d2f35
Updated TurnBaseCombat for Comabat Log
2022-11-14 11:31:51 +00:00
e5af4538ea
Updated TurnBaseCombat for Code Cleanup
2022-11-14 03:24:15 +00:00
7fb9935e70
Updated TurnBaseCombat to Show Cursor
2022-11-14 03:18:50 +00:00
ce4c2294c4
Updated TurnBaseCombat for Simple Opponent AI
2022-11-14 03:15:26 +00:00
329cf183b9
Updated TurnBaseCombat for Button Functionality
2022-11-14 03:05:25 +00:00
38ab749ecc
Updated TurnBaseCombat for Combo String Validation
2022-11-14 01:11:37 +00:00
2a92b5577f
Added Interfacing to Blueprint UI via Game State
2022-11-14 00:04:44 +00:00
df51750a5e
Added Tag to Combat Test Character
2022-11-14 00:03:59 +00:00
c23bbb4f08
Added Test Combat Player Character
2022-11-14 00:02:46 +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
58db9e7459
Updated TurnBaseCombat to Reference HUD Blueprint
2022-11-13 21:41:09 +00:00
c085aae130
Refactored Variable Naming Conventions to Unreal
2022-11-13 21:41:08 +00:00
bf3b2e3837
Added Combat Test Game Mode Base
2022-11-13 21:41:07 +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
MH261677
d96c540bcf
Cleaned Up Project
...
Deleted Old enemycollision script and deleted thirdperson content
2022-11-10 10:15:43 +00:00
MH261677
25fa3d3414
Started working on Merchant Logic
...
Started to create the base merchant trigger box to start making the interaction between player and merchant npc
2022-11-10 01:09:02 +00:00
bea0e1b735
Updated TurnBaseCombat to Reference Actors
...
Grabs all actors active within scene
2022-11-09 21:24:36 +00:00
5907d5dbe8
Updated TurnBaseCombat for Switching Active Roles
...
Added Switching Active Roles and Constrained Active Action Points
2022-11-09 21:03:47 +00:00
b678c25377
Added Base TurnBasedComabat System WIP
2022-11-09 20:32:31 +00:00
MH261677
aad21aa491
Added Enemycollision script
...
Added enemy collision script and made it output the player being hit.
2022-11-07 17:40:38 +00:00
Marcel Hara
8a30db0118
Got rid of old gamemode and added new working one
2022-10-24 00:55:18 +01:00
Marcel Hara
e928b223c8
Added Thirdperson Starter Content
...
Added the third person starter content in the game so I can start making the 3rd person to 1st person switch mechanic.
2022-10-24 00:52:12 +01:00
84a326be22
Added Blank Unreal 5 Project
...
In c++ mode
2022-10-18 10:10:40 +01:00
