Rowland Rowland
|
720082090e
|
Added statue
|
2023-05-11 16:08:08 +01:00 |
|
Rowland Rowland
|
9d1f9c1d78
|
Added boss room again
Readded boss room after merge errors
|
2023-05-11 15:46:02 +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 |
|
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
|
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 |
|
|
|
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 |
|
|
|
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
|
b3c83f161f
|
Updated TempCharacter to stop crashes
|
2023-05-09 12:50:34 +01:00 |
|
|
|
cef7b1895b
|
Updated Boss Character to Trigger Animations
|
2023-05-09 04:29:19 +01:00 |
|
MarcelHara
|
d538543fbc
|
Updated Selection,confirmation UI for merchant
|
2023-05-09 00:00:47 +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 |
|
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 |
|
MarcelHara
|
098aa0bb74
|
Gave buttons functionality
Play and quit works and gave settings placeholders
|
2023-05-04 13:56:42 +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 |
|
Rowland Rowland
|
cb1fcf7258
|
Added additional skeleton
Added a skeleton pointing towards side area
|
2023-05-02 11:47:19 +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 |
|
|
|
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
|
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 |
|
