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

419 Commits

Author SHA1 Message Date
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
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
PHILIP White
985fdfa3af Updated Goat Textures 2023-04-17 17:21:45 +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
PHILIP White
dc7e00b5f3 Imported Goat Attack and Walking Animations 2023-04-17 16:53:01 +01:00
PHILIP White
fa4857447c Merge branch 'UI_implementation' into dev 2023-04-17 15:03:56 +01:00
PHILIP White
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
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
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