64f5d652ff
Merge remote-tracking branch 'origin/Enviroment-Art' into dev
2023-01-31 02:19:30 +00:00
75f373e0c4
Updated Beta Level Map for Temp Jelly Assets
2023-01-31 02:15:07 +00:00
a15054656e
Merge branch 'dev' into Shaders
...
# Conflicts:
# Content/Levels/Top_layer_level.umap
2023-01-31 02:04:48 +00:00
afb0429003
Merge remote-tracking branch 'origin/Beta-Level' into dev
2023-01-31 01:53:37 +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
d9584f3b55
Removed Escape To Main Menu
2023-01-31 01:23:28 +00:00
ad91d6eac7
Updated GunEffect Changed Texture from White
2023-01-31 01:02:36 +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
0de2753dff
Bugfix Clicking Instantly Activates Combat
2023-01-31 00:30:45 +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
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
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
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
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
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
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
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
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
KACPER Szelest
74a14f68c7
Added destructable objects
...
Added a few things that are able to be destroyed
2023-01-16 17:20:50 +00:00
KACPER Szelest
832efe418b
Created top layer level
...
I created the tutorial of our top layer level, where there will be a few enemies to fight and the ability of seeing what else the player will be able to do in the game
2023-01-16 17:18:32 +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
KACPER Szelest
bea8e8c396
Added new tunnels
...
Added a new tunnel asset
2023-01-16 16:16:54 +00:00
KACPER Szelest
16972db8c5
Fixed Rope Bridge asset
...
I fixed the rope bridge assets as the textures and models themselves were not looking right
2023-01-16 14:25:38 +00:00
KACPER Szelest
5333846266
Added Abyss asset
...
Added the abyss asset to be used in level creation
2023-01-16 13:52:15 +00:00
KACPER Szelest
8aa6529f8a
Added rope and metal beam
...
Added a few items to be used in level creation
2023-01-16 12:38:41 +00:00
