Commit Graph

94 Commits

Author SHA1 Message Date
d36fe6fed0 Added Breakable Walls BP
Using Particles at the moment
2023-02-01 23:37:17 +00:00
e2f91a11b5 Bugfix Platform Too High to Get Across 2023-01-31 03:29:35 +00:00
8cf4d1d52e Built Lighting for Build 2023-01-31 02:45:23 +00:00
326e64e7ed Merge remote-tracking branch 'origin/Level-Design' into dev 2023-01-31 02:19:42 +00:00
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
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
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
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
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
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
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
5333846266 Added Abyss asset
Added the abyss asset to be used in level creation
2023-01-16 13:52:15 +00:00
MH261677
e7fa8f4c63 Updated BP_ShopSelector
Added a close button which re-enables all the input again by calling a function in TempChar
2023-01-15 16:14:03 +00:00
MH261677
a582a05a59 Changed BP_Interaction name to BP_MerchantInteract
Changed BP_Interaction name to BP_MerchantInteraction
2023-01-14 20:34:38 +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
KACPER Szelest
d78abda469 Added Sheep model
I added the sheep model and saved it in the correct folder, adding it in the enemy character folder
2023-01-10 16:02:43 +00:00
KACPER Szelest
1061fb0f84 Added place holder enemy
I created some new folders to organize assets, whilst also adding the enemy placeholder character
2023-01-03 14:38:26 +00:00
KACPER Szelest
0e643e81ba Create basic greybox of top layer level
I created a very blocky greybox, as both a back incase our level doesn't get finished on time, but also as a guide on what to do
2023-01-03 14:20:51 +00:00
KACPER Szelest
78651b1ce4 Created new level
I have created the Top_layer level which is where the beta level will be created and housed
2023-01-03 12:50:33 +00:00
KACPER Szelest
5d9b0b80e5 Implamented Soft wind
I have implamented the soft wind sound cue to play when a player reaches a certain area
2022-12-01 18:02:09 +00:00
KACPER Szelest
15ad639b84 Added Wind and Rope sound into the level
I've added the Wind and Rope sound into the prototype level and made it play based on player characters distance from the noise object.
2022-12-01 17:38:16 +00:00
KACPER Szelest
e2cfb63ff9 Added background ambience
I've added the background ambience into the game and made it loop.
2022-12-01 17:23:32 +00:00
MARCEL HARA
c7d1394e98 Updated Action Mapping from Right to Left Click 2022-11-29 17:38:39 +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
be0766cf0c Added EscapeToMenu Component for Escaping to Menu 2022-11-29 00:42:03 +00:00