MARCEL HARA
|
62f8aac468
|
Merge remote-tracking branch 'origin/Set-Dressing' into dev
# Conflicts:
# Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset
# Content/Levels/Build.umap
|
2023-05-11 14:19:49 +01:00 |
|
MARCEL HARA
|
83a9e5895e
|
Merge branch 'Texturing' into dev
# Conflicts:
# Content/Levels/Build.umap
|
2023-05-11 14:06:55 +01:00 |
|
Rowland Rowland
|
5727ccfb73
|
Fixed collisions in final room. Added Textures to floor. Added Boss
|
2023-05-11 12:13:13 +01:00 |
|
EMILY TAYLOR
|
3059e56eb8
|
Added UV map for tunnel
UV Mapped tunnel
|
2023-05-11 12:10:33 +01:00 |
|
EMILY TAYLOR
|
0741c63162
|
Imported Shop textures
Decorated merchant shop and added textures
|
2023-05-11 11:42:41 +01:00 |
|
Rowland Rowland
|
15e56412fa
|
Changed final room
Changed final room to a circular arena
|
2023-05-11 11:18:24 +01:00 |
|
|
|
0cb98acbb5
|
Updated Uv's on Start Area Objects
|
2023-05-11 00:21:51 +01:00 |
|
|
|
a17a80cf13
|
Applied Pendant Texture
|
2023-05-08 22:44:19 +01:00 |
|
|
|
cfaa192304
|
Merge branch 'houes-modles' into dev
|
2023-05-08 20:00:47 +01:00 |
|
Alicia
|
6121262a97
|
Reimported the pendant
|
2023-05-07 21:24:10 +01:00 |
|
|
|
006ef56692
|
Merge branch 'houes-modles' into dev
|
2023-05-07 19:39:07 +01:00 |
|
Alicia
|
06a9295430
|
Added pendant object
|
2023-05-04 18:59:46 +01:00 |
|
Rowland Rowland
|
8008000522
|
Merge remote-tracking branch 'origin/dev' into side-area-2nd-gig
# Conflicts:
# Content/Levels/Build.umap
|
2023-05-04 18:01:54 +01:00 |
|
|
|
5b1abf1a70
|
Merge pull request #31 from Games-Academy-Student-Work-22-23/MainMenu-Creation
Main menu creation
|
2023-05-04 18:00:19 +01:00 |
|
Rowland Rowland
|
86f9810685
|
Fixed collisions. Fixed bug of respawn. Added maze
Side area and final area collisions fixed. Enemy falling no longer triggers respawn. Added maze for side area.
|
2023-05-04 17:58:13 +01:00 |
|
EMILY TAYLOR
|
c542a23f0e
|
Added Statue and Boss Character
Created and put in content drawer:
- Statue mesh and material
- Boss Character mesh and material
|
2023-05-04 16:13:51 +01:00 |
|
|
|
f7ab9a2cfb
|
Reorganised Build Level for Easy Searchability
|
2023-04-30 21:25:10 +01:00 |
|
|
|
393eea2250
|
Updated Map to Remove Rope on Model as Impossible to Align
Rope is curved
|
2023-04-30 20:11:16 +01:00 |
|
MarcelHara
|
172686eebd
|
Updated CrystalMaterial for mainmenu crystals
|
2023-04-30 15:15:39 +01:00 |
|
Phoebe Harris-Wilson
|
e666ed28fb
|
Rope and talisman and textures
|
2023-04-27 18:00:30 +01:00 |
|
Rowland Rowland
|
c61d8ed9e3
|
Merge branch 'dev' into Collisions
# Conflicts:
# Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset
# Content/Levels/Build.umap
|
2023-04-27 17:51:21 +01:00 |
|
Rowland Rowland
|
4579c73929
|
Fixed collision issues
Had an issue on Monday, seems to be fixed and pushed now
|
2023-04-27 17:20:07 +01:00 |
|
Kacper Szelest
|
6c3e358460
|
Updated tunnels
I added the improved tunnels which werent in already
|
2023-04-27 16:21:21 +01:00 |
|
Kacper Szelest
|
97d0cb2505
|
Created collisions for level
Added collisions for certain objects which didnt have any
|
2023-04-27 16:15:31 +01:00 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
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
|
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 |
|
|
|
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 |
|
|
|
acbbed522b
|
Cooked New Materials for Build
|
2023-03-14 04:47:53 +00:00 |
|
George Taylor
|
d7f98039c0
|
Imported Rock Assets too General Dressing Folder
|
2023-03-13 15:57:35 +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 |
|
