|
|
ce4a2166c5
|
Merge remote-tracking branch 'origin/Dialogue' into dev
|
2023-05-12 23:59:18 +01:00 |
|
|
|
1254abfd0e
|
Added Inventory Notification Functionality
|
2023-05-12 23:50:30 +01:00 |
|
|
|
7a04920197
|
Merge branch 'dev' into Inventory-Notifications
|
2023-05-12 21:47:07 +01:00 |
|
|
|
b9985228d2
|
Updated Combat System for Minor Cosmetic Changes
|
2023-05-12 21:45:51 +01:00 |
|
|
|
2f582cb507
|
Updated Status Effects to Add Damage Down for Enemy & Player
|
2023-05-12 20:44:46 +01:00 |
|
|
|
0064e9a003
|
Bugfix Boss Idle Animation Not Looping
|
2023-05-12 17:06:21 +01:00 |
|
|
|
74dec9ba54
|
Bugfix Boss is Able to Move
|
2023-05-12 17:05:52 +01:00 |
|
|
|
99b1763f4f
|
Bugfix Changed Max Ammo for Resource Bars
|
2023-05-12 16:51:06 +01:00 |
|
|
|
0c237ca411
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-05-12 16:49:00 +01:00 |
|
|
|
afd166c868
|
Bugfix Camera Shake Due to Spam of Animations
|
2023-05-12 16:48:14 +01:00 |
|
Blue Probert
|
5a96e51268
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-05-12 16:36:38 +01:00 |
|
Blue Probert
|
ded3f7881c
|
Changed player maximum ammo
|
2023-05-12 16:36:14 +01:00 |
|
|
|
ec1ebc729d
|
Bugfix for Overriding Local Rotation on Character Camera
|
2023-05-12 16:32:02 +01:00 |
|
|
|
7e46657e3a
|
Added Widget for Inventory Notification
|
2023-05-12 16:27:10 +01:00 |
|
|
|
7ca0b1bd9d
|
Merge remote-tracking branch 'origin/UI_cleanup' into Inventory-Notifications
|
2023-05-12 14:47:31 +01:00 |
|
|
|
73204efa31
|
Updated Combat so that the Camera Stays Locked on During Combat
|
2023-05-12 14:38:58 +01:00 |
|
CHARLIE SEYMOUR
|
45a2b4fe6e
|
updated Inventory icon
|
2023-05-12 14:06:26 +01:00 |
|
|
|
dd72b47a6d
|
Bugfix Able to Open Inventory During Combat
|
2023-05-12 13:51:08 +01:00 |
|
EMILY TAYLOR
|
96685296c2
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-05-12 13:24:37 +01:00 |
|
EMILY TAYLOR
|
34311a8dfb
|
Added Character Icons
Boss, Merchant and Sister Icons PNGS
|
2023-05-12 13:23:43 +01:00 |
|
|
|
6373a6bdc7
|
Updated Tooltip Function to Get Correct Display Name
|
2023-05-12 13:23:18 +01:00 |
|
|
|
3aca076981
|
Updated Sisters Quest & Wrapped Text on Selections
|
2023-05-12 13:08:00 +01:00 |
|
CHARLIE SEYMOUR
|
b0f63e8416
|
updated coins UI icon
|
2023-05-12 11:37:35 +01:00 |
|
Kacper Szelest
|
e7b5127f23
|
Added talking stalegtite npc
I added the talking stalegtite NPC and added dialogue to it so the player can communicate with it.
|
2023-05-11 16:56:23 +01:00 |
|
CHARLIE SEYMOUR
|
2c22311c43
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-05-11 16:35:10 +01:00 |
|
CHARLIE SEYMOUR
|
48544d085b
|
Added UI papers + coin to UI designs
|
2023-05-11 16:35:03 +01:00 |
|
Phoebe Harris-Wilson
|
5089d7a72d
|
UI health and buff png's and cave in studios
the health and buff pngs r in the ui content folder and the team logo is in the team logo folder.
|
2023-05-11 16:31:55 +01:00 |
|
Blue Probert
|
cda1258df0
|
Added Sound Effects and Music Track.
Added 15 different sound effects and 1 song with one of the track being the full song as well as having one of each layer seperate.
|
2023-05-11 15:54:17 +01:00 |
|
MARCEL HARA
|
f4e5796f32
|
Merge pull request #37 from Games-Academy-Student-Work-22-23/qol-changes
Qol changes
|
2023-05-11 15:16:08 +01:00 |
|
MARCEL HARA
|
e687e67242
|
Added Credits to MainMenu and QOL changes
|
2023-05-11 15:14:50 +01:00 |
|
MARCEL HARA
|
3a1e065054
|
Implimented title to mainmenu
|
2023-05-11 14:51:51 +01:00 |
|
|
|
2b66a5f804
|
Updated Combat Character for Camera Clipping
Enabled Generate Overlap Events During Level Streaming
|
2023-05-11 14:39:40 +01:00 |
|
MARCEL HARA
|
a54eae08b8
|
Shadow rebuild to dev
|
2023-05-11 14:38:21 +01:00 |
|
MARCEL HARA
|
a3d232726e
|
Fixed Merging to Dev
|
2023-05-11 14:37:24 +01:00 |
|
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
|
e58cc309fa
|
Duplicated current build for new merges
|
2023-05-11 14:12:12 +01:00 |
|
MARCEL HARA
|
29b7e9c9e2
|
Fixed Merchant asset merge to dev
|
2023-05-11 14:11:08 +01:00 |
|
MARCEL HARA
|
83a9e5895e
|
Merge branch 'Texturing' into dev
# Conflicts:
# Content/Levels/Build.umap
|
2023-05-11 14:06:55 +01:00 |
|
MARCEL HARA
|
d499682a93
|
Re-duplicated build
|
2023-05-11 13:54:50 +01:00 |
|
George Taylor
|
62273aca77
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-05-11 12:17:06 +01:00 |
|
George Taylor
|
094d89bc92
|
Changed the height of the Boss Room
|
2023-05-11 12:16:18 +01:00 |
|
Rowland Rowland
|
5727ccfb73
|
Fixed collisions in final room. Added Textures to floor. Added Boss
|
2023-05-11 12:13:13 +01:00 |
|
MARCEL HARA
|
2279582438
|
Duplicated build to fix merge
|
2023-05-11 12:11:44 +01:00 |
|
EMILY TAYLOR
|
3059e56eb8
|
Added UV map for tunnel
UV Mapped tunnel
|
2023-05-11 12:10:33 +01:00 |
|
MARCEL HARA
|
acbff94bc6
|
Merge pull request #36 from Games-Academy-Student-Work-22-23/merchant-ui-nonactive
Fixed UI not being interactable
|
2023-05-11 11:57:30 +01:00 |
|
MARCEL HARA
|
5bf8d73d21
|
Fixed UI not being interactable
|
2023-05-11 11:56:03 +01:00 |
|
EMILY TAYLOR
|
0741c63162
|
Imported Shop textures
Decorated merchant shop and added textures
|
2023-05-11 11:42:41 +01:00 |
|
Rowland Rowland
|
2ef306a49c
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-05-11 11:36:10 +01:00 |
|
|
|
067bb41820
|
Bugfix Stack Overflow on Adding Reward Items
|
2023-05-11 11:27:54 +01:00 |
|
Rowland Rowland
|
15e56412fa
|
Changed final room
Changed final room to a circular arena
|
2023-05-11 11:18:24 +01:00 |
|
