Commit Graph

260 Commits

Author SHA1 Message Date
ad36b32133 Updated Build Map to Enable V-Sync 2023-05-14 23:24:30 +01:00
24c79e3285 Bugfix Main Menu Book Completely Black 2023-05-14 23:12:43 +01:00
ec0ca7f54c Replaced Resources Static Mesh with BP Equivalent 2023-05-14 23:06:15 +01:00
3b828bb01c Updated Quests for Final Kill Boss Quest 2023-05-14 23:02:09 +01:00
c46dcdecf7 Added NavMesh Modifiers to Prevent Goats from Getting on to Stairs 2023-05-14 21:46:11 +01:00
ac0752154d Merge branch 'Music-integration' into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-05-14 21:14:10 +01:00
KACPER Szelest
15073943ee Fixed weird mesh issues
I covered up some holes that look into the abyss and broke game immersion
2023-05-14 16:01:45 +01:00
MarcelHara
279c0dc7d8 Merged Build 2023-05-14 13:25:13 +01:00
MarcelHara
a2eb2a9849 Added lighting to boss room 2023-05-14 13:20:26 +01:00
85394b0b72 Rebuilt All Images as Some Were Corrupted Failing Build 2023-05-13 22:35:50 +01:00
afbb267c83 Updated C2Plane to Kill Player Instead of Restart 2023-05-13 19:29:39 +01:00
MarcelHara
b446ba7691 Updated Tooltip for all the items 2023-05-13 17:22:30 +01:00
0bb7df43cf Bugfix Collisions & UV's in Maze 2023-05-13 16:42:26 +01:00
b8709401da Updated Boss for Dialogue and End Game Dialogue 2023-05-13 16:25:07 +01:00
0f47b962b3 Built Lighting for Build Level 2023-05-13 01:08:06 +01:00
c2e3ef5168 Updated UI for New Designs 2023-05-13 01:02:47 +01:00
72308aabb0 Updated Boss to Add Combat Variation (Scream) 2023-05-13 00:42:38 +01:00
0667273c45 Bugfix Collisions, UV's & Replaced Boss with Actual Boss 2023-05-13 00:13:42 +01:00
Rowland Rowland
eb5871c5ed Added boss room and 'fixed' collisions
Collisons are EXTREMELY broken so I've moved the boss to be closer to the entrance of the room
2023-05-12 16:09:03 +01:00
Rowland Rowland
fe3d05ca25 Added rock assets and additonal enemies in the last cave corridor 2023-05-12 14:53:50 +01:00
Rowland Rowland
fd26944e0c Added resource assets into level 2023-05-12 13:12:42 +01:00
Rowland Rowland
987e23ab50 Placed mushrooms and added lights
Placed the mushrooms and made them give of light to guide the player through the cavern
2023-05-12 12:13:34 +01:00
Rowland Rowland
7d0694860d Finished adding statues 2023-05-12 11:25:49 +01:00
Rowland Rowland
0c40d58104 Rebuilt lighting
Rebuilt the lighting which allegedly changed a bunch of things that needed saving.
2023-05-12 11:22:41 +01:00
Rowland Rowland
9461216e4b Adding Statues 2023-05-11 16:49:25 +01:00
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