Commit Graph

99 Commits

Author SHA1 Message Date
Emily Taylor
3982712189 Uploaded MerchantCharacter, Merchant Shop assets and Goat into engine
Goat enemy fbx and material, merchant character and material and merchant shop untextured meshes in engine.
2023-03-06 16:28:04 +00:00
Kacper Szelest
eab68734e1 Merge remote-tracking branch 'origin/Environment-assets' into Tutorial-final 2023-03-06 16:17:18 +00:00
GEORGE TAYLOR
57c97bfaa5 Imported General Dressing Assets too Unreal
Imported assets used for general dressing into a new folder in unreal.
2023-03-06 16:17:15 +00:00
b532eaaa4e Merge remote-tracking branch 'origin/Hub-level-blockout' into dev 2023-03-06 16:11:37 +00:00
Kacper Szelest
1f9e1c3f93 Updated build level
I added a collision to one object in the build level
2023-03-06 16:08:35 +00:00
GEORGE TAYLOR
f4f8edb6eb Imported the crystal assets to Unreal 2023-03-06 15:42:52 +00:00
Emily Taylor
c4a668c2e9 Added Merchant Shop assets
Added Merchant shop FBX
2023-03-06 15:31:55 +00:00
d100a85a0d Updated Combat to Set Camera to Face Enemy 2023-03-06 04:28:13 +00:00
KACPER Szelest
c67bdf6c9c Updated build level with extra meshes
I added a few meshes to create tunnels and a cavern in one of our levels to create a better feeling of being in a cavey abyss
2023-03-04 19:10:12 +00:00
KACPER Szelest
ffac8b483f Updated build level with outline material and wall
I added the big wall in to the build level and added some outlines into the level
2023-03-03 21:10:47 +00:00
Rowland Rowland
74a6e239e8 Added enemies and fixed asset collision 2023-03-03 18:51:29 +00:00
Kacper Szelest
f1e775dfa1 Updated build level
Fixed up the tutorial level so it looks a bit better
2023-03-03 18:32:42 +00:00
Kacper Szelest
87c2833381 Added a crystal asset
Added a crystal asset to use for level dressing
2023-03-03 18:25:52 +00:00
Kacper Szelest
26c93284d0 Updated build level
Added a few dressing assets and dressed the level
2023-03-03 18:13:30 +00:00
Kacper Szelest
2b0567ab6e Added collisions to blockout level
I added collisions to all assets in the blockout level to be used in testing
2023-03-03 15:47:45 +00:00
9845639e8c Merge branch 'dev' into ui-art-replacement 2023-02-28 15:26:27 +00:00
8e5416e3a9 Merge branch 'dev' into Modular-Kit
# Conflicts:
#	Content/Levels/Top_layer_level.umap
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-02-28 15:25:47 +00:00
Emily Taylor
2a4300066c Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss 2023-02-28 13:18:35 +00:00
Emily Taylor
1958eabc3d Added Goat Enemy for Tutorial Level
Goat FBX and materials ready for rigging and importing to engine
2023-02-28 13:18:14 +00:00
MARCEL HARA
1ead32f0c8 Added InventoryImage to Inventory UI 2023-02-27 17:45:58 +00:00
George Taylor
37dad4c873 Imported Beam Assets into Unreal
i Imported the beam assets from maya into the unreal engine 5
2023-02-27 16:12:18 +00:00
George Taylor
f2c69dfe3a Added the assets for the Tutorial Level to Unreal 2023-02-27 15:44:19 +00:00
George Taylor
a43ed3a626 Added the Wooden Texture for the Tutorial Assets 2023-02-27 15:43:18 +00:00
Kacper Szelest
177a4f685f Added and made Level 1 Blockout assets
I added and put implamented the level 1 blockout assets and created the blockout level for it.
2023-02-20 14:48:45 +00:00
d36fe6fed0 Added Breakable Walls BP
Using Particles at the moment
2023-02-01 23:37:17 +00:00
7a715c2e55 Bugfix Hard Reference for GunEffect not Saving 2023-01-31 03:13:17 +00:00
64f5d652ff Merge remote-tracking branch 'origin/Enviroment-Art' into dev 2023-01-31 02:19:30 +00:00
afb0429003 Merge remote-tracking branch 'origin/Beta-Level' into dev 2023-01-31 01:53:37 +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
George Taylor
3011042fbd Cave Dressing Grey Boxes
The grey boxes for the first level cave dressings.
2023-01-26 18:11:43 +00:00
e4709f35e7 Bugfix Collision on Large Section 2023-01-17 06:34:22 +00:00
faf37bce52 Bugfix Collisions on Tunnel Pathways Partially Corrected 2023-01-17 05:13:02 +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
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
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