Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
200 Commits 1 Branch 15 Tags
Commit Graph

200 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MH261677
084ad419c5 Updated TempCharacter.cpp 
Fixed double linetracing issue
 2023-01-16 23:41:22 +00:00
MH261677
e15a7076c4 Updated TempCharacter.cpp 
Fixed the tracedistance not defaulting back once the player exits the shop
 2023-01-16 21:25:54 +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
6f28d139ac Updated Interaction.cpp 
Created camera movement functions and updating input disabler functions
 2023-01-16 20:44:47 +00:00
MH261677
3752a24eab Updated TempCharacter 
Created camera function which pans the camera to the object and raises FOV, Fixed multiple bugs to do with disabling input, Created BuyItem function which raises the TraceDistance temporarily so user can purchase at longer distances
 2023-01-16 20:44:23 +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
MH261677
7aa3a702d6 Updated Interaction.cpp 
Script now looks for the camera on the player making it ready to start moving the camera to the items
 2023-01-16 17:35:11 +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
ab2d2118dd Updated Interaction.cpp 
Added base functionality for both functions to make camera move
 2023-01-16 17:02:12 +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
MH261677
52639d9af6 Updated TempCharacter.cpp, Interaction.cpp 
Added a function which can be called from blueprints to re-enable all input once a button is pressed
Fixed interaction boolean to reset itself back to false to make it so player can talk to NPC again without having to restart the game to interact with it.
 2023-01-15 16:15:06 +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
4fa9ca74dd Updated Interaction.cpp 
Fixed the game crashing if there isnt any WBP inputted in tempchar
 2023-01-15 16:13:11 +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
29c3fdcf09 Updated Interaction, TempCharacter.cpp 
Created InputDisabler functions to disable player controls when dialouge box stops to start working on merchant
 2023-01-14 20:35:49 +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
cd745b086b Updated BaseItem, InventoryComponent.cpp 
Fixed an issue where the final item was not dissapearing, added item stacking so when purchasing the same item it will stack instead of being seperate instances.
 2023-01-12 15:21:32 +00:00
MH261677
3710f33e74 Updated Inventory System 
Done it so the items from the inventory now get removed when used instead of one item never being able to be removed
 2023-01-12 13:56:30 +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
PHILIP White
320a74d4bb Added Stub for OnInteract Event 2023-01-06 13:55:38 +00:00
PHILIP White
6096d5a783 Added Interactable Environment Actor Component Class 2023-01-06 13:43:39 +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
MARCEL HARA
87e0bb06de Bugfix TimeToInit Combat to 0.1f 2022-11-29 17:38:02 +00:00
MARCEL HARA
2512a4950e Updated TempCharacter.cpp 
cleared unused header file
v0.2.0-alpha.2 		2022-11-29 16:40:50 +00:00
PHILIP White
3e93e686dd Updated Main Menu for Merchant 2022-11-29 16:13:30 +00:00