Commit Graph

246 Commits

Author SHA1 Message Date
MH261677
797c447d47 Added Ammo Icon to Images 2023-02-06 23:51:45 +00:00
Rowland Rowland
30d22975b7 Updated Level
Added textures and began experimenting with curves. Planning to investigate Splines
2023-02-06 17:24:41 +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
dc7e9c8c15 Merge branch 'Interactable-Environment' into dev 2023-02-06 13:52:20 +00:00
7f3e3cbb52 Updated DialogueNPC to Add Dialogue via Blueprints 2023-02-06 03:28:53 +00:00
e5b624411d Updated TextPrompt for Choices 2023-02-06 03:27:49 +00:00
MH261677
5364f92edb Updated WBP_ItemDisplay
Item_Stack now changes to however many stacks the player has bought of the item
2023-02-04 17:49:17 +00:00
MH261677
f4e0511f5c Updated TempCharacter blueprint
Added a check to make sure the player is not in the shop when opening inventory
2023-02-04 17:41:09 +00:00
acefce8bbc Added InteractNPC to Line Trace for Interact 2023-02-02 03:15:50 +00:00
9e451d4539 Bugfix Set Mouse Input to Only Poll Yaw Movement 2023-02-02 02:19:59 +00:00
3433254463 Added DialogueNPC Actor Component with Text Animation 2023-02-02 01:59:33 +00:00
5988272890 Added Base Text Prompt Widget Blueprint 2023-02-01 23:47:59 +00:00
42ce95b84e Added Dialogue Testing Map with Temp NPC 2023-02-01 23:47:22 +00:00
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
7a715c2e55 Bugfix Hard Reference for GunEffect not Saving 2023-01-31 03:13:17 +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
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
KACPER Szelest
27d51210ec Added new cave tunnel 2023-01-16 12:03:29 +00:00
KACPER Szelest
4a14dbe384 Added countertop asset
Added a countertop asset to be used with the merchant system
2023-01-16 11:52:50 +00:00
KACPER Szelest
db170e9ff5 Added Shelf Object
Added a shelf object to be paired with the merchant system
2023-01-16 11:46:32 +00:00
KACPER Szelest
a3de58b063 Added Stalegtite asset
Added stalegtite asset to be used to build our level
2023-01-16 11:38:50 +00:00
KACPER Szelest
55ebd7d779 Added Glass material
I added a new glass material into unreal because the one from blender didn't work
2023-01-16 11:36:08 +00:00
KACPER Szelest
6319ab9f8a Added science buildings
Added a few science buildings in order to build our level
2023-01-16 11:27:16 +00:00
KACPER Szelest
c5ce519fae Added rope bridge modular pack
I added the rope bridge modular pack to allow us to create long rope bridges and connect them wherever we want
2023-01-16 11:24:18 +00:00
KACPER Szelest
45eae63b76 Added Cave tunnel modular assets
I added multiple cave tunnels to allow us to create a level placing parts of tunnels down to make it
2023-01-16 11:23:43 +00:00
fdd9c5debe Updated AI for Hearing Perception 2023-01-15 19:50:39 +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
808b567d6f Created BP_ShopSelector
Created the widget for the item selector when you are in the shop
2023-01-15 15:06:30 +00:00
MH261677
b4e741bfd8 Changed BP_GoldCount to BP_ImportantStats 2023-01-14 22:11:15 +00:00
MH261677
f25b0b970d Updated BP_GoldCount
Added health value and made it reflect the players health variable
2023-01-14 22:10:29 +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
1d6e0171c4 Created BP_GoldCount in Blueprints/Display_UI
Started to create the GoldCounter to display the players gold
2023-01-14 20:38:02 +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
9878f0f370 Updated ItemDisplay WBP
Added an item stack to the number to start creating stackable items
2023-01-12 13:56:02 +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
28bdc5b3f9 Added soft wind sound effect and cue
Added a soft wind sound effect and cue into the files
2022-12-01 17:52:24 +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
ad1aa0c50b Added Wind and rope sound effect
I have added the wind and rope sound effect into the game files and created a sound cue for them.
2022-12-01 17:26:37 +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
KACPER Szelest
ee339fc71b Added cave ambience asset
I have added a file that I can loop to create a sense of dread and horror. It is loopable.
2022-12-01 17:15:02 +00:00