Commit Graph

920 Commits

Author SHA1 Message Date
MarcelHara
b3c83f161f Updated TempCharacter to stop crashes 2023-05-09 12:50:34 +01:00
6d8a4c82b0 Updated Dialogue for User Experience Improvements
In dialogue make arrow only appear when the animation is finished, Made things Bigger
2023-05-09 06:05:59 +01:00
487c46d7b8 Updated Combat System to Include Healing During Combat 2023-05-09 05:40:31 +01:00
cef7b1895b Updated Boss Character to Trigger Animations 2023-05-09 04:29:19 +01:00
f8936a03f7 Bugfix Not Touching Ground when in Animation 2023-05-09 04:00:01 +01:00
aa78522127 Updated Combat UI for User Experience Improvements
Hide buttons until they are available to use and disable resource buttons if there isn't any resources left
2023-05-09 02:55:31 +01:00
cfde5f9d68 Added Healing Jelly Button in Combat Widget 2023-05-09 00:42:56 +01:00
0115b7db1f Updated Combat System to Hide Quest Widget in Combat 2023-05-09 00:42:03 +01:00
MarcelHara
0632a1770b Updated DialougeBox for merchant to finish UI overhall 2023-05-09 00:04:33 +01:00
MarcelHara
d538543fbc Updated Selection,confirmation UI for merchant 2023-05-09 00:00:47 +01:00
MarcelHara
06f424883b Created and Imported new UI assets for merchant 2023-05-09 00:00:30 +01:00
38591bfcac Merge branch 'dev' into Boss-Combat 2023-05-08 23:48:56 +01:00
b32e3c21d9 Applied New Gun Model to Combat Character 2023-05-08 23:40:44 +01:00
41d78d8846 Merge remote-tracking branch 'origin/Gun-model' into dev 2023-05-08 22:44:31 +01:00
a17a80cf13 Applied Pendant Texture 2023-05-08 22:44:19 +01:00
44f7ca13b5 Updated Boss AI for New Skeleton Mesh 2023-05-08 22:42:02 +01:00
cs260086
7e9f767bf5 Added Gun model + texture maps into the Art_Misc folder 2023-05-08 22:38:52 +01:00
32f4e4974b Added Boss Animation Blueprint Ready For Triggers with Tree 2023-05-08 22:20:00 +01:00
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