Commit Graph

270 Commits

Author SHA1 Message Date
b8709401da Updated Boss for Dialogue and End Game Dialogue 2023-05-13 16:25:07 +01:00
c2e3ef5168 Updated UI for New Designs 2023-05-13 01:02:47 +01:00
0667273c45 Bugfix Collisions, UV's & Replaced Boss with Actual Boss 2023-05-13 00:13:42 +01:00
ce4a2166c5 Merge remote-tracking branch 'origin/Dialogue' into dev 2023-05-12 23:59:18 +01:00
1254abfd0e Added Inventory Notification Functionality 2023-05-12 23:50:30 +01:00
7a04920197 Merge branch 'dev' into Inventory-Notifications 2023-05-12 21:47:07 +01:00
2f582cb507 Updated Status Effects to Add Damage Down for Enemy & Player 2023-05-12 20:44:46 +01:00
Blue Probert
ded3f7881c Changed player maximum ammo 2023-05-12 16:36:14 +01:00
7e46657e3a Added Widget for Inventory Notification 2023-05-12 16:27:10 +01:00
73204efa31 Updated Combat so that the Camera Stays Locked on During Combat 2023-05-12 14:38:58 +01:00
dd72b47a6d Bugfix Able to Open Inventory During Combat 2023-05-12 13:51:08 +01:00
6373a6bdc7 Updated Tooltip Function to Get Correct Display Name 2023-05-12 13:23:18 +01:00
3aca076981 Updated Sisters Quest & Wrapped Text on Selections 2023-05-12 13:08:00 +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
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
902163d4fe Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue 2023-05-11 08:52:30 +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
88f73fe5db Updated Build for Pick Up Book & Gun Quest 2023-05-11 04:50:45 +01:00
7b185adaf4 Updated Combat UI for Damage & Status Indicator, Miss Chance & Removed Battle Log 2023-05-11 04:00:03 +01:00
918ea38889 Updated Resource Items for UI Icons and Descriptions 2023-05-11 01:16:45 +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
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
487c46d7b8 Updated Combat System to Include Healing During Combat 2023-05-09 05:40:31 +01:00
cfde5f9d68 Added Healing Jelly Button in Combat Widget 2023-05-09 00:42:56 +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
b32e3c21d9 Applied New Gun Model to Combat Character 2023-05-08 23:40:44 +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
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
MARCEL HARA
b2c81bf9eb Added Shadow settings and QOL Fixes 2023-05-04 17:57:25 +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
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
daaa624dd9 Exposed Quest Flags to Dialogue System 2023-05-04 06:31:59 +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