Commit Graph

88 Commits

Author SHA1 Message Date
2df31aa719 Bugfix Camera Clipping and Render Depth On Book & Gun 2023-04-27 03:47:24 +01:00
MH261677
a90fccd72e Updated Gun Effects to add smoke and sparks
added smoke and spark effects to the gun upon firing
2023-04-26 12:12:50 +01:00
EMILY TAYLOR
795732d147 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-24 16:07:45 +01:00
EMILY TAYLOR
58730a8573 Added Civilian Material in content drawer
Created material for Civilian Character for side quest, re-use Merchant Mesh from Merchant folder
2023-04-24 16:06:45 +01:00
George Taylor
e97ee6a9c7 Imported new beams into unreal
I updated the beams asset too have smoother edges
2023-04-24 15:54:24 +01:00
3e34ab4c5c Bugfix Bridge Massive Gap 2023-04-24 12:18:04 +01:00
2987ac3bb1 Merge remote-tracking branch 'origin/Animations' into dev 2023-04-21 14:46:12 +01:00
94f45d99c3 Added Combat UI Asset for World Space 2023-04-21 02:57:18 +01:00
Kacper Szelest
b50e9dc161 Added UI elements and collisions
I added ui elements and collisions
2023-04-20 16:46:27 +01:00
Kacper Szelest
e3c83ba4ff Added collisions to assets
I added collisions to assets
2023-04-20 16:07:17 +01:00
KACPER Szelest
9db6138385 Added river to level
I added a little river to our level
2023-04-19 22:39:51 +01:00
KACPER Szelest
6c59905e9b Created Water marterial
I created a water material to use for a little river we have in the level
2023-04-19 22:39:32 +01:00
KACPER Szelest
9c5f607b83 Updated cave level 1 objects with temp textures
I added temporary textures to the assets to have a decent looking level
2023-04-19 22:25:44 +01:00
KACPER Szelest
b88cc9dfe8 Added Temporary texture
I added a temporary texture to use for the level for testing purposes
2023-04-19 21:31:32 +01:00
KACPER Szelest
0616e21fbc Added temporary level assets 2023-04-19 21:30:10 +01:00
EMILY TAYLOR
7150d69759 Added Tutorial Assets in engine 2023-04-17 18:07:22 +01:00
985fdfa3af Updated Goat Textures 2023-04-17 17:21:45 +01:00
MARCEL HARA
fd64b18f61 Updated LOD to all crystals 2023-03-29 17:16:50 +01:00
MARCEL HARA
5e534b3af9 Updated Flashlight brightness 2023-03-29 17:16:11 +01:00
MARCEL HARA
95f81d3a10 Merge branch 'UI_implementation' into lighting-updates
# Conflicts:
#	Content/Levels/Build.umap
2023-03-29 17:08:57 +01:00
MARCEL HARA
00677164b3 Updated all lighting to whole scene
Changed the lighting and crystal placements in the starter place and the hub world
2023-03-29 17:03:00 +01:00
EMILY TAYLOR
25e20d53f7 Added Lamp Asset for Tutorial Level 2023-03-29 16:22:00 +01:00
c0ff4f6b9f Bugfix Origin on Ropebridge 2023-03-29 13:10:14 +01:00
e8c29d8004 Updated Build Map to Include Rope Bridge & More Direction 2023-03-28 04:53:13 +01:00
24d0f2b334 Added Wooden Sign to Direct Players 2023-03-28 03:11:41 +01:00
Marcel Hara
0779e31c75 Updated Positions of Items to Merchant Shop
Fixed the origin of the items and properly positioned and scaled items to make the merchant shop work fully
2023-03-16 17:18:01 +00:00
Marcel Hara
6f9f95ab9d Attempted fix widget to merchant system 2023-03-14 13:04:33 +00:00
acbbed522b Cooked New Materials for Build 2023-03-14 04:47:53 +00:00
c5409fcaa7 Removed Merchant Soft Lock for Build
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
2023-03-14 04:01:09 +00:00
b7a5d974ac Updated Build Map to Stop Goats from Colliding 2023-03-13 22:17:44 +00:00
bef31d5738 Merge branch 'environment_assets' into dev 2023-03-13 18:12:50 +00:00
George Taylor
d7f98039c0 Imported Rock Assets too General Dressing Folder 2023-03-13 15:57:35 +00:00
Charlie Seymour
2f2ecc2d76 Change AIBruh to actual model
Mesh and material changed.
2023-03-13 15:54:30 +00:00
Kacper Szelest
a67482c6d7 Merge remote-tracking branch 'origin/Tutorial-final' into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-03-13 15:45:56 +00:00
Kacper Szelest
0146e89f88 Merge remote-tracking branch 'origin/Merchant' into art-implementation
# Conflicts:
#	Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset
#	Content/Blueprints/Player/BP_MyTempCharacter.uasset
#	Content/Levels/Build.umap
#	Content/Levels/Top_layer_level.umap
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-03-13 15:35:46 +00:00
Kacper Szelest
6c3b6b1ad2 Merge remote-tracking branch 'origin/Environment-assets' into art-implementation 2023-03-13 15:29:04 +00:00
Kacper Szelest
271f0163ff Updated build level
I added crystals and lights into the level to finish the look of the tutorial.
2023-03-06 17:19:38 +00:00
GEORGE TAYLOR
144d4ab3da Imported Assets for Town Dressing into Unreal 2023-03-06 16:53:38 +00:00
Kacper Szelest
22402626a3 Added crystal assets into Build level
I added the crysta levels into the tutorial of the build level
2023-03-06 16:33:57 +00:00
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