MADELINE SPRUCE
db50bd002f
Put bathroomassets in
2023-11-23 10:44:38 +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
MH261677
5bdee1fbaf
Merge branch 'door-mechanic' into dev
2023-11-21 14:36:24 +00:00
MH261677
a88faa3ef8
Changed Weapon Values to their True Values
2023-11-21 14:35:54 +00:00
MH261677
55e160eb80
Finished Door opening mechanic
2023-11-21 14:31:33 +00:00
74ea72c76c
Add Custom Dialogue Graph for Dialogue Trees
2023-11-20 21:28:08 +00:00
d736224daa
Add DialogueSystemEditor Module for Tree Factory
2023-11-20 21:26:49 +00:00
c682f72afa
Add Generic Graph Plugin for Creating Custom Graph
2023-11-20 21:25:36 +00:00
a450f68d7c
Merge branch 'main' into dev
2023-11-20 19:29:58 +00:00
LOUIS HORNE
7990224334
Added Kirstians modular kit, started putting it together
2023-11-20 15:38:34 +00:00
MARCEL HARA
14c1874c53
Added Cutout to doorwall to test door opening
2023-11-20 14:58:09 +00:00
MARCEL HARA
bbcf052b04
Added Basic Door to Level
2023-11-20 14:33:33 +00:00
MARCEL HARA
83beb696f2
Added Door Interact UI with FadeIns
2023-11-20 14:33:33 +00:00
MARCEL HARA
59f813050d
Added Base Door Functionality
2023-11-20 14:33:32 +00:00
MARCEL HARA
0cf77cbcde
Got rid of old Logs in BaseWeapon
2023-11-20 14:33:31 +00:00
KRISTIAN CHARNLEY-PARR
38b8de140d
Merge pull request #7 from Games-Academy-Student-Work-23-24/Tutorial-Enviroment
...
Tutorial enviroment
2023-11-20 14:05:29 +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
932d485409
added table textures into unreal and adjusted lighting
...
added everything done over weekend into unreal
2023-11-20 12:18:06 +00:00
MARCEL HARA
ba11c7f12f
Added Door Testing Level
2023-11-20 12:06:24 +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
LOUIS HORNE
297700cc7f
Added lavalamp to bedroom
2023-11-17 10:17:43 +00:00
LOUIS HORNE
91391eafaf
Added shelves and changed lighting to tutorial
...
Added some assets and edited the lighting in the bedroom of the tutorial hit
2023-11-16 13:27:46 +00:00
6ff29fa551
Add UI for Weapon Slots
2023-11-16 10:52:19 +00:00
Marcel Hara
065984e21b
Added Appropriate Weapon Switching for Both Primary and Secondary
2023-11-14 17:43:01 +00:00
Marcel Hara
9da3eed21b
Added Primary and Secondary Tags to All Weapons
2023-11-14 17:40:28 +00:00
Marcel Hara
8886dda901
Added Weapon Saving
2023-11-14 17:00:58 +00:00
f9b0bc74c6
Update Inventory UI for Locaton & Hover Colour
2023-11-13 14:18:50 +00:00
2b238e240a
Update Inventory UI for Hover Over Effects
2023-11-13 12:44:33 +00:00
81c9df4940
Update Inventory to Update Size During Runtime
2023-11-13 12:43:44 +00:00
KRISTIAN CHARNLEY-PARR
c6575a21e2
Asset addition
...
Added target and modular
2023-11-09 15:59:27 +00:00
75c1976ec4
Merge pull request #6 from Games-Academy-Student-Work-23-24/dev
...
Dev
2023-11-09 14:33:27 +00:00
7b923429db
Merge remote-tracking branch 'origin/shotgun-creation' into dev
2023-11-09 13:33:07 +00:00
00011764c3
Add Respawn Point to Prevent Restarting Whole Level
2023-11-09 13:32:37 +00:00
ac1400019c
Merge remote-tracking branch 'origin/living-room-placeholder' into dev
2023-11-09 13:15:27 +00:00
91c3e8163b
Update AI Attack Task for Instigating Damage
2023-11-09 13:14:28 +00:00
3721fff015
Bugfix Regen Health Whilst Being Taking Damage
2023-11-09 13:13:41 +00:00
dac2f1f708
Add Health Bar for Placeholder Information
2023-11-09 12:53:33 +00:00
REBECCA WYNN
6b42f887de
added living room assets into UE5 scene
...
also adjusted light(s) in that room too
2023-11-09 12:31:56 +00:00
f56aece550
Update Crosshair for More Readability
2023-11-09 12:26:29 +00:00
9f931693b2
Add Regen Health After 5 Seconds for Placeholder Regen
2023-11-09 12:25:49 +00:00
Rebecca Wynn
d995a6f73f
added assets to folder
...
not implimented into UE yet
2023-11-09 11:43:58 +00:00
LOUIS HORNE
9af5dc3b4d
Added some more textures to the tutorial hit
...
Nearly finished the first texture pass of the bedroom
2023-11-08 18:10:56 +00:00
LOUIS HORNE
53edc72c54
Added props and textures to the tutorial Hit
...
Added carpet to the top floor - planned to only be for the bedroom but might aswell be everywhere whilst theres no other textures.
Added a bed and textured some more assets
2023-11-08 17:28:01 +00:00
Marcel Hara
4e4267cb38
ReAdded back old values. Finished Shotgun Class
2023-11-06 17:27:05 +00:00
Marcel Hara
783e7bd136
Added Full Weapon Damage Drop Off To All Guns
2023-11-06 17:21:34 +00:00
Marcel Hara
34ef5c6e40
Added a temporary weapon damage for Damage Fall Off
2023-11-06 15:58:01 +00:00
Marcel Hara
0608015705
Added editable weapon spread to all shotguns
2023-11-06 15:57:34 +00:00