Commit Graph

902 Commits

Author SHA1 Message Date
4820351159 Added Additional Combat Animation 2023-05-08 22:15:43 +01:00
4b2be1a956 Added Boss Character Animations 2023-05-08 22:00:29 +01:00
e0130ffff5 Merged Boss Character Static Meshes for Animation 2023-05-08 21:59:40 +01:00
MarcelHara
d8a4603651 Updated Merchant to fix buttons not working 2023-05-08 20:03:54 +01:00
fd7c35e2ac Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-05-08 20:02:39 +01:00
81680a2f72 Merge pull request #33 from Games-Academy-Student-Work-22-23/mainmenu-qol
Mainmenu qol
2023-05-08 20:01:15 +01:00
cfaa192304 Merge branch 'houes-modles' into dev 2023-05-08 20:00:47 +01:00
cs260086
9706c71faa Added Title.png
for book UI to be implemented as a game title
2023-05-07 23:37:09 +01:00
Alicia
6121262a97 Reimported the pendant 2023-05-07 21:24:10 +01:00
006ef56692 Merge branch 'houes-modles' into dev 2023-05-07 19:39:07 +01:00
MarcelHara
14e5549e88 Added Shadow text to display by default 2023-05-07 15:53:52 +01:00
MarcelHara
86a969c9de Replaced TempDrowpDown to MainMenu with new ones 2023-05-07 14:52:29 +01:00
cs260086
73a9fa7768 Added drop down box UI icons 2023-05-05 18:30:08 +01:00
Alicia
06a9295430 Added pendant object 2023-05-04 18:59:46 +01:00
ROWLAND ROWLAND
9e55e8f930 Merge pull request #32 from Games-Academy-Student-Work-22-23/side-area-2nd-gig
Fixed collisions. Fixed bug of respawn. Added maze
2023-05-04 18:02:18 +01:00
Rowland Rowland
8008000522 Merge remote-tracking branch 'origin/dev' into side-area-2nd-gig
# Conflicts:
#	Content/Levels/Build.umap
2023-05-04 18:01:54 +01:00
5b1abf1a70 Merge pull request #31 from Games-Academy-Student-Work-22-23/MainMenu-Creation
Main menu creation
2023-05-04 18:00:19 +01:00
Rowland Rowland
86f9810685 Fixed collisions. Fixed bug of respawn. Added maze
Side area and final area collisions fixed. Enemy falling no longer triggers respawn. Added maze for side area.
2023-05-04 17:58:13 +01:00
MARCEL HARA
b2c81bf9eb Added Shadow settings and QOL Fixes 2023-05-04 17:57:25 +01:00
Phoebe Harris-Wilson
8a7dc816ca Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-05-04 17:48:46 +01:00
Phoebe Harris-Wilson
4c68c5e7ee Elements for probertium, eis, azos and iroquid model and textures
you can find it in unreal under the assets folder and then the elements folder
2023-05-04 17:42:42 +01:00
MARCEL HARA
d69809a64e Added Resolution settings functionality 2023-05-04 17:22:01 +01:00
MARCEL HARA
49496861a0 Updated Buttons to be dropdown buttons 2023-05-04 16:29:14 +01:00
EMILY TAYLOR
c542a23f0e Added Statue and Boss Character
Created and put in content drawer:
- Statue mesh and material
- Boss Character mesh and material
2023-05-04 16:13:51 +01:00
MarcelHara
098aa0bb74 Gave buttons functionality
Play and quit works and gave settings placeholders
2023-05-04 13:56:42 +01:00
MarcelHara
a82d277a26 Updated GunEffect to fix sparks not feeling realistic 2023-05-04 13:41:18 +01:00
c7f7619e09 Bugfix Unknown Characters in Merchant Sisters Dialogue 2023-05-04 06:59:39 +01:00
2ab212324b Bugfix Choosing Another Option Other Than a Add Quest Breaks Dialogue 2023-05-04 06:59:05 +01:00
daaa624dd9 Exposed Quest Flags to Dialogue System 2023-05-04 06:31:59 +01:00
fc9597ed33 Added Starter Quests 2023-05-04 05:12:43 +01:00
23c9c5b07a Merge branch 'dev' into Quest 2023-05-04 05:05:40 +01:00
f24fcc2d25 Updated Quest System for UI 2023-05-04 05:04:37 +01:00
9bb98b314b Updated Dialogue for Optimisations and Abstraction 2023-05-04 01:42:54 +01:00
cs260086
98a2f6af98 Merge branch 'MainMenu-Creation' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into MainMenu-Creation 2023-05-03 15:07:52 +01:00
cs260086
a5c410063a Added Icon borders
Borders have been added without text for animation purposes
2023-05-03 15:07:45 +01:00
Rowland Rowland
22c004c9e0 Merge branch 'Side-Area' into dev 2023-05-02 11:50:17 +01:00
Rowland Rowland
f5e868cc27 Minor changes
Enemy health and a new cube
2023-05-02 11:49:59 +01:00
Rowland Rowland
cb1fcf7258 Added additional skeleton
Added a skeleton pointing towards side area
2023-05-02 11:47:19 +01:00
d237e6c8de Replaced Ripped Paper Image to Remove Padding 2023-05-02 11:23:35 +01:00
Rowland Rowland
d09c108b57 Changed side area and final area
Removed grey tunnel and blocked off unused area (didn't delete in case we need it later)
2023-05-02 11:21:27 +01:00
Rowland Rowland
b0d0852fbe Removed grey block
Minor level clean up
2023-05-02 11:13:48 +01:00
Rowland Rowland
69f53aa61c Added wooden bridge
Replaced white bridge with rope bridge
2023-05-02 11:13:05 +01:00
Rowland Rowland
c6669aebdb Updated 2nd group of grey blocks
Added Blue_rocks texture and repositioned them so that the player can jump up and get to the top of the level
2023-05-02 10:48:09 +01:00
Rowland Rowland
df11877377 Added textures to grey blocks
Texture grey blocks with Blue_rocks material. Don't know if this will be permanent but figured it'd be good to do in case they never get addressed.
2023-05-02 10:43:12 +01:00
Rowland Rowland
372acb7302 Changed enemy health
Lowered enemy health pool to increase pace of combat
2023-05-02 10:25:01 +01:00
Rowland Rowland
6217026ee1 Moved sign onto wall
Moved shop sign onto wall as opposed to having it float midair
2023-05-02 10:14:34 +01:00
d1f959a9dc Updated Quest & Dialogue to Add Quests from Dialogue 2023-05-02 07:16:40 +01:00
e3027fcd24 Updated Quest System for Functionality 2023-05-02 05:42:48 +01:00
MarcelHara
9295fa2fbc Imported Play,Quit,Settings icon and applied to mainmenu 2023-05-01 23:22:26 +01:00
bff44b56a7 Bugfix Able to Click Dialogue on Choice Select 2023-05-01 05:23:43 +01:00