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
d9584f3b55
Removed Escape To Main Menu
2023-01-31 01:23:28 +00:00
b84a16e926
Updated TurnBaseCombat to Link Health Values
2023-01-31 01:21:49 +00:00
ad91d6eac7
Updated GunEffect Changed Texture from White
2023-01-31 01:02:36 +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
KACPER Szelest
beb110a901
Added Red Jelly Asset
...
I added a red Jelly asset to be used in the merchant system as a placeholder asset
2023-01-30 22:39:29 +00:00
KACPER Szelest
f4134c478f
Added Blue Jelly asset
...
I added a blue jelly asset to be used in the merchant system
2023-01-30 22:37:15 +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
george taylor
7644f56dd2
Added modular planks for Rope Bridges into Assets Objects
...
Created four modular planks for the rope bridges that can be put together too create a longer rope bridge.
2023-01-30 18:01:07 +00:00
KACPER SZELEST
883567b250
Update readme.md
2023-01-30 17:36:13 +00:00
Rowland Rowland
1d02d5b3a3
Updated Level-Design. Hub Town 'finished'
...
Grey box 'finished'. Need to tidy up values. Likely need to update Abyss walls. Further discussion needed in regard to abyss structure.
2023-01-30 17:29:28 +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
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
Blue Probert
414e820a3e
Combat Google Doc link
...
Added a link to the Combat Google Doc to the additional resources text fil in the misc folder.
2023-01-30 15:46:31 +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
George Taylor
3011042fbd
Cave Dressing Grey Boxes
...
The grey boxes for the first level cave dressings.
2023-01-26 18:11:43 +00:00
ecae96081d
Added Geometry Collection for Destructable Components
2023-01-26 17:54:56 +00:00
Kacper Szelest
6297531eba
Updated world space
...
I moved a few objects in the world space
2023-01-26 17:43:43 +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
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
Kacper Szelest
ee0cd6cc39
Updated shader
...
I updated and added a new shader that could be better and has a slightly different effect to the original shader
2023-01-26 17:40:08 +00:00
Kacper Szelest
8e71181328
Added outline shader
...
I added a shader that adds a black outline to each object in the world to add a stylized effect to our game
2023-01-26 16:20:46 +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
c58d5d5592
Updated BP_OPENDIAL
...
Added a custom function which gets triggered in the Interaction.cpp
2023-01-23 17:41:30 +00:00
Rowland Rowland
914b7cbc96
Forgot to save
2023-01-23 17:25:24 +00:00
Rowland Rowland
949607aa23
Hub names
...
Named level assets and started wall
2023-01-23 17:24:41 +00:00
Rowland Rowland
469b585bc2
Hub area
...
Made most of the basic structure of the hub area, still need to add Town Hall and finalise abyss walls
2023-01-23 17:09:49 +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
15b56b3598
Updated Engine Version to 5.1
2023-01-23 13:35:24 +00:00
MH261677
b9d87ee07b
Updated Unreal version to 5.1
2023-01-21 14:19:49 +00:00
82c65b3fc4
Fix for Version Conflict
2023-01-17 08:46:31 +00:00
e4709f35e7
Bugfix Collision on Large Section
2023-01-17 06:34:22 +00:00
51c7bd6628
Updated Player Start Location in Tutorial
2023-01-17 05:18:44 +00:00
79661ce0a3
Merge remote-tracking branch 'origin/Music' into dev
2023-01-17 05:13:59 +00:00
3ee0964a14
Merge remote-tracking branch 'origin/Additional-Content' into dev
2023-01-17 05:13:18 +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
3efc36344b
Added Stop Behaviour in AI When in Combat
2023-01-17 04:20:07 +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
