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 |
|
MARCEL HARA
|
a54eae08b8
|
Shadow rebuild to dev
|
2023-05-11 14:38:21 +01:00 |
|
MARCEL HARA
|
a3d232726e
|
Fixed Merging to Dev
|
2023-05-11 14:37:24 +01:00 |
|
MARCEL HARA
|
62f8aac468
|
Merge remote-tracking branch 'origin/Set-Dressing' into dev
# Conflicts:
# Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cylinder_004.uasset
# Content/Levels/Build.umap
|
2023-05-11 14:19:49 +01:00 |
|
MARCEL HARA
|
e58cc309fa
|
Duplicated current build for new merges
|
2023-05-11 14:12:12 +01:00 |
|
MARCEL HARA
|
29b7e9c9e2
|
Fixed Merchant asset merge to dev
|
2023-05-11 14:11:08 +01:00 |
|
MARCEL HARA
|
83a9e5895e
|
Merge branch 'Texturing' into dev
# Conflicts:
# Content/Levels/Build.umap
|
2023-05-11 14:06:55 +01:00 |
|
MARCEL HARA
|
d499682a93
|
Re-duplicated build
|
2023-05-11 13:54:50 +01:00 |
|
George Taylor
|
62273aca77
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-05-11 12:17:06 +01:00 |
|
George Taylor
|
094d89bc92
|
Changed the height of the Boss Room
|
2023-05-11 12:16:18 +01:00 |
|
Rowland Rowland
|
5727ccfb73
|
Fixed collisions in final room. Added Textures to floor. Added Boss
|
2023-05-11 12:13:13 +01:00 |
|
MARCEL HARA
|
2279582438
|
Duplicated build to fix merge
|
2023-05-11 12:11:44 +01:00 |
|
EMILY TAYLOR
|
3059e56eb8
|
Added UV map for tunnel
UV Mapped tunnel
|
2023-05-11 12:10:33 +01:00 |
|
MARCEL HARA
|
acbff94bc6
|
Merge pull request #36 from Games-Academy-Student-Work-22-23/merchant-ui-nonactive
Fixed UI not being interactable
|
2023-05-11 11:57:30 +01:00 |
|
MARCEL HARA
|
5bf8d73d21
|
Fixed UI not being interactable
|
2023-05-11 11:56:03 +01:00 |
|
EMILY TAYLOR
|
0741c63162
|
Imported Shop textures
Decorated merchant shop and added textures
|
2023-05-11 11:42:41 +01:00 |
|
Rowland Rowland
|
15e56412fa
|
Changed final room
Changed final room to a circular arena
|
2023-05-11 11:18:24 +01:00 |
|
|
|
902163d4fe
|
Updated Merchant for Pendant Quest & Attempted to Replace Open Dialogue
|
2023-05-11 08:52:30 +01:00 |
|
|
|
fea2ccface
|
Updated Dialogue System to Call Custom Blueprint Functions
|
2023-05-11 06:32:11 +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 |
|
|
|
53126c6b10
|
Exposed Base Damage for Enemies
|
2023-05-11 04:12:00 +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 |
|
|
|
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 |
|
George Taylor
|
531af68aa5
|
added the fixed and adapted environments
|
2023-05-09 17:27:07 +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 |
|
|
|
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 |
|
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 |
|
