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

240 Commits

Author SHA1 Message Date
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
Emily Taylor
1958eabc3d Added Goat Enemy for Tutorial Level 
Goat FBX and materials ready for rigging and importing to engine
 2023-02-28 13:18:14 +00:00
Charlie Seymour
216275cb53 Implemented modular kit for tutorial level 2023-02-28 11:43:42 +00:00
Charlie Seymour
7a36b200ca Merge branch 'Modular-Kit' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into Modular-Kit 2023-02-27 18:15:11 +00:00
Charlie Seymour
4e11a3a63f Added tutorial modular kit for first level 2023-02-27 18:14:51 +00:00
MARCEL HARA
1ead32f0c8 Added InventoryImage to Inventory UI 2023-02-27 17:45:58 +00:00
George Taylor
37dad4c873 Imported Beam Assets into Unreal 
i Imported the beam assets from maya into the unreal engine 5
 2023-02-27 16:12:18 +00:00
George Taylor
f2c69dfe3a Added the assets for the Tutorial Level to Unreal 2023-02-27 15:44:19 +00:00
George Taylor
a43ed3a626 Added the Wooden Texture for the Tutorial Assets 2023-02-27 15:43:18 +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
fb697f3588 Added Thorns Status Effect for Combat 2023-02-27 04:55:12 +00:00
PHILIP White
9b0ef82e7c Updated TurnBasedCombat to Include New Combos 2023-02-27 04:07:19 +00:00
PHILIP White
e96c3411c0 Updated StatusSystem for Seconds Countdown 2023-02-27 03:46:06 +00:00
PHILIP White
a6ef9f76cd Merge branch 'Dialogue-System' into dev 2023-02-25 02:27:38 +00:00
PHILIP White
2f47693608 Bugfix Expiry Timers Not Getting Invalidated 2023-02-25 01:25:32 +00:00
PHILIP White
939d1e8b92 Bugfix StatusEffects Not Being Added to Player 2023-02-25 00:20:49 +00:00
PHILIP White
88323e4ea6 Updated EatableItems to Add Status Effects 2023-02-23 17:48:20 +00:00
George Taylor
4b886518fd Imported Modular Planks into Unreal 
Imported the Modular Planks for the Tutorial Level into Unreal from Maya
 2023-02-23 17:40:57 +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
MARCEL HARA
119b5a141a Updated TempCharacter to remove unused Ulogs 2023-02-23 15:19:32 +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
2eae4b6c0e Added Status Indicator Widget for HUD Indication 2023-02-23 03:01:21 +00:00
PHILIP White
3b1f33006a Added Combat Test Level for New Combat Features 2023-02-23 01:29:01 +00:00
PHILIP White
31a6a5d98e Added StatusEffect Stub for Multiple Status Effects 2023-02-20 17:58:32 +00:00
MARCEL HARA
5e448c897d Updated Widgets to fix scaling issue 
Fixed scaling issue on all widgets to fit all monitor types
 2023-02-20 16:03:25 +00:00
Charlie Seymour
f378d4a4fd Added modular kit test for tutorial 2023-02-20 15:16:26 +00:00
Kacper Szelest
177a4f685f Added and made Level 1 Blockout assets 
I added and put implamented the level 1 blockout assets and created the blockout level for it.
 2023-02-20 14:48:45 +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
PHILIP White
26f21a9136 Updated DialogueNPC to use Ranged For Loops 2023-02-20 09:50:09 +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
PHILIP White
d1fab9f9a1 Updated DialogueNPC for Structs and Dialogue Paths 2023-02-09 03:12:27 +00:00
MH261677
a6436c9110 Added BP_AmmoItem 
Added Ammo into the game for the player to find
 2023-02-07 00:11:19 +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
MARCEL HARA
5b4da1f02e Updated TempCharacter for Jump and Sneak 
Added A sneak function and Jump function for the character
 2023-02-06 15:26:22 +00:00
MARCEL HARA
0cf4ace43a Updated TempCharacter 
Added Jump function which is using ACharacter and started working on custom Sneak function
 2023-02-06 14:30:13 +00:00
PHILIP White
a16de31aa2 Merge remote-tracking branch 'origin/merchant-system-v4' into dev 2023-02-06 13:53:22 +00:00