Commit Graph

888 Commits

Author SHA1 Message Date
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
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
902163d4fe Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue 2023-05-11 08:52:30 +01:00
814c2d6aaa Bugfix Quest System Not Item Matching Correctly 2023-05-11 07:40:14 +01:00
fea2ccface Updated Dialogue System to Call Custom Blueprint Functions 2023-05-11 06:32:11 +01:00
2ddb44d070 Added Sisters Pendant Quest Item for Side Quest 2023-05-11 06:15:45 +01:00
e8e4e86873 Updated Status System to Add Buff Jelly Functionality 2023-05-11 05:59:49 +01:00
d197dc4d7e Updated Both Jellies to Use New Icons 2023-05-11 05:20:58 +01:00
d79159ef8a Updated Combat Character to Have a Healing Jelly 2023-05-11 05:15:55 +01:00
f4a27fa5fe Updated StatusSystem for One Status Effect of Each Type Can be Active 2023-05-11 05:13:19 +01:00
aa2f1fabcb Updated Combat to Change the Chance to Miss Based on Enemy Type 2023-05-11 04:55:41 +01:00
88f73fe5db Updated Build for Pick Up Book & Gun Quest 2023-05-11 04:50:45 +01:00
53126c6b10 Exposed Base Damage for Enemies 2023-05-11 04:12:00 +01:00
dc9e149381 Merge remote-tracking branch 'origin/MainMenu-Creation' into dev 2023-05-11 04:02:36 +01:00
e308661c67 Removed Resource Reset on Combat Start 2023-05-11 04:01:57 +01:00
7b185adaf4 Updated Combat UI for Damage & Status Indicator, Miss Chance & Removed Battle Log 2023-05-11 04:00:03 +01:00