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
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
edd39e5528
Updated Project Settings for Build
2022-11-15 03:48:02 +00:00
2977b84cfc
Merge pull request #3 from Games-Academy-Student-Work-22-23/dev
...
Merged Inventory System with the Turned Based Combat System
2022-11-15 03:43:01 +00:00
e5e24c848a
Updated Prototype Environment for Inventory
2022-11-15 03:40:59 +00:00
9b9cc6f02b
Merge branch 'merchant-system' into Turn-Base-System
...
# Conflicts:
# Content/Blueprints/WBP_PlayerInventory.uasset
# Content/Merchant/BP_MerchantGameMode.uasset
2022-11-15 03:28:55 +00:00
MH261677
0c0876770b
Updated Inventory System
...
Added BuffJelly
2022-11-15 03:27:44 +00:00
c852de30ec
Updated TurnBaseCombat for Simple Combat AI
2022-11-15 02:02:59 +00:00
96273d16d9
Updated Prototype Environment for TurnBaseCombat
2022-11-15 01:45:52 +00:00
dab9182814
Merge remote-tracking branch 'origin/Level' into Turn-Base-System
2022-11-15 01:35:02 +00:00
KACPER Szelest
dbe213ef77
Updated Prototype level
...
I have updated the prototype level to include the environment assets and added a small material to a big rock
2022-11-15 01:34:32 +00:00
e57c99d103
Bugfix TurnBaseCombat Not Checking Resource Count
2022-11-15 01:21:47 +00:00
KACPER Szelest
f6c59adda0
Added empty level "prototype"
...
I added an empty level called prototype to wel.. prototype on
2022-11-15 01:20:37 +00:00
KACPER Szelest
181fcd0103
Added Environment assets
...
I added some assets that could be used for the tutorial level
2022-11-15 01:18:26 +00:00
9d72f60208
Updated TurnBaseCombat for ResourceBar Functionality
2022-11-15 01:12:45 +00:00
189b6d25b8
Updated Combat UI for Resource Bars
2022-11-15 00:43:15 +00:00
MH261677
91667f89b2
Updated MerchantGameMode
...
Added a print string to tell the player to press TAB to open the inventory
2022-11-15 00:16:26 +00:00
bc090192f3
Bugfix Player Inventory for Items Rendering
2022-11-15 00:12:14 +00:00
MH261677
e602d83a31
Updated Inventory system for Items in UI
...
The Inventory System is working fully with the healing jelly working
2022-11-15 00:04:46 +00:00
a976775e61
Updated TurnBaseCombat for Enemy Death onHealthZero
2022-11-14 23:41:55 +00:00
521ab6c089
Updated TurnBaseCombat to End Combat onDeath
2022-11-14 23:29:16 +00:00
b20004e599
Updated TurnBaseCombat to Start Combat onCollision
2022-11-14 23:24:37 +00:00
c6e7dbca62
Added Prototype Gun to Player Character
2022-11-14 23:05:35 +00:00
02c14525a5
Added BungeeMan for Temp Enemy
2022-11-14 23:01:06 +00:00
d8dcef64e8
Merge branch 'merchant-system' into Turn-Base-System
...
# Conflicts:
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2022-11-14 22:41:33 +00:00
7be90cc087
Updated Combo List for New Combos
2022-11-14 22:40:22 +00:00
MH261677
593badeca9
Updated AllInventory BP's
...
Updated all the blueprints
2022-11-14 22:40:09 +00:00
f2857b3c57
Updated Combat_UI for Battle Log
2022-11-14 22:30:31 +00:00
MH261677
7a8dead59b
Added Default Item to test
...
Added a default item to the inventory BP.
2022-11-14 20:28:34 +00:00
MH261677
fe75a8c388
Created Inventory BP
...
Created the Inventory UI
2022-11-14 19:50:57 +00:00
MH261677
5ebf6a3431
Updated PlayerInventory->ItemDisplay
...
Added a placeholder jelly image to the first item and finished blueprinting and creating the itemdisplay
2022-11-14 19:47:17 +00:00
MH261677
83da7265d5
Added HealingJelly Item, Added PlayerInventory
...
Added healing jelly item blueprint and started working on the playerinventory UI
2022-11-14 19:22:50 +00:00
MH261677
a40aa57f70
Added all BP Items in the game and updated scripts
...
All Items are added in BP with the values they are meant to have. Starting to now actually implement them into the inventory UI and creating the Inventory UI
2022-11-14 17:42:26 +00:00
MH261677
785974e169
Updated TempCharacter
...
Commented the headerFile for tempcharacter.h
2022-11-14 16:58:20 +00:00
MH261677
83d4d16588
Updated BaseItem,Jelly1,Inventory Component,Temp
...
Updated all the scripts adding more functionality, Currently just added a very basic Use item and it giving the character health.
2022-11-14 16:52:57 +00:00
MH261677
8f0a770bfb
Removed ItemPurchaseComponent script
...
Removed the script as I am not using it for now and solely sticking to creating the inventory system and items currently.
2022-11-14 16:52:04 +00:00
MH261677
7699a088ae
Added Jelly1 and ItemPurchaseComponent class
...
Jelly1 is the test item i am creating and i also added a health variable for the temp character
2022-11-14 15:53:50 +00:00
MH261677
e070b32f0e
Created BaseItem and InventoryComponent for Items
...
Created both the baseitem and inventorycomponent class to start adding in the custom items to the game.
2022-11-14 14:57:02 +00:00
