Philip/AzureAbyss
1
0
Fork 0
Code Issues Pull Requests Releases 1 Activity
586 Commits 1 Branch 15 Tags
Commit Graph

162 Commits

Author SHA1 Message Date
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
PHILIP White
3e34ab4c5c Bugfix Bridge Massive Gap 2023-04-24 12:18:04 +01:00
PHILIP White
94f45d99c3 Added Combat UI Asset for World Space 2023-04-21 02:57:18 +01:00
PHILIP White
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
e3c83ba4ff Added collisions to assets 
I added collisions to assets
 2023-04-20 16:07:17 +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
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
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
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
MARCEL HARA
fd64b18f61 Updated LOD to all crystals 2023-03-29 17:16:50 +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
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
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
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
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
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
b7a5d974ac Updated Build Map to Stop Goats from Colliding 2023-03-13 22:17:44 +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
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
Charlie Seymour
2f2ecc2d76 Change AIBruh to actual model 
Mesh and material changed.
 2023-03-13 15:54:30 +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
Emily Taylor
c4a668c2e9 Added Merchant Shop assets 
Added Merchant shop FBX
 2023-03-06 15:31:55 +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
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
Charlie Seymour
216275cb53 Implemented modular kit for tutorial level 2023-02-28 11:43:42 +00:00
Charlie Seymour
4e11a3a63f Added tutorial modular kit for first level 2023-02-27 18:14:51 +00:00