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 |
|
|
|
b32e3c21d9
|
Applied New Gun Model to Combat Character
|
2023-05-08 23:40:44 +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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
Alicia
|
06a9295430
|
Added pendant object
|
2023-05-04 18:59:46 +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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
9ecbd9c52d
|
Updated GoatAI to Trigger Attack Animations
|
2023-04-28 03:40:41 +01:00 |
|
|
|
744b24c8c1
|
Bugfix Cell Shading
Disabled on some objects
|
2023-04-28 02:40:46 +01:00 |
|
|
|
825e2a7631
|
Added Movement Animation to Goats
|
2023-04-28 02:40:18 +01:00 |
|
|
|
9199db00df
|
Bugfix Merchant Unable to Interact
|
2023-04-28 01:40:49 +01:00 |
|
|
|
bc171eba80
|
Added Idle Merchant Animations
|
2023-04-28 01:23:18 +01:00 |
|
|
|
003edc4e0a
|
Reimported Goat Walking Animation & Imported Merchant Animation
|
2023-04-28 00:37:06 +01:00 |
|
Phoebe Harris-Wilson
|
e666ed28fb
|
Rope and talisman and textures
|
2023-04-27 18:00:30 +01:00 |
|
