Commit Graph

739 Commits

Author SHA1 Message Date
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
6e21026fcb Updated Eatable Items to Balance Resource Amounts 2023-05-11 01:17:21 +01:00
918ea38889 Updated Resource Items for UI Icons and Descriptions 2023-05-11 01:16:45 +01:00
a751b9a3aa Bugfix Merchant Sister Had Additional Capsule Collider 2023-05-11 00:30:02 +01:00
37e32c327e Hidden Harsh Edges in Start Area 2023-05-11 00:22:12 +01:00
0cb98acbb5 Updated Uv's on Start Area Objects 2023-05-11 00:21:51 +01:00
MARCEL HARA
8a68ac5213 Merge pull request #35 from Games-Academy-Student-Work-22-23/implimenting-miningcrystals
Implimenting miningcrystals
2023-05-10 13:28:52 +01:00
MarcelHara
4ad0959f08 Bug Fixed Mining crashing the game
When pressing E on the crystals it kept on crashing due to destroy being executed before pointer checks
2023-05-10 13:27:27 +01:00
George Taylor
67153f2ae9 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-05-09 17:27:21 +01:00
George Taylor
531af68aa5 added the fixed and adapted environments 2023-05-09 17:27:07 +01:00
KACPER SZELEST
9f3640e42e Updated read.me
added death messages
2023-05-09 17:16:34 +01:00
KACPER SZELEST
4e6a0308a9 Updated read.me
added the description and controls for itch.io page
2023-05-09 16:28:30 +01:00
MarcelHara
fc25c8adf0 Updated TempCharacter to start fixing bugs 2023-05-09 16:22:35 +01:00
MarcelHara
b0e9ad546b Replaced mining crystals with the assets 2023-05-09 13:50:23 +01:00
2638e71f97 Updated Combat UI to Make Extra Turn More Readable 2023-05-09 13:29:52 +01:00
MarcelHara
e1027d5d8e Merge remote-tracking branch 'origin/merchant-polish' into dev 2023-05-09 13:15:33 +01:00
MarcelHara
458bb20227 Git issues to upload part of merchant fix 2023-05-09 13:14:19 +01:00
6a94ce98ec Merge pull request #34 from Games-Academy-Student-Work-22-23/merchant-polish
Merchant polish
2023-05-09 13:10:38 +01:00
MarcelHara
3887290df8 Fixed merchant crash issue 2023-05-09 13:07:30 +01:00
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