Compare commits

...

513 Commits

Author SHA1 Message Date
cf881a36cd Updated Coin & Item Notification for Better UX 2023-05-22 19:29:39 +01:00
38d3378c5a Updated Combat to Make Combos Reversible 2023-05-22 18:40:17 +01:00
eda89672b4 Bugfix Insta Kill if Two or More Goats Attacking at Once 2023-05-22 18:22:53 +01:00
9c747a96c2 Bugfix Soft Lock when Combat is Initialised on Dialogue or Merchant 2023-05-22 17:37:53 +01:00
ccb50a804e Bugfix Player Getting Damaged Once Boss was Dead 2023-05-22 17:12:08 +01:00
4bba8fc1eb Bugfix Status Effects not Correctly Being Reset on Dupe 2023-05-22 16:44:06 +01:00
36834676e8 Bugfix Unable Force Destroy UObjects 2023-05-22 16:14:22 +01:00
0c3831ad03 Bugfix Camera Being Reset in Wrong Positions and FOV 2023-05-22 01:03:13 +01:00
e947b67b36 Bugfix Able to Climb Large Structures by Teleporting 2023-05-21 22:10:23 +01:00
3a68c22449 Bugfix If Buff Active and Boss Dead Crashes Game 2023-05-21 22:07:19 +01:00
81a306f7b0 Bugfix Able to Open Dialogue in Merchant 2023-05-21 21:30:27 +01:00
276a0c5ff4 Renamed Boss to Crystal Mutant 2023-05-21 21:01:30 +01:00
6a5073f0e4 Updated Sprint SFX to Properly Loop 2023-05-21 20:47:11 +01:00
7e09a56e25 Bugfix Entrance to First Tunnel Causes Player to Clip
High Edge Lowered and Placed Blocking Volume
2023-05-21 20:26:19 +01:00
2157a3f264 Bugfix Main Menu Setting Drop Downs Not Working 2023-05-21 20:03:16 +01:00
b461f2e9c1 Bugfix Sometimes Getting Stuck on Starter Planks 2023-05-21 19:31:49 +01:00
a90b7da12f Updated Build for Additional Set Dressing 2023-05-21 19:20:51 +01:00
8b87098cf8 Updated Book & Gun to be Pickupable by Interact Key 2023-05-21 19:06:16 +01:00
d17ba9e064 Updated Cursor for Change when Hovering on Interactable Object 2023-05-21 18:55:22 +01:00
ba4e8bf07c Bugfix Janky Walking Up Stairs 2023-05-21 17:55:25 +01:00
e0e2286852 Bugfix Crash on Level Change if Player Still has Status Effects 2023-05-21 17:40:54 +01:00
b4b248b5e7 Bugfix Able to Shoot in Menus 2023-05-21 17:24:58 +01:00
8a8288fbff Bugfix Invisible Walls Breaking Line Trace 2023-05-21 16:34:33 +01:00
5104a21b2f Bugfix Initiating Combat with the Inventory Open Blocks Input 2023-05-21 15:20:11 +01:00
14f4ff4d35 Bugfix Focus Issues in Inventory & Able to Open Inventory in Shop
Able to consistently open & close the inventory without losing focus on root widget
2023-05-21 15:19:18 +01:00
89282de97c Organised Level Folder Structure 2023-05-21 12:57:55 +01:00
5573037266 Updated readme.md for Itch.io Page 2023-05-20 02:20:15 +01:00
e5b26c20ed Updated Combat to Disable Escaping in Boss Battle 2023-05-20 02:01:28 +01:00
e67e32387c Bugfix Able to See Status Text on Boss Combat 2023-05-20 01:46:13 +01:00
c7367be0c1 Bugfix Able to Jump Over Merchant Counter 2023-05-20 01:35:28 +01:00
d0923cac40 Added Brochure and Pendant Miscellaneous Files 2023-05-20 01:17:02 +01:00
3f7c78d5a1 Updated Healing & Buff Jelly Item Icons 2023-05-20 01:16:08 +01:00
a57ebbf0e3 Bugfix Menus Overlay Eachother 2023-05-20 01:01:19 +01:00
d2d67a5bea Bugfix Being In a Menu Breaks Game 2023-05-20 00:55:20 +01:00
8108050bd6 Bugfix Character Unable to Climb Stairs Consistently 2023-05-20 00:43:05 +01:00
bc98daea6f Updated Build Map to Replace Cubes with Stairs 2023-05-20 00:42:22 +01:00
2b458f7c77 Bugfix Having To Press TAB Twice to Open Inventory 2023-05-19 15:34:25 +01:00
c7da594980 Added Inventory Open Tutorial 2023-05-19 15:28:20 +01:00
c64556aa57 Updated Build Level to Make Book & Gun More Visible 2023-05-19 15:01:27 +01:00
8f6f927e79 Bugfix Spazzing Goats if Invalid Location 2023-05-19 13:35:49 +01:00
2953e6d50a Bugfix Switches Target if Multiple Enemies Try to Initiate Combat 2023-05-19 12:57:45 +01:00
b52327b122 Updated Inventory Icon to Make Inventory More Visible 2023-05-19 02:48:33 +01:00
df08924046 Bugfix Random Fatal Crash After Combat 2023-05-19 02:38:10 +01:00
09b55ac425 Bugfix Pressing E in Dialogue Stops Player from Moving 2023-05-19 02:20:15 +01:00
dcd4cbf356 Added Misc Art & Screenshots of the Game 2023-05-16 02:48:52 +01:00
7304cdfa32 Added Coin SFX on Goat Death 2023-05-15 04:28:15 +01:00
c9d527552e Made it Easier to Climb Rocks 2023-05-15 04:22:55 +01:00
12a7881592 Bugfix Boss End Dialogue Duplicating And Removing Input 2023-05-15 04:13:29 +01:00
0d7e8c5187 Bugfix Quest System for Pendant Quest 2023-05-15 04:02:05 +01:00
5682929e82 Added Enemy Attack Noises 2023-05-15 03:05:02 +01:00
d4c5139aa0 Added Shoot & Wall Break Sounds 2023-05-15 02:46:12 +01:00
7b416540b3 Added Walking and Sprinting SFX 2023-05-15 02:39:29 +01:00
4fdca4da2b Added MainMenu Background Track 2023-05-15 01:13:33 +01:00
9110d29d91 Added MainMenu Button to Escape Menu 2023-05-15 00:24:16 +01:00
a2d1d4794b Bugfix Book Taking in Hardware Inputs 2023-05-15 00:06:36 +01:00
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
c3df530ab7 Updated TempCharacter to Change Default Coin Balance 2023-05-14 23:08:53 +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
d24194b1cb Updated Healing & Buff Jelly to Change Max Values to 20 2023-05-14 21:34:08 +01:00
ac0752154d Merge branch 'Music-integration' into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-05-14 21:14:10 +01:00
027a48bbec Bugfix Crash on Boss Kill 2023-05-14 21:09:34 +01:00
KACPER Szelest
7fefd2cec4 updated mesh asset
I changed the mesh of the stalegtite to fix some issues
2023-05-14 16:02: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
KACPER Szelest
7d05f53989 Implemented audio assets
I added the background ambience and bridge noise to the game
2023-05-14 16:01:12 +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
f25519937b Merge remote-tracking branch 'origin/dev' into Final-Quest 2023-05-13 22:36:02 +01:00
85394b0b72 Rebuilt All Images as Some Were Corrupted Failing Build 2023-05-13 22:35:50 +01:00
cs260086
18c8223476 Created folder for Itch.io content
added banner.png and cover_page.png
2023-05-13 21:36:22 +01:00
4d21cf7fda Added Final Quest [WIP] 2023-05-13 20:21:21 +01:00
f2043868cd Updated Intro Text for New Design 2023-05-13 20:13:45 +01:00
9dfbced885 Updated Combat Tutorial to Include New UI Elements 2023-05-13 20:11:58 +01:00
bc0aad5f6b Updated Combat UI to Display Enemy Name 2023-05-13 19:58:29 +01:00
fa6ca7835a Updated Merchant Sister Quest for Improved Dialogue 2023-05-13 19:49:04 +01:00
6bb29703de Added Coin Amount to Merchant and Inventory 2023-05-13 19:40:24 +01:00
afbb267c83 Updated C2Plane to Kill Player Instead of Restart 2023-05-13 19:29:39 +01:00
MarcelHara
70ee7e5e98 Merge branch 'recolour-merchantUI' into dev 2023-05-13 18:16:59 +01:00
MarcelHara
f17baf1891 Updated PlayerInventory and Settings BP logic 2023-05-13 18:16:12 +01:00
MarcelHara
ef34d5663e Fixed logic handling the closing and opening of menus 2023-05-13 18:15:58 +01:00
MarcelHara
a33ea587b1 Updated All Merchant UI 2023-05-13 18:15:45 +01:00
7d63142ae7 Updated Quest Completed UI for New Design 2023-05-13 18:08:47 +01:00
717f56ff99 Updated Death Screen for New Design 2023-05-13 18:01:31 +01:00
MarcelHara
7c7fb0db01 Updated TempCharacter to fix merchant exit bug and cached escapemenu 2023-05-13 17:58:13 +01:00
bef64d33e3 Bugfix Sisters Pendant Quests 2023-05-13 17:51:23 +01:00
MarcelHara
b446ba7691 Updated Tooltip for all the items 2023-05-13 17:22:30 +01:00
MarcelHara
e3d3061843 Merge branch 'dev' into inventory-ui-overhaul
# Conflicts:
#	Content/Assets/Characters/Merchant/AMerchant.uasset
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Blueprints/Items/BP_BuffJelly.uasset
#	Content/Blueprints/Items/BP_HealingJelly.uasset
#	Content/Blueprints/Items/ItemsInWorld/BP_BuffPlacedItem.uasset
#	Content/Blueprints/Items/ItemsInWorld/BP_HealingJellyItem.uasset
#	Content/Blueprints/Quests/Quest_SistersPendant.uasset
#	Content/Blueprints/Quests/Quest_SistersPendant_PT2.uasset
#	Content/Dialogue/SM_Merchant_Blueprint.uasset
2023-05-13 17:15:48 +01:00
MarcelHara
e241c76d89 Changed Item tooltips to look better and overhauled item logic 2023-05-13 17:10:36 +01:00
ea9c05fd88 Updated Item Icons for Buff and Healing Jellies 2023-05-13 16:55:49 +01:00
0bb7df43cf Bugfix Collisions & UV's in Maze 2023-05-13 16:42:26 +01:00
MarcelHara
495f78a766 Added Functionality to new Inventory and fixed TAB not closing 2023-05-13 16:31:27 +01:00
MarcelHara
5ec863f4cf Changed TempCharacter to cache InventoryUI 2023-05-13 16:27:39 +01:00
MarcelHara
5dce69aad0 Updated Whole menu UI to final designs 2023-05-13 16:27:19 +01:00
b8709401da Updated Boss for Dialogue and End Game Dialogue 2023-05-13 16:25:07 +01:00
c6e5cb5e00 Updated Combat to Reward on Goat Kill 2023-05-13 01:17:59 +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
22c5f8163b Merge remote-tracking branch 'origin/Set-Dressing-2' into dev 2023-05-13 00:00:31 +01:00
8d096d7e36 Merge remote-tracking branch 'origin/UI_cleanup' into dev 2023-05-12 23:59:48 +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
b9985228d2 Updated Combat System for Minor Cosmetic Changes 2023-05-12 21:45:51 +01:00
2f582cb507 Updated Status Effects to Add Damage Down for Enemy & Player 2023-05-12 20:44:46 +01:00
0064e9a003 Bugfix Boss Idle Animation Not Looping 2023-05-12 17:06:21 +01:00
74dec9ba54 Bugfix Boss is Able to Move 2023-05-12 17:05:52 +01:00
99b1763f4f Bugfix Changed Max Ammo for Resource Bars 2023-05-12 16:51:06 +01:00
0c237ca411 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-05-12 16:49:00 +01:00
afd166c868 Bugfix Camera Shake Due to Spam of Animations 2023-05-12 16:48:14 +01:00
CHARLIE SEYMOUR
4e628f6855 added pendant UI icon + version with background layer 2023-05-12 16:39:36 +01:00
Blue Probert
5a96e51268 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-05-12 16:36:38 +01:00
Blue Probert
ded3f7881c Changed player maximum ammo 2023-05-12 16:36:14 +01:00
ec1ebc729d Bugfix for Overriding Local Rotation on Character Camera 2023-05-12 16:32:02 +01:00
7e46657e3a Added Widget for Inventory Notification 2023-05-12 16:27:10 +01:00
Rowland Rowland
f2b64ba183 Just in case
Boss room uv fix v2 just incase
2023-05-12 16:18:01 +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
CHARLIE SEYMOUR
e6d2d58bdc Added boss room fbx to be altered 2023-05-12 15:21:51 +01:00
Rowland Rowland
fe3d05ca25 Added rock assets and additonal enemies in the last cave corridor 2023-05-12 14:53:50 +01:00
7ca0b1bd9d Merge remote-tracking branch 'origin/UI_cleanup' into Inventory-Notifications 2023-05-12 14:47:31 +01:00
73204efa31 Updated Combat so that the Camera Stays Locked on During Combat 2023-05-12 14:38:58 +01:00
CHARLIE SEYMOUR
45a2b4fe6e updated Inventory icon 2023-05-12 14:06:26 +01:00
dd72b47a6d Bugfix Able to Open Inventory During Combat 2023-05-12 13:51:08 +01:00
EMILY TAYLOR
96685296c2 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-05-12 13:24:37 +01:00
EMILY TAYLOR
34311a8dfb Added Character Icons
Boss, Merchant and Sister Icons PNGS
2023-05-12 13:23:43 +01:00
6373a6bdc7 Updated Tooltip Function to Get Correct Display Name 2023-05-12 13:23:18 +01:00
Rowland Rowland
fd26944e0c Added resource assets into level 2023-05-12 13:12:42 +01:00
3aca076981 Updated Sisters Quest & Wrapped Text on Selections 2023-05-12 13:08:00 +01:00
George Taylor
9202c667b9 Fixed the UV's of the boss room
I fixed the Uv's of the boss room too allow for them too be properly textured
2023-05-12 12:41:33 +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
CHARLIE SEYMOUR
b0f63e8416 updated coins UI icon 2023-05-12 11:37:35 +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
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
Rowland Rowland
9461216e4b Adding Statues 2023-05-11 16:49:25 +01:00
CHARLIE SEYMOUR
2c22311c43 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-05-11 16:35:10 +01:00
CHARLIE SEYMOUR
48544d085b Added UI papers + coin to UI designs 2023-05-11 16:35:03 +01:00
Phoebe Harris-Wilson
5089d7a72d UI health and buff png's and cave in studios
the health and buff pngs r in the ui content folder and the team logo is in the team logo folder.
2023-05-11 16:31:55 +01:00
George Taylor
4fedf04054 Merge branch 'Set-Dressing-2' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into Set-Dressing-2 2023-05-11 16:11:51 +01:00
George Taylor
a7604a3f09 Changed the rope bridge assets
I changed the rope bridge assets too have a dip in them instead of just being flat
2023-05-11 16:11:33 +01:00
Rowland Rowland
720082090e Added statue 2023-05-11 16:08:08 +01:00
Blue Probert
cda1258df0 Added Sound Effects and Music Track.
Added 15 different sound effects and 1 song with one of the track being the full song as well as having one of each layer seperate.
2023-05-11 15:54:17 +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
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
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
2ef306a49c Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-05-11 11:36:10 +01:00
067bb41820 Bugfix Stack Overflow on Adding Reward Items 2023-05-11 11:27:54 +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
814c2d6aaa Bugfix Quest System Not Item Matching Correctly 2023-05-11 07:40:14 +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
f4a27fa5fe Updated StatusSystem for One Status Effect of Each Type Can be Active 2023-05-11 05:13:19 +01:00
aa2f1fabcb Updated Combat to Change the Chance to Miss Based on Enemy Type 2023-05-11 04:55:41 +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
dc9e149381 Merge remote-tracking branch 'origin/MainMenu-Creation' into dev 2023-05-11 04:02:36 +01:00
e308661c67 Removed Resource Reset on Combat Start 2023-05-11 04:01:57 +01:00
7b185adaf4 Updated Combat UI for Damage & Status Indicator, Miss Chance & Removed Battle Log 2023-05-11 04:00:03 +01:00
6e21026fcb Updated Eatable Items to Balance Resource Amounts 2023-05-11 01:17:21 +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
MarcelHara
4ad0959f08 Bug Fixed Mining crashing the game
When pressing E on the crystals it kept on crashing due to destroy being executed before pointer checks
2023-05-10 13:27:27 +01:00
George Taylor
67153f2ae9 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-05-09 17:27:21 +01:00
George Taylor
531af68aa5 added the fixed and adapted environments 2023-05-09 17:27:07 +01:00
KACPER SZELEST
9f3640e42e Updated read.me
added death messages
2023-05-09 17:16:34 +01:00
KACPER SZELEST
4e6a0308a9 Updated read.me
added the description and controls for itch.io page
2023-05-09 16:28:30 +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
aa78522127 Updated Combat UI for User Experience Improvements
Hide buttons until they are available to use and disable resource buttons if there isn't any resources left
2023-05-09 02:55:31 +01:00
cfde5f9d68 Added Healing Jelly Button in Combat Widget 2023-05-09 00:42:56 +01:00
0115b7db1f Updated Combat System to Hide Quest Widget in Combat 2023-05-09 00:42:03 +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
41d78d8846 Merge remote-tracking branch 'origin/Gun-model' into dev 2023-05-08 22:44:31 +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
cs260086
7e9f767bf5 Added Gun model + texture maps into the Art_Misc folder 2023-05-08 22:38:52 +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
MarcelHara
d8a4603651 Updated Merchant to fix buttons not working 2023-05-08 20:03:54 +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
cs260086
9706c71faa Added Title.png
for book UI to be implemented as a game title
2023-05-07 23:37:09 +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
cs260086
73a9fa7768 Added drop down box UI icons 2023-05-05 18:30:08 +01:00
Alicia
06a9295430 Added pendant object 2023-05-04 18:59:46 +01:00
ROWLAND ROWLAND
9e55e8f930 Merge pull request #32 from Games-Academy-Student-Work-22-23/side-area-2nd-gig
Fixed collisions. Fixed bug of respawn. Added maze
2023-05-04 18:02:18 +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
2ab212324b Bugfix Choosing Another Option Other Than a Add Quest Breaks Dialogue 2023-05-04 06:59:05 +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
cs260086
98a2f6af98 Merge branch 'MainMenu-Creation' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into MainMenu-Creation 2023-05-03 15:07:52 +01:00
cs260086
a5c410063a Added Icon borders
Borders have been added without text for animation purposes
2023-05-03 15:07:45 +01:00
Rowland Rowland
22c004c9e0 Merge branch 'Side-Area' into dev 2023-05-02 11:50:17 +01:00
Rowland Rowland
f5e868cc27 Minor changes
Enemy health and a new cube
2023-05-02 11:49:59 +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
bff44b56a7 Bugfix Able to Click Dialogue on Choice Select 2023-05-01 05:23:43 +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
cs260086
164c9f6b03 Created folder for settings UI + UI Icons
Added Icons for Play, Settings and Quit
2023-04-30 16:34:28 +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
69dd199ad3 Updated Character to Expose Reaction Speed 2023-04-28 05:31:57 +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
7d87e3d94f Merge branch 'dev' into Combat 2023-04-27 23:59:39 +01:00
3a672fb52e Merge branch 'dev' into houes-modles 2023-04-27 23:52:54 +01:00
Phoebe Harris-Wilson
e666ed28fb Rope and talisman and textures 2023-04-27 18:00:30 +01:00
Blue Probert
0f0618ed0a Bugfix Heal Over Time Exposed Heal Amount 2023-04-27 17:59:06 +01:00
Rowland Rowland
c61d8ed9e3 Merge branch 'dev' into Collisions
# Conflicts:
#	Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset
#	Content/Levels/Build.umap
2023-04-27 17:51:21 +01:00
Blue Probert
fc8c6bae19 Bugfix Crash On Damage Over Time Kill 2023-04-27 17:50:13 +01:00
Blue Probert
82ce8b2074 Bugfix Crash on No Post Processing Component 2023-04-27 17:40:40 +01:00
Rowland Rowland
6865b506b8 Added quest giver
Quest giver is now placed to the side of the cave entrance
2023-04-27 17:35:46 +01:00
Rowland Rowland
b4a8af9d43 Added platform for quest giver
Copied temporary platform at rope bridge and placed one next to it for the guest giver
2023-04-27 17:28:49 +01:00
Rowland Rowland
4579c73929 Fixed collision issues
Had an issue on Monday, seems to be fixed and pushed now
2023-04-27 17:20:07 +01:00
MARCEL HARA
b0615eafdd Added Volumetric fog and fine tuned 2023-04-27 17:19:16 +01:00
MARCEL HARA
38caa46e58 Updated Interaction.cpp to fix certain crashes 2023-04-27 17:19:01 +01:00
MARCEL HARA
dd1ab03357 Changed UI to 2D to make it look 3D on the book 2023-04-27 17:18:46 +01:00
Kacper Szelest
f8e130f727 Fixed quest system
I fixed the quest system and made it interactable
2023-04-27 16:47:26 +01:00
Kacper Szelest
1d076b851b Implemented the quest system
I implemented the quest system into the game
2023-04-27 16:42:40 +01:00
Kacper Szelest
f990cd20c9 Added quest giver mesh
Added the quest giver mesh into the world space so you can recieve quests from her
2023-04-27 16:40:55 +01:00
Kacper Szelest
e2dd3cfd9c Added quest giver
I added the quest giver into the game so we can have quests
2023-04-27 16:25:12 +01:00
Kacper Szelest
6c3e358460 Updated tunnels
I added the improved tunnels which werent in already
2023-04-27 16:21:21 +01:00
Kacper Szelest
97d0cb2505 Created collisions for level
Added collisions for certain objects which didnt have any
2023-04-27 16:15:31 +01:00
MarcelHara
3b725f53bb Started to work on main menu 2023-04-27 12:31:32 +01:00
MarcelHara
1a039023ed Updated SmokeParticles to breaking walls 2023-04-27 11:57:03 +01:00
69bd004895 Bugfix Combat Values Not Being Reset on Combat End 2023-04-27 07:22:40 +01:00
4f8f2b37d1 Updated Combat to Hide Book in Non-Combat 2023-04-27 07:19:19 +01:00
11c905613a Updated Combat to Include Red Vignette on Damage Taken 2023-04-27 06:59:52 +01:00
9fd372ed9d Updated Combat to Include Camera Shake on Shoot & Wall Break 2023-04-27 05:13:41 +01:00
19fcc0c063 Updated Combat to Include Enemy UI 2023-04-27 04:24:54 +01:00
2df31aa719 Bugfix Camera Clipping and Render Depth On Book & Gun 2023-04-27 03:47:24 +01:00
Alicia
6c3692b9ae merchant rig 2023-04-26 18:21:33 +01:00
Alicia
df2d103184 changed the walking cycle 2023-04-26 18:21:11 +01:00
383a85449e Merge branch 'Combat' into dev 2023-04-26 13:20:48 +01:00
MH261677
a845c079a4 Merge branch 'fx-creation' into dev
# Conflicts:
#	Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset
2023-04-26 13:09:58 +01:00
MH261677
873671db64 Updated BreakAsset to add FX 2023-04-26 13:04:05 +01:00
MH261677
8d20b563e7 Updated Gun FX to make smoke smaller 2023-04-26 12:59:44 +01:00
MH261677
be31b90112 Updated Gun FX to making smoke more realistic and emission change
Updated the color and the way the smoke moves to look more realistic and made the emission a lot lower to prevent smoke from lighting up the whole scene
2023-04-26 12:55:38 +01:00
MH261677
a90fccd72e Updated Gun Effects to add smoke and sparks
added smoke and spark effects to the gun upon firing
2023-04-26 12:12:50 +01:00
MH261677
70b8c41c99 Imported Smoke Texture and created smoke mat 2023-04-26 12:12:30 +01:00
4f336263fb Bugfix Enemy Always Started First 2023-04-26 06:21:08 +01:00
37268a3dc2 Bugfix Unable to Escape in Some Situations 2023-04-26 05:51:07 +01:00
5634557af2 Bugfix Game End on Player Death & Lock Combat on Tutorial 2023-04-26 05:28:02 +01:00
b1bdcb7618 Merge remote-tracking branch 'origin/Tutorial' into Combat
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatTutorial.uasset
2023-04-26 04:18:42 +01:00
32f20c12c3 Updated Combat to Include Damage Stacking 2023-04-26 03:52:22 +01:00
15d2734c52 Bugfix Pointer Retaining Position After Combat Has Ended 2023-04-26 03:51:17 +01:00
0c13de4668 Bugfix BindAction Consuming Left Mouse Input 2023-04-26 03:22:13 +01:00
f7c4fdac3f Updated Combat to Include a Reload Effect 2023-04-26 02:10:01 +01:00
feea306d11 Updated Combat to Replace Old Combos 2023-04-25 04:38:06 +01:00
fde1537dc0 Merge branch 'Book-UI' into dev 2023-04-25 04:31:26 +01:00
cf2a198c3e Updated BookUI to Display Turn State and Escape Percentage 2023-04-25 04:23:51 +01:00
32e65e3f47 Updated BookUI for Cast & Clear Buttons 2023-04-25 03:46:52 +01:00
d0eaf37de7 Updated BookUI for Icon Positioning 2023-04-25 01:13:04 +01:00
e7121dbb49 Updated BookUI to Include Escape Button & Percent 2023-04-25 01:08:26 +01:00
eb43c252af Updated BookUI to Include Element Icons 2023-04-25 01:07:35 +01:00
34e5c78bf1 Updated Combat to Centre Cursor 2023-04-24 23:25:10 +01:00
MH261677
a770fc47f1 Started working on sparks for gun 2023-04-24 18:43:22 +01:00
18ceedfa03 Updated Character to Convert Screen Space to World for Interaction 2023-04-24 18:01:51 +01:00
EMILY TAYLOR
b41623bd11 Added Merchant Shop Materials
Merchant shop materials for engine
2023-04-24 16:55:59 +01:00
Kacper Szelest
0384c4977d Changed location of text int tutorial
I changed the lovation of the text in the tutorial to fit the page better.
2023-04-24 16:08:45 +01:00
EMILY TAYLOR
795732d147 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-24 16:07:45 +01:00
Kacper Szelest
00a22d1c39 Changed tutorial text
I shortened the text on the tutorial to condense it and not dump the player with text.
2023-04-24 16:07:09 +01:00
EMILY TAYLOR
58730a8573 Added Civilian Material in content drawer
Created material for Civilian Character for side quest, re-use Merchant Mesh from Merchant folder
2023-04-24 16:06:45 +01:00
George Taylor
1b8bb13d7e Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-24 15:58:14 +01:00
George Taylor
e97ee6a9c7 Imported new beams into unreal
I updated the beams asset too have smoother edges
2023-04-24 15:54:24 +01:00
EMILY TAYLOR
b25466f648 Added Textures for Civilian Character
Texture PNGs for Civilian character quest
2023-04-24 15:45:17 +01:00
3e34ab4c5c Bugfix Bridge Massive Gap 2023-04-24 12:18:04 +01:00
ba35cfd06e Bound Health Percent UI to Get Combat Character Health 2023-04-24 12:08:59 +01:00
fa3a811553 Added Tutorial Widget with Functionality 2023-04-24 11:54:28 +01:00
233125cc81 Merge branch 'Animations' into dev 2023-04-21 15:36:29 +01:00
55ec487cde Merge pull request #26 from Games-Academy-Student-Work-22-23/Delay-On-Run
Added Delay On Escape From Combat
2023-04-21 15:34:45 +01:00
8342865f74 Added Delay On Escape From Combat 2023-04-21 15:32:41 +01:00
39113cad58 Added Animation Blueprint for Goat Walking 2023-04-21 14:59:22 +01:00
2987ac3bb1 Merge remote-tracking branch 'origin/Animations' into dev 2023-04-21 14:46:12 +01:00
ce142a9006 Merge remote-tracking branch 'origin/houes-modles' into dev 2023-04-21 14:45:50 +01:00
bc94d3aeae Updated Intro Text for Cosmetic Changes 2023-04-21 14:41:06 +01:00
b5d451d948 Updated BookUI for Small Cosmetic Changes 2023-04-21 14:35:36 +01:00
7c39553dd2 Updated Book UI to Display Only Valid Combos 2023-04-21 04:26:09 +01:00
11a58bb836 Added 1st and 2nd Element UI Book Elements 2023-04-21 04:16:46 +01:00
02e1ec436c Updated TurnBasedCombat to Use New Book UI 2023-04-21 03:44:01 +01:00
fe54fcb90b Disabled Important Stats Widget to Use New Book UI 2023-04-21 03:01:22 +01:00
94f45d99c3 Added Combat UI Asset for World Space 2023-04-21 02:57:18 +01:00
793e096ed5 Merge remote-tracking branch 'origin/tutorial-functionality' into Book-UI
# Conflicts:
#	Content/Levels/Build.umap
2023-04-20 22:30:57 +01:00
Kacper Szelest
19ebf111a3 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-20 16:46:39 +01:00
Kacper Szelest
b50e9dc161 Added UI elements and collisions
I added ui elements and collisions
2023-04-20 16:46:27 +01:00
George Taylor
5e28b7e6e2 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-20 16:30:24 +01:00
George Taylor
66c26efeef Improved Rock Texture in Unreal
changed the bitmaps and graph for the rock texture
2023-04-20 16:29:56 +01:00
Kacper Szelest
8102db3bc7 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-20 16:07:35 +01:00
Kacper Szelest
e3c83ba4ff Added collisions to assets
I added collisions to assets
2023-04-20 16:07:17 +01:00
George Taylor
2ec38c4c60 Imported the improved environment assets
i imported the level environment too the unreal build
2023-04-20 15:53:07 +01:00
KACPER Szelest
9db6138385 Added river to level
I added a little river to our level
2023-04-19 22:39:51 +01:00
KACPER Szelest
6c59905e9b Created Water marterial
I created a water material to use for a little river we have in the level
2023-04-19 22:39:32 +01:00
KACPER Szelest
9c5f607b83 Updated cave level 1 objects with temp textures
I added temporary textures to the assets to have a decent looking level
2023-04-19 22:25:44 +01:00
KACPER Szelest
b88cc9dfe8 Added Temporary texture
I added a temporary texture to use for the level for testing purposes
2023-04-19 21:31:32 +01:00
KACPER Szelest
0616e21fbc Added temporary level assets 2023-04-19 21:30:10 +01:00
EMILY TAYLOR
7150d69759 Added Tutorial Assets in engine 2023-04-17 18:07:22 +01:00
Alicia
240f9961b7 FBX BRIDGE 2023-04-17 17:44:25 +01:00
MARCEL HARA
2f74de4889 Updated IntroText to add close button 2023-04-17 17:34:26 +01:00
MARCEL HARA
c412e8c163 Added TutorialText to game
added a ui and made it appear at the start of the game
2023-04-17 17:33:40 +01:00
985fdfa3af Updated Goat Textures 2023-04-17 17:21:45 +01:00
11dbb10c32 Exported Goat Model to FBX 2023-04-17 17:09:13 +01:00
EMILY TAYLOR
56327103a4 Added Textures for Tutorial Assets
Finished Textures for Bones, Lamp, Open Book and Closed Book
2023-04-17 17:01:29 +01:00
EMILY TAYLOR
8afb595e99 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-04-17 16:58:56 +01:00
George Taylor
6455ce96a8 Fixed the Wood and Rock Textures
Imported the bitmaps as targas and fixed the wood and rock textures so they can be used in the build
2023-04-17 16:53:47 +01:00
EMILY TAYLOR
a24e0b836a Added Meshes for Tutorial Level
Bones, Books and Lamp items for Tutorial
2023-04-17 16:53:42 +01:00
dc7e00b5f3 Imported Goat Attack and Walking Animations 2023-04-17 16:53:01 +01:00
a2e14d7b60 Merge remote-tracking branch 'origin/houes-modles' into Animations 2023-04-17 16:27:45 +01:00
Alicia
20cf821fd1 FBX 2023-04-17 16:25:56 +01:00
Alicia
24ef284d4e walking cycle 2023-04-17 16:16:49 +01:00
60fa3a720b Merge branch 'Quest-&-Dialogue-System' into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-04-17 15:04:52 +01:00
fa4857447c Merge branch 'UI_implementation' into dev 2023-04-17 15:03:56 +01:00
6003b61098 Merge remote-tracking branch 'origin/lighting-updates' into dev 2023-04-17 15:03:27 +01:00
Rowland Rowland
fb79fc9bdf Forgot to save the last change appropriatley 2023-03-30 17:01:18 +01:00
Rowland Rowland
574bd4a33d Added additonal lighting in front of the Merchant's cave
The player should now be guided towards the merchant once they enter the cavern
2023-03-30 17:00:22 +01:00
Rowland Rowland
3be617e9df Merge branch 'dev' into Combat-Testing 2023-03-30 16:43:42 +01:00
Rowland Rowland
e4187fad25 Removed remnants of hub 2023-03-30 16:37:05 +01:00
Rowland Rowland
01d90fcb3b Updated Merchant position and removed an enemy 2023-03-30 16:03:40 +01:00
Phoebe
76699b3be2 Mushrooms and textures 2023-03-30 15:40:30 +01:00
f57960bed6 Added Quest System Stub 2023-03-29 17:36:24 +01:00
MARCEL HARA
fd64b18f61 Updated LOD to all crystals 2023-03-29 17:16:50 +01:00
MARCEL HARA
5e534b3af9 Updated Flashlight brightness 2023-03-29 17:16:11 +01:00
MARCEL HARA
95f81d3a10 Merge branch 'UI_implementation' into lighting-updates
# Conflicts:
#	Content/Levels/Build.umap
2023-03-29 17:08:57 +01:00
MARCEL HARA
00677164b3 Updated all lighting to whole scene
Changed the lighting and crystal placements in the starter place and the hub world
2023-03-29 17:03:00 +01:00
Phoebe
2787f29e16 mushrooms added and textures 2023-03-29 16:59:07 +01:00
EMILY TAYLOR
25e20d53f7 Added Lamp Asset for Tutorial Level 2023-03-29 16:22:00 +01:00
EMILY TAYLOR
7ec5c4442f Added Book and Material
Implemented book asset in game and material.
2023-03-29 16:19:37 +01:00
CHARLIE SEYMOUR
5307c9c02d Added combat and material bars 2023-03-29 15:48:08 +01:00
George Taylor
f723db11c9 Imported the styalised textures bitmaps into Unreal 2023-03-29 14:40:05 +01:00
c0ff4f6b9f Bugfix Origin on Ropebridge 2023-03-29 13:10:14 +01:00
2e6398da59 Bugfix Input Not Being Re-Enabled On Respawn 2023-03-28 05:19:41 +01:00
8407c02042 Updated Build Map for Light Build 2023-03-28 05:08:52 +01:00
2c9de7ee58 Bugfix Invisible Plane When Entering Large Room Block 2023-03-28 05:01:07 +01:00
b51ac385cd Bugfix Inventory Widget Anchors Not Correctly Set 2023-03-28 04:56:56 +01:00
e8c29d8004 Updated Build Map to Include Rope Bridge & More Direction 2023-03-28 04:53:13 +01:00
1b4a2673e3 Updated Combat UI for New Conventions (WIP) 2023-03-28 04:36:27 +01:00
544de9810c Updated Combat Character Increased Sprint Speed 2023-03-28 03:46:35 +01:00
3f5c7bcf1c Bugfix Merchant Unable to Purchase Items 2023-03-28 03:43:31 +01:00
e28da9ab26 Added Lights In Shop 2023-03-28 03:16:39 +01:00
24d0f2b334 Added Wooden Sign to Direct Players 2023-03-28 03:11:41 +01:00
Alicia
adf5e5ab52 WALK CYCLE GOAT FILE 2023-03-27 20:28:20 +01:00
Alicia
ee6c779c3a ATTACK ANIMATION FILE 2023-03-27 20:28:09 +01:00
Alicia
c6c366b229 bridge model 2023-03-27 20:06:54 +01:00
Alicia
5ef21fcc71 GOAT ATTACK ANIMATION 2023-03-27 20:05:29 +01:00
Alicia
02cdfd760c WALK CYCLE GOAT 2023-03-27 20:04:02 +01:00
phoebe
fe60960c21 ADDED SMALL MUSHROOMS 2023-03-27 17:31:10 +01:00
Charlie Seymour
178428c6e8 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-03-23 17:56:07 +00:00
Charlie Seymour
cef9cd9d7b Added Custom Health bars
Health only
2023-03-23 17:55:59 +00:00
Blue Probert
470c78421b Added level for enemy testing aswell as made reaction speed public. 2023-03-23 17:50:13 +00:00
Blue Probert
e2ca14c83f Bugfix Important Stats Widget Renamed 2023-03-23 17:27:17 +00:00
Blue Probert
33fdf4ad71 Bugfix Important Stats Widget Renamed 2023-03-23 15:55:57 +00:00
Emily Taylor
34e7124861 Added Assets for Tutorial Lvl
High and Low poly bones assets , BookClosed_low
All not UV mapped yet
2023-03-21 21:11:37 +00:00
Emily taylor
83619f95ed WIP Assets for tutorial
Backup high poly assets
2023-03-20 17:26:03 +00:00
Marcel Hara
0779e31c75 Updated Positions of Items to Merchant Shop
Fixed the origin of the items and properly positioned and scaled items to make the merchant shop work fully
2023-03-16 17:18:01 +00:00
a838c82e9c Merge pull request #16 from Games-Academy-Student-Work-22-23/merchant-cleanup
Updated TempCharacter to fix Camera issues
2023-03-16 16:38:14 +00:00
Marcel Hara
df4499fdde Updated TempCharacter to fix Camera issues
Fixed the UI not returning after player exits the merchant. Fixed the bug where if a player jumps and interacts with the merchant and then exits the camera is stuck in the air instead of resetting properly.
2023-03-16 16:31:40 +00:00
MH261677
093825dc0d Potential fix for merchant system UI
** POTENTIALLY FIXED NEED TO TEST**
2023-03-16 14:49:17 +00:00
KACPER SZELEST
4d45fff004 Updated readme with a new link
Added the introduction letter writing for our game into the read me in a form of a link to a google doc.
2023-03-16 11:24:16 +00:00
Marcel Hara
6f9f95ab9d Attempted fix widget to merchant system 2023-03-14 13:04:33 +00:00
363623a315 Updated Build Map for Goat Tweaks 2023-03-14 05:05:20 +00:00
acbbed522b Cooked New Materials for Build 2023-03-14 04:47:53 +00:00
7d078cbb4c Added Sprint using Left Shift 2023-03-14 04:40:13 +00:00
7585520586 Added Death Screen 2023-03-14 04:17:29 +00:00
c5409fcaa7 Removed Merchant Soft Lock for Build
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
2023-03-14 04:01:09 +00:00
ca87feaf2a Bugfix Getting Wrong Widget for Dialogue 2023-03-14 01:33:06 +00:00
5b6461224a Updated Build Map for Organisation of Objects 2023-03-14 00:44:57 +00:00
b27f6ef064 Added Flashlight Tutorial 2023-03-14 00:34:06 +00:00
63b6c20c13 Updated Combat Character to Toggle Flashlight 2023-03-14 00:31:06 +00:00
576c8fc2a5 Baked Atlas for Break Particle Effect 2023-03-14 00:22:57 +00:00
a12aedde9d Added Breathing Effect on Breakable Walls 2023-03-13 23:59:40 +00:00
78382d7b97 Updated Build Level to Re-Add Science Buildings 2023-03-13 23:18:43 +00:00
fd99e87d77 Updated Science Buildings to Fix Origins & Scales 2023-03-13 23:18:13 +00:00
b7a5d974ac Updated Build Map to Stop Goats from Colliding 2023-03-13 22:17:44 +00:00
4d77431338 Merge branch 'Quest-&-Dialogue-System' into dev 2023-03-13 22:02:36 +00:00
17afc60c22 Merge branch 'houes-modles' into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-03-13 18:20:17 +00:00
bef31d5738 Merge branch 'environment_assets' into dev 2023-03-13 18:12:50 +00:00
1fde04c875 Merge remote-tracking branch 'origin/UI-designs' into dev 2023-03-13 18:12:24 +00:00
af86084f3e Updated Quest UI to Display Tasks 2023-03-13 18:11:42 +00:00
bfa6c24ee9 Bugfix New UI Not Displaying 2023-03-13 18:10:02 +00:00
Rowland Rowland
23985317a2 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-03-13 17:23:18 +00:00
Rowland Rowland
0b9c01189e Working on Lighting
Removed current point lights will replace and decorate envrionment
2023-03-13 17:22:15 +00:00
Alicia
06fcc98b3a build wth background buildings 2023-03-13 18:18:12 +01:00
Alicia
d7ad370c99 build with two background buildings 2023-03-13 18:16:55 +01:00
56db7d3e9c Merge pull request #12 from Games-Academy-Student-Work-22-23/UI-Implementation
UI implementation
2023-03-13 17:14:10 +00:00
Marcel Hara
688a724a62 Merge branch 'dev' into UI-Implementation
# Conflicts:
#	Content/Blueprints/Player/BP_MyTempCharacter.uasset
#	Content/Levels/Top_layer_level.umap
2023-03-13 17:13:56 +00:00
f82e8a892e Merge pull request #13 from Games-Academy-Student-Work-22-23/Extra-ammoTypes
Extra ammo types
2023-03-13 17:11:33 +00:00
Marcel Hara
c5ef154a3f Fixed Ammo items being destroyed
Fixed the ammo items being destroyed from the inventory
2023-03-13 17:06:10 +00:00
Rowland Rowland
b7924578be Updated NavMesh
Removed all but 1 NavMesh. Single NavMesh now covers entire level
2023-03-13 17:02:22 +00:00
Marcel Hara
7e8ded362a Added All Item ammo types
Added every item ammo type to the game
2023-03-13 17:00:08 +00:00
Kacper Szelest
141ee97312 implemented crystals
I implemented the crystals into the game tutorial after they were removed due to merge conflicts
2023-03-13 16:16:50 +00:00
Marcel Hara
7343484038 Updated MainWidget to fix scaling issues 2023-03-13 16:13:27 +00:00
Charlie Seymour
e0f7a2682a Bugfix Old Version of the Character with Missing References 2023-03-13 16:11:44 +00:00
Marcel Hara
e8000eb823 Updated GameUI to Rounded buttons and optimisation
removed unwanted blueprints to speed up menus and make them work better and made all the buttons rounded to make it look nicer
2023-03-13 16:06:41 +00:00
Charlie Seymour
6ff315dfe7 Changed AIBruh hitbox
Moved hitbox
2023-03-13 15:57:48 +00:00
George Taylor
d7f98039c0 Imported Rock Assets too General Dressing Folder 2023-03-13 15:57:35 +00:00
Marcel Hara
cffbe29981 Imported Font to replace all ui fonts
Replaced all the ui fonts with the new imported font
2023-03-13 15:55:34 +00:00
Charlie Seymour
2f2ecc2d76 Change AIBruh to actual model
Mesh and material changed.
2023-03-13 15:54:30 +00:00
Kacper Szelest
a67482c6d7 Merge remote-tracking branch 'origin/Tutorial-final' into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-03-13 15:45:56 +00:00
Kacper Szelest
0146e89f88 Merge remote-tracking branch 'origin/Merchant' into art-implementation
# Conflicts:
#	Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset
#	Content/Blueprints/Player/BP_MyTempCharacter.uasset
#	Content/Levels/Build.umap
#	Content/Levels/Top_layer_level.umap
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-03-13 15:35:46 +00:00
Kacper Szelest
6c3b6b1ad2 Merge remote-tracking branch 'origin/Environment-assets' into art-implementation 2023-03-13 15:29:04 +00:00
3a99e71bde Added Base Stub for Quest System 2023-03-13 05:19:13 +00:00
76b2d78f0e Updated Dialogue for Choices 2023-03-13 04:49:09 +00:00
d2325b514c Update readme.md 2023-03-07 15:26:13 +00:00
MH261677
93ed73e678 Changed Inventory_UI to Game_UI folder
Changed folder names and added a Quit button to the settings menu
2023-03-07 14:25:08 +00:00
MH261677
f90a75f599 Added Icons to replace MainWidg text
Imported the icons into unreal and replaced all the text on Mainwidget to the respected icons
2023-03-07 14:18:48 +00:00
MH261677
b88f787315 Updated MainWidg to change hover colour
Added a hovor colour to make it more obvious what the user is clicking on
2023-03-07 14:09:09 +00:00
MH261677
0c2dc067da Updated PlayerInv,TempChar to enable hotkeys
Enabled pressing tab to go straight to inventory instead of having to go to settings via escape key and then switching to inventory manually
2023-03-07 13:36:04 +00:00
MH261677
72d6ac39fc Created WBP_Gear,WBP_Lore and fixed scaling issues
Created the final widgets for the menu and fixed some issues of buttons being out of place and not anchored properly
2023-03-07 13:18:45 +00:00
MH261677
3cac587f30 Updated MainWidget, TempCharacter to menu opening
Fixed the menu not being able to close properly
2023-03-07 13:00:24 +00:00
Marcel Hara
17df5728d9 Added WBP_Maps,WBP_Settings to MainMenuWidg
Added new widgets and now adding functionaity to escape button to make it close and re-open the menu
2023-03-06 17:27:16 +00:00
Kacper Szelest
271f0163ff Updated build level
I added crystals and lights into the level to finish the look of the tutorial.
2023-03-06 17:19:38 +00:00
PHOEBE HARRIS-WILSON
93dc519091 line art of the gun elements
black and transparent veriations of the gun elements.
2023-03-06 17:09:25 +00:00
PHOEBE HARRIS-WILSON
5d5584e691 interior of book design start
Start of the interior book design
2023-03-06 17:08:45 +00:00
GEORGE TAYLOR
144d4ab3da Imported Assets for Town Dressing into Unreal 2023-03-06 16:53:38 +00:00
Kacper Szelest
22402626a3 Added crystal assets into Build level
I added the crysta levels into the tutorial of the build level
2023-03-06 16:33:57 +00:00
Emily Taylor
3982712189 Uploaded MerchantCharacter, Merchant Shop assets and Goat into engine
Goat enemy fbx and material, merchant character and material and merchant shop untextured meshes in engine.
2023-03-06 16:28:04 +00:00
Kacper Szelest
eab68734e1 Merge remote-tracking branch 'origin/Environment-assets' into Tutorial-final 2023-03-06 16:17:18 +00:00
GEORGE TAYLOR
57c97bfaa5 Imported General Dressing Assets too Unreal
Imported assets used for general dressing into a new folder in unreal.
2023-03-06 16:17:15 +00:00
b532eaaa4e Merge remote-tracking branch 'origin/Hub-level-blockout' into dev 2023-03-06 16:11:37 +00:00
Alicia
b9f54ee51d Merge branch 'Environment-assets' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into houes-modles 2023-03-06 17:10:02 +01:00
Kacper Szelest
1f9e1c3f93 Updated build level
I added a collision to one object in the build level
2023-03-06 16:08:35 +00:00
GEORGE TAYLOR
f4f8edb6eb Imported the crystal assets to Unreal 2023-03-06 15:42:52 +00:00
da1b3e9137 Bugfix Null Cached AI References 2023-03-06 15:37:31 +00:00
Emily Taylor
c4a668c2e9 Added Merchant Shop assets
Added Merchant shop FBX
2023-03-06 15:31:55 +00:00
Marcel Hara
0da833f0f7 Created Combos,MainWidget to allow widget switch
Created a Combos and MainMenu Widget screen. Also reworked the inventory UI and fixed layering and scaling issues
2023-03-06 15:12:06 +00:00
6db0770582 Bugfix Crouch Crashing Game 2023-03-06 15:00:08 +00:00
Alicia
6e0d50b926 Final version of the building 2023-03-01 14:16:49 +01:00
1069 changed files with 4927 additions and 1023 deletions

BIN
ALICIA/ATTACK.avi (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/ATTACKGOAT.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/BRIDGEFORK.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/Build.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEW/GOAT.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEW/GoatAttack.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEW/GoatWalking.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEW/NEWWALKINGGOAT.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEW/SECONDATTACK.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEW/SM_Goat.FBX (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEW/WETPAINTFINISHED.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/NEWGOAT.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/SECONDUNREAL.FBX (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/ScienceUnreal.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/THIRD.avi (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/WALKINGCYCLENEW.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/attackGOAT.fbx (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/bridge.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
ALICIA/buildingHIGHPOLY2.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Art Misc/Gun1/Gun.mb (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Art Misc/Gun1/gun_low.fbx (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Art Misc/WoodenSign.blend (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 KiB

BIN
CivilianCharacter/Merchant_low_Civilian_BaseColor.png (Stored with Git LFS) Normal file

Binary file not shown.

BIN
CivilianCharacter/Merchant_low_Civilian_Normal.png (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Concept Art/Modular_test.fbx (Stored with Git LFS)

Binary file not shown.

View File

@ -15,6 +15,7 @@ ManualIPAddress=
[/Script/Engine.Engine] [/Script/Engine.Engine]
+ActiveGameNameRedirects=(OldGameName="/Script/TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") +ActiveGameNameRedirects=(OldGameName="/Script/TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss")
+ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss") +ActiveGameNameRedirects=(OldGameName="TP_ThirdPerson",NewGameName="/Script/the_twilight_abyss")
UseStaticMeshMinLODPerQualityLevels=False
[/Script/EngineSettings.GameMapsSettings] [/Script/EngineSettings.GameMapsSettings]
EditorStartupMap=/Game/Levels/Build.Build EditorStartupMap=/Game/Levels/Build.Build
@ -26,7 +27,7 @@ ThreePlayerSplitscreenLayout=FavorTop
FourPlayerSplitscreenLayout=Grid FourPlayerSplitscreenLayout=Grid
bOffsetPlayerGamepadIds=False bOffsetPlayerGamepadIds=False
GameInstanceClass=/Script/Engine.GameInstance GameInstanceClass=/Script/Engine.GameInstance
GameDefaultMap=/Game/Levels/Build.Build GameDefaultMap=/Game/Levels/Testing/MainMenuLevel.MainMenuLevel
ServerDefaultMap=/Engine/Maps/Entry.Entry ServerDefaultMap=/Engine/Maps/Entry.Entry
GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C GlobalDefaultGameMode=/Game/Merchant/BP_MerchantGameMode.BP_MerchantGameMode_C
GlobalDefaultServerGameMode=None GlobalDefaultServerGameMode=None
@ -140,3 +141,12 @@ CategorySlot8=Eight
CategorySlot9=Nine CategorySlot9=Nine
CategorySlot0=Zero CategorySlot0=Zero
[/Script/Engine.RendererSettings]
r.ReflectionMethod=1
r.GenerateMeshDistanceFields=True
r.DynamicGlobalIlluminationMethod=1
r.Lumen.TraceMeshSDFs=0
r.SkinCache.CompileShaders=True
r.RayTracing=True
r.Lumen.TranslucencyReflections.FrontLayer.EnableForProject=True

View File

@ -3,7 +3,7 @@
[/Script/EngineSettings.GeneralProjectSettings] [/Script/EngineSettings.GeneralProjectSettings]
ProjectID=F2B2881E401D78B424BDDF9BBE633AFD ProjectID=F2B2881E401D78B424BDDF9BBE633AFD
ProjectVersion=0.2.0 ProjectVersion=0.2.0
CompanyName=Team 2:13 CompanyName=Cave In Studios
ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "3415E4AF4ECD4236C9C61DA55D72AA2A", "The Twilight Abyss") ProjectDisplayedTitle=NSLOCTEXT("[/Script/EngineSettings]", "3415E4AF4ECD4236C9C61DA55D72AA2A", "Azure Abyss")
ProjectName=The Twilight Abyss ProjectName=Azure Abyss

View File

@ -81,7 +81,7 @@ DoubleClickTime=0.200000
+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom) +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=Gamepad_FaceButton_Bottom)
+ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar) +ActionMappings=(ActionName="Jump",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=SpaceBar)
+ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E) +ActionMappings=(ActionName="Interact",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=E)
+ActionMappings=(ActionName="RightClick",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton) +ActionMappings=(ActionName="Click",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftMouseButton)
+ActionMappings=(ActionName="Sneak",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftControl) +ActionMappings=(ActionName="Sneak",bShift=False,bCtrl=False,bAlt=False,bCmd=False,Key=LeftControl)
+AxisMappings=(AxisName="Look Up / Down Gamepad",Scale=1.000000,Key=Gamepad_RightY) +AxisMappings=(AxisName="Look Up / Down Gamepad",Scale=1.000000,Key=Gamepad_RightY)
+AxisMappings=(AxisName="Look Up / Down Mouse",Scale=-1.000000,Key=MouseY) +AxisMappings=(AxisName="Look Up / Down Mouse",Scale=-1.000000,Key=MouseY)

BIN
Content/Animations/Boss/AB_Boss.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Boss/Fight_Idle_mixamo_com.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Boss/Mutant_Dying_mixamo_com.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Animations/Boss/Mutant_Idle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Boss/Mutant_Idle_Anim_mixamo_com.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Boss/Mutant_Idle_PhysicsAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Boss/Mutant_Idle_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Boss/Mutant_Swiping_mixamo_com.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Animations/GoatAttack/GoatAttack_Anim.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking/GoatBlend.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking/GoatWalking.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking/Goat_Idle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking/Goat_Run.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking/goat_animation_2.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/GoatWalking/goat_animation_2_Anim.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Animations/Merchant/Idle1/Dwarf_Idle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Animations/Merchant/Idle1/Dwarf_Idle_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Merchant/Idle1/WorldGridMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Merchant/Idle2/Idle.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Animations/Merchant/Idle2/Idle_PhysicsAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Merchant/Idle2/Idle_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Merchant/Idle2/WorldGridMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Merchant/Wave/Waving.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Animations/Merchant/Wave/Waving_PhysicsAsset.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Merchant/Wave/Waving_Skeleton.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Animations/Merchant/Wave/WorldGridMaterial.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Characters/Boss/M_Boss.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Characters/Goat_Enemy/SM_Goat.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Characters/Merchant/AMerchant.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Assets/Characters/Merchant/Merchant_Body_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Characters/Merchant/Merchant_Boots_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Characters/Merchant/Merchant_Hair_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Characters/Merchant/Merchant_Hood_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Assets/Characters/Merchant/Merchant_Sash_low.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More