Commit Graph

885 Commits

Author SHA1 Message Date
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
25e9a4f4fc Updated Dialogue UI for Style Consistency 2023-05-01 05:22:56 +01:00
f7ab9a2cfb Reorganised Build Level for Easy Searchability 2023-04-30 21:25:10 +01:00
393eea2250 Updated Map to Remove Rope on Model as Impossible to Align
Rope is curved
2023-04-30 20:11:16 +01:00
cs260086
164c9f6b03 Created folder for settings UI + UI Icons
Added Icons for Play, Settings and Quit
2023-04-30 16:34:28 +01:00
MarcelHara
c5990be70c Updated MainMenu buttons to be more spaced out
Built lighting and updated mainmenu to be more spaced out
2023-04-30 15:18:58 +01:00
MarcelHara
172686eebd Updated CrystalMaterial for mainmenu crystals 2023-04-30 15:15:39 +01:00
MarcelHara
be4625da17 Imported megascans for textures and nature assets for mainmenu 2023-04-30 15:15:27 +01:00
MarcelHara
cc8f605bfa Material changes to mainmenu assets 2023-04-30 15:15:11 +01:00
MarcelHara
fab7a72b84 Updated MainMenu Scene to have a background
Added new assets to the mainmenu to make it look better behind the book
2023-04-30 15:14:59 +01:00
MarcelHara
2a35dc1ea1 Fixed Merge issues to dev 2023-04-30 13:14:32 +01:00
MarcelHara
bef17b7f04 Merge branch 'volumetric-fog' into dev
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Levels/Build.umap
2023-04-30 13:06:51 +01:00
MarcelHara
06b9586fd3 Duplicated Build for merge 2023-04-30 13:04:19 +01:00
dcab1c483f Updated Quest Text for Consistentcy 2023-04-28 05:44:07 +01:00
99f88bb31c Bugfix Combat Initialisation Calculation Failure on Tutorial 2023-04-28 05:33:08 +01:00
69dd199ad3 Updated Character to Expose Reaction Speed 2023-04-28 05:31:57 +01:00
cf433291a9 Bugfix Larger Health Values Break Health UI 2023-04-28 04:47:34 +01:00
38ffd4f339 Bugfix Force Look Pitch Not Correctly Set 2023-04-28 03:59:03 +01:00