|
6bc5cd7846
|
Update Project Settings for Description & Icon
|
2024-05-14 09:27:47 +01:00 |
|
Louis Horne
|
263caaffad
|
Merge art Appartment branch into art Miami branch
|
2024-05-01 01:30:40 +01:00 |
|
MH261677
|
a7a325a775
|
Merge branch 'city-creation' into dev
|
2024-04-10 12:27:06 +01:00 |
|
KRISTIAN CHARNLEY-PARR
|
9c4f51c49b
|
Adding road and workbench
|
2024-03-22 14:37:24 +00:00 |
|
|
aa23ea1223
|
Update Dialogue, Character, Inventory for Dialogue Requirements Check
|
2024-03-22 09:39:18 +00:00 |
|
Rafal Swierczek
|
3c61bae18f
|
Created Copy of Greasy Ricks Dialogue
|
2024-03-22 01:02:19 +00:00 |
|
|
82de3a9342
|
Merge remote-tracking branch 'origin/Green-Light/Rafals-Branch' into AI
# Conflicts:
# EndlessVendetta/Content/FirstPerson/Blueprints/BaseWeapons/WBP_NeedReloadText.uasset
|
2024-02-29 03:49:49 +00:00 |
|
|
c7a52e42a5
|
Update HUD for Crosshair Change, Health & Stamina Redesign
|
2024-02-29 02:13:53 +00:00 |
|
KRISTIAN CHARNLEY-PARR
|
48cf609d31
|
Sand_pistol
Sand and pistol added to asset folder
|
2024-02-28 13:29:22 +00:00 |
|
LEO LANE
|
8026cfeb1e
|
Fish added to folder
mmm png fish
|
2024-02-27 11:10:00 +00:00 |
|
LOUIS HORNE
|
9612ac9f7b
|
Added Smaller wall pieces
|
2024-01-11 11:11:12 +00:00 |
|
LOUIS HORNE
|
7b5aff2f60
|
Merge remote-tracking branch 'origin/LevelDesign2' into Tutorial-Enviroment
# Conflicts:
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/cofffee_table/coffee_table_re.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/side_table/side_table_bl.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/ceiling_light_02/ceiling_light_02_orange.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/lamp_01/lamp_01_orange.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_01/wall_light_01_orange.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/lights_textures/wall_light_02/wall_light_02_orange.uasset
# EndlessVendetta/Content/Levels/TrainingFacility.umap
# EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
|
2024-01-10 09:20:56 +00:00 |
|
KRISTIAN CHARNLEY-PARR
|
0abb21c503
|
Pistol
Added Pistol
|
2024-01-04 10:06:03 +00:00 |
|
MADELINE SPRUCE
|
ebdbafcaad
|
Added bathroom assets and textures
|
2023-12-11 12:40:25 +00:00 |
|
REBECCA WYNN
|
52f1869b6e
|
Added textured sofa and adjusted living room layout
added lights to livingroom
|
2023-11-27 13:09:50 +00:00 |
|
|
69bf3555e3
|
Merge remote-tracking branch 'origin/Tutorial-Enviroment' into dev
# Conflicts:
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Button.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Seat.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/Toilet.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/lambert1.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Bathroom/standardSurface5.uasset
# EndlessVendetta/Content/Assets/Objects/Tutorial-Level/Textures/M_Carpet.uasset
# EndlessVendetta/Content/Levels/TrainingFacility.umap
# EndlessVendetta/Content/StarterContent/Architecture/Floor_400x400.uasset
# EndlessVendetta/Content/StarterContent/Materials/M_Wood_Pine.uasset
# EndlessVendetta/Content/StarterContent/Materials/M_Wood_Walnut.uasset
|
2023-11-27 02:03:30 +00:00 |
|
|
c9d5ab73a6
|
Merge remote-tracking branch 'origin/asset-lights' into dev
|
2023-11-27 01:22:33 +00:00 |
|
MADELINE SPRUCE
|
39e71ac8f7
|
Added mirror to assets folder
|
2023-11-23 09:47:32 +00:00 |
|
MADELINE SPRUCE
|
84df2436da
|
Added bathroom assets to assets folder
|
2023-11-23 09:43:38 +00:00 |
|
KRISTIAN CHARNLEY-PARR
|
7a2156df26
|
Modular assets added
|
2023-11-20 14:04:24 +00:00 |
|
MADELINE SPRUCE
|
ae3341083b
|
Put toilet in asset folder
|
2023-11-20 12:40:36 +00:00 |
|
Rebecca Wynn
|
b0a3bf453d
|
uploading textures to Assets folder (notUE5)
forgot to incl. in previous push, side table/coffee table textures
|
2023-11-20 11:41:41 +00:00 |
|
Rebecca Wynn
|
27743e896b
|
update LR models with Uvs
tranfered form laptop so i can work from uni computers
|
2023-11-20 11:38:35 +00:00 |
|
KRISTIAN CHARNLEY-PARR
|
c6575a21e2
|
Asset addition
Added target and modular
|
2023-11-09 15:59:27 +00:00 |
|
Rebecca Wynn
|
d995a6f73f
|
added assets to folder
not implimented into UE yet
|
2023-11-09 11:43:58 +00:00 |
|
KRISTIAN CHARNLEY-PARR
|
15b73d8749
|
Added fridge asset
|
2023-10-19 09:58:54 +01:00 |
|