Commit Graph

920 Commits

Author SHA1 Message Date
0667273c45 Bugfix Collisions, UV's & Replaced Boss with Actual Boss 2023-05-13 00:13:42 +01:00
22c5f8163b Merge remote-tracking branch 'origin/Set-Dressing-2' into dev 2023-05-13 00:00:31 +01:00
8d096d7e36 Merge remote-tracking branch 'origin/UI_cleanup' into dev 2023-05-12 23:59:48 +01:00
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
CHARLIE SEYMOUR
4e628f6855 added pendant UI icon + version with background layer 2023-05-12 16:39:36 +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
Rowland Rowland
f2b64ba183 Just in case
Boss room uv fix v2 just incase
2023-05-12 16:18:01 +01:00
Rowland Rowland
eb5871c5ed Added boss room and 'fixed' collisions
Collisons are EXTREMELY broken so I've moved the boss to be closer to the entrance of the room
2023-05-12 16:09:03 +01:00
CHARLIE SEYMOUR
e6d2d58bdc Added boss room fbx to be altered 2023-05-12 15:21:51 +01:00
Rowland Rowland
fe3d05ca25 Added rock assets and additonal enemies in the last cave corridor 2023-05-12 14:53:50 +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
Rowland Rowland
fd26944e0c Added resource assets into level 2023-05-12 13:12:42 +01:00
3aca076981 Updated Sisters Quest & Wrapped Text on Selections 2023-05-12 13:08:00 +01:00
George Taylor
9202c667b9 Fixed the UV's of the boss room
I fixed the Uv's of the boss room too allow for them too be properly textured
2023-05-12 12:41:33 +01:00
Rowland Rowland
987e23ab50 Placed mushrooms and added lights
Placed the mushrooms and made them give of light to guide the player through the cavern
2023-05-12 12:13:34 +01:00
CHARLIE SEYMOUR
b0f63e8416 updated coins UI icon 2023-05-12 11:37:35 +01:00
Rowland Rowland
7d0694860d Finished adding statues 2023-05-12 11:25:49 +01:00
Rowland Rowland
0c40d58104 Rebuilt lighting
Rebuilt the lighting which allegedly changed a bunch of things that needed saving.
2023-05-12 11:22:41 +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
Rowland Rowland
9461216e4b Adding Statues 2023-05-11 16:49:25 +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
George Taylor
4fedf04054 Merge branch 'Set-Dressing-2' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into Set-Dressing-2 2023-05-11 16:11:51 +01:00
George Taylor
a7604a3f09 Changed the rope bridge assets
I changed the rope bridge assets too have a dip in them instead of just being flat
2023-05-11 16:11:33 +01:00
Rowland Rowland
720082090e Added statue 2023-05-11 16:08:08 +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
Rowland Rowland
9d1f9c1d78 Added boss room again
Readded boss room after merge errors
2023-05-11 15:46:02 +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