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

187 Commits

Author SHA1 Message Date
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
Kacper Szelest
70d0c545ed Moddeled hub level blockout 
I created the hub level blockout to be used as a showcase and inspiration for a final design creation
 2023-02-27 15:31:06 +00:00
Kacper Szelest
26c6885e86 Created platform blockout asset 
I created a temporary asset blockout for the big science building platform asset to use as a showcase
 2023-02-27 15:28:53 +00:00
PHILIP WHITE
76043108b1 Merge pull request #10 from Games-Academy-Student-Work-22-23/Stealth-Mechanics-v1.0.2 
Stealth mechanics v1.0.2
 2023-02-23 16:04:33 +00:00
MARCEL HARA
ce4f3aff1f Added SneakMechanicTesting level 
Added new level for sneak mechanic testing
 2023-02-23 16:03:10 +00:00
ROWLAND ROWLAND
69f4b8e603 Merge branch 'dev' into Level-1-bloackout 2023-02-23 15:49:45 +00:00
PHILIP White
fb0bd09bb2 Merge remote-tracking branch 'origin/dev' into Level-Design 2023-02-23 15:06:57 +00:00
PHILIP White
56b61bd1d2 Added Temp Status Icons and Font for Status Testing 2023-02-23 03:02:49 +00:00
PHILIP White
3b1f33006a Added Combat Test Level for New Combat Features 2023-02-23 01:29:01 +00:00
Charlie Seymour
f378d4a4fd Added modular kit test for tutorial 2023-02-20 15:16:26 +00:00
Kacper Szelest
a67d96943c Added file level 
I added a new level file named level 1, to house the blockout of level one and the future first level
 2023-02-20 14:47:52 +00:00
MH261677
618a9509ca Updated EatableItems to add ammo {UNSTABLE} 
Added functionality to the ammo count currently unstable as need to wait for other programmer to understand why it crashes.
 2023-02-19 15:29:16 +00:00
MH261677
43ef8e2110 Updated TempCharacter to sneak functionality 
Added sneak functionality which makes the sphere radius smaller near enemies.
 2023-02-17 13:12:28 +00:00
MARCEL HARA
77c43ab3d1 Updated TempCharacter to find AI Sphere 2023-02-16 15:02:58 +00:00
Rowland Rowland
f032ac91c9 Cleaning Level 
Using booleans to remove excess assets
 2023-02-09 17:02:47 +00:00
MH261677
324f062cc7 Updated EatableItems for AmmoFunctionality 
Added ammo base functionality for using the ammo item in game
 2023-02-07 00:11:00 +00:00
MH261677
797c447d47 Added Ammo Icon to Images 2023-02-06 23:51:45 +00:00
Rowland Rowland
30d22975b7 Updated Level 
Added textures and began experimenting with curves. Planning to investigate Splines
 2023-02-06 17:24:41 +00:00
MARCEL HARA
36c18382a2 Updated TempCharacter for sneaking vignette effect 
Added a Vignette effect when crouching
 2023-02-06 15:55:12 +00:00
PHILIP White
d36fe6fed0 Added Breakable Walls BP 
Using Particles at the moment
 2023-02-01 23:37:17 +00:00
PHILIP White
e2f91a11b5 Bugfix Platform Too High to Get Across 2023-01-31 03:29:35 +00:00
PHILIP White
8cf4d1d52e Built Lighting for Build 2023-01-31 02:45:23 +00:00
PHILIP White
326e64e7ed Merge remote-tracking branch 'origin/Level-Design' into dev 2023-01-31 02:19:42 +00:00
PHILIP White
64f5d652ff Merge remote-tracking branch 'origin/Enviroment-Art' into dev 2023-01-31 02:19:30 +00:00
PHILIP White
75f373e0c4 Updated Beta Level Map for Temp Jelly Assets 2023-01-31 02:15:07 +00:00
PHILIP White
a15054656e Merge branch 'dev' into Shaders 
# Conflicts:
#	Content/Levels/Top_layer_level.umap
 2023-01-31 02:04:48 +00:00