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
MARCEL HARA
c7d1394e98
Updated Action Mapping from Right to Left Click
2022-11-29 17:38:39 +00:00
3e93e686dd
Updated Main Menu for Merchant
2022-11-29 16:13:30 +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
cc9384a9c1
Updated BP_BuffJelly
...
Gave BuffJelly a unique ID of 1
2022-11-29 14:19:43 +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
07e7f8c70f
Added NiagaraSystem for Gun Particle Effect
2022-11-29 01:54:45 +00:00
be0766cf0c
Added EscapeToMenu Component for Escaping to Menu
2022-11-29 00:42:03 +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
26da472db8
Updated MerchantPrototype
...
Added an 8 second wait timer to the dialouge in engine
2022-11-28 23:20:55 +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
