Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
571 Commits 1 Branch 15 Tags 5.3 GiB
00a22d1c39
Commit Graph

385 Commits

Author SHA1 Message Date
George Taylor
f723db11c9 Imported the styalised textures bitmaps into Unreal 2023-03-29 14:40:05 +01:00
PHILIP White
c0ff4f6b9f Bugfix Origin on Ropebridge 2023-03-29 13:10:14 +01:00
PHILIP White
2e6398da59 Bugfix Input Not Being Re-Enabled On Respawn 2023-03-28 05:19:41 +01:00
PHILIP White
8407c02042 Updated Build Map for Light Build 2023-03-28 05:08:52 +01:00
PHILIP White
2c9de7ee58 Bugfix Invisible Plane When Entering Large Room Block 2023-03-28 05:01:07 +01:00
PHILIP White
b51ac385cd Bugfix Inventory Widget Anchors Not Correctly Set 2023-03-28 04:56:56 +01:00
PHILIP White
e8c29d8004 Updated Build Map to Include Rope Bridge & More Direction 2023-03-28 04:53:13 +01:00
PHILIP White
1b4a2673e3 Updated Combat UI for New Conventions (WIP) 2023-03-28 04:36:27 +01:00
PHILIP White
544de9810c Updated Combat Character Increased Sprint Speed 2023-03-28 03:46:35 +01:00
PHILIP White
3f5c7bcf1c Bugfix Merchant Unable to Purchase Items 2023-03-28 03:43:31 +01:00
PHILIP White
e28da9ab26 Added Lights In Shop 2023-03-28 03:16:39 +01:00
PHILIP White
24d0f2b334 Added Wooden Sign to Direct Players 2023-03-28 03:11:41 +01:00
phoebe
fe60960c21 ADDED SMALL MUSHROOMS 2023-03-27 17:31:10 +01: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
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
Marcel Hara
6f9f95ab9d Attempted fix widget to merchant system 2023-03-14 13:04:33 +00:00
PHILIP White
363623a315 Updated Build Map for Goat Tweaks 2023-03-14 05:05:20 +00:00
PHILIP White
acbbed522b Cooked New Materials for Build 2023-03-14 04:47:53 +00:00
PHILIP White
7d078cbb4c Added Sprint using Left Shift 2023-03-14 04:40:13 +00:00
PHILIP White
7585520586 Added Death Screen 2023-03-14 04:17:29 +00:00
PHILIP White
c5409fcaa7 Removed Merchant Soft Lock for Build 
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
 2023-03-14 04:01:09 +00:00
PHILIP White
5b6461224a Updated Build Map for Organisation of Objects 2023-03-14 00:44:57 +00:00
PHILIP White
b27f6ef064 Added Flashlight Tutorial 2023-03-14 00:34:06 +00:00
PHILIP White
63b6c20c13 Updated Combat Character to Toggle Flashlight 2023-03-14 00:31:06 +00:00
PHILIP White
576c8fc2a5 Baked Atlas for Break Particle Effect 2023-03-14 00:22:57 +00:00
PHILIP White
a12aedde9d Added Breathing Effect on Breakable Walls 2023-03-13 23:59:40 +00:00
PHILIP White
78382d7b97 Updated Build Level to Re-Add Science Buildings 2023-03-13 23:18:43 +00:00
PHILIP White
fd99e87d77 Updated Science Buildings to Fix Origins & Scales 2023-03-13 23:18:13 +00:00
PHILIP White
b7a5d974ac Updated Build Map to Stop Goats from Colliding 2023-03-13 22:17:44 +00:00
PHILIP White
4d77431338 Merge branch 'Quest-&-Dialogue-System' into dev 2023-03-13 22:02:36 +00:00
PHILIP White
17afc60c22 Merge branch 'houes-modles' into dev 
# Conflicts:
#	Content/Levels/Build.umap
 2023-03-13 18:20:17 +00:00
PHILIP White
bef31d5738 Merge branch 'environment_assets' into dev 2023-03-13 18:12:50 +00:00
PHILIP White
af86084f3e Updated Quest UI to Display Tasks 2023-03-13 18:11:42 +00:00
PHILIP White
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
d7ad370c99 build with two background buildings 2023-03-13 18:16:55 +01: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
PHILIP WHITE
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
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
PHILIP White
3a99e71bde Added Base Stub for Quest System 2023-03-13 05:19:13 +00:00
PHILIP White
76b2d78f0e Updated Dialogue for Choices 2023-03-13 04:49:09 +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
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
PHILIP White
b532eaaa4e Merge remote-tracking branch 'origin/Hub-level-blockout' into dev 2023-03-06 16:11:37 +00: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
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
PHILIP White
b16f632537 Updated Combat to Hide Gold & Health Text 2023-03-06 05:25:36 +00:00
PHILIP White
d100a85a0d Updated Combat to Set Camera to Face Enemy 2023-03-06 04:28:13 +00:00
PHILIP White
b5048e4be3 Updated Project Settings for Build 2023-03-06 00:22:09 +00:00
PHILIP White
1cf40d1c05 Merge branch 'Hub-level-blockout' into dev 2023-03-06 00:20:01 +00:00
PHILIP White
704ba824e6 Merge branch 'Turn-Based-Combat' into Hub-level-blockout 2023-03-05 18:47:08 +00:00
MH261677
34f6d6451b Updated AIController adding Hearing sense + config 
Added hearing sense to the aicontroller and added it to the BTTask.
 2023-03-05 17:42:21 +00:00
MH261677
4357537009 Updated TempCharacter to create NoiseEmitter 
Got the NoiseEmitter component and then used the makenoise function to make it create noise everytime the player walks
 2023-03-05 17:41:39 +00:00
KACPER Szelest
a0d3a1a34b Updated build level 
I just added textures to a few untextured objects with temp rock textures
 2023-03-04 20:43:00 +00:00
KACPER Szelest
71c6e641c1 Updated build level 
I added some walls around things to avoid having the game look bad and empty. and more like an actual abyss and cave system
 2023-03-04 20:41:46 +00:00
KACPER Szelest
c67bdf6c9c Updated build level with extra meshes 
I added a few meshes to create tunnels and a cavern in one of our levels to create a better feeling of being in a cavey abyss
 2023-03-04 19:10:12 +00:00
KACPER Szelest
ffac8b483f Updated build level with outline material and wall 
I added the big wall in to the build level and added some outlines into the level
 2023-03-03 21:10:47 +00:00
PHILIP White
be7af7e6a5 Updated Build Map for Merchant 2023-03-03 20:18:15 +00:00
Rowland Rowland
74a6e239e8 Added enemies and fixed asset collision 2023-03-03 18:51:29 +00:00
PHILIP White
69b235030a Updated Combat Character to Add a Flashlight 2023-03-03 18:39:59 +00:00
Kacper Szelest
f1e775dfa1 Updated build level 
Fixed up the tutorial level so it looks a bit better
 2023-03-03 18:32:42 +00:00
Kacper Szelest
87c2833381 Added a crystal asset 
Added a crystal asset to use for level dressing
 2023-03-03 18:25:52 +00:00
Kacper Szelest
26c93284d0 Updated build level 
Added a few dressing assets and dressed the level
 2023-03-03 18:13:30 +00:00
Rowland Rowland
e335e039fd Updated Build Scene 
Ordered levels for build
 2023-03-03 16:23:20 +00:00
Kacper Szelest
f0e13d9522 Added a new level titled build 
I added a new level called build so that we can make our new build level in for showcase and testing
 2023-03-03 16:02:34 +00:00
Kacper Szelest
2b0567ab6e Added collisions to blockout level 
I added collisions to all assets in the blockout level to be used in testing
 2023-03-03 15:47:45 +00:00
PHILIP White
c742abfce4 Added DamageOverTime Status Effect for Combat 2023-03-02 15:06:31 +00:00
PHILIP White
0be235f6b1 Updated Thorns Status Effect to Trigger OnPlayerDamage 2023-03-02 03:25:00 +00:00
PHILIP White
06deee7b0b Merge branch 'dev' into Hub-level-blockout 2023-02-28 15:34:49 +00:00
PHILIP White
e8c20e2d67 Merge branch 'dev' into Turn-Based-Combat 
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
#	Content/Dialogue/NPCTest.uasset
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
 2023-02-28 15:29:35 +00:00
PHILIP White
9845639e8c Merge branch 'dev' into ui-art-replacement 2023-02-28 15:26:27 +00:00
PHILIP White
8e5416e3a9 Merge branch 'dev' into Modular-Kit 
# Conflicts:
#	Content/Levels/Top_layer_level.umap
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
 2023-02-28 15:25:47 +00:00
Emily Taylor
2a4300066c Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss 2023-02-28 13:18:35 +00:00