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

918 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PHILIP White
98c07aab17 Merge branch 'dev' into houes-modles 2023-02-28 15:33:06 +00:00
PHILIP White
d7c3ebfa74 Merge branch 'dev' into UI-designs 2023-02-28 15:30:31 +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
PHILIP White
02832aee0e Updated TurnBasedCombat for Event Delegation 2023-02-27 20:01:02 +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
KACPER SZELEST
4b1f3538af Updated readme.ne 
I added a link to the google drive file of the bestiary lore book so that anyone can access and edit it if need be.
 2023-02-27 17:43:46 +00:00
PHILIP White
775f3b4945 Added Function Stub for Turn Events 2023-02-27 17:32:34 +00:00
PHOEBE HARRIS-WILSON
0121622ac3 the gun elements in circles 
the ui icon designs for the gun elements are updated
 2023-02-27 17:11:46 +00:00
MARCEL HARA
73dc65a3d4 Merge remote-tracking branch 'origin/UI-designs' into ui-art-replacement 2023-02-27 16:59:31 +00:00
Emily Taylor
fed1705f91 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-02-27 16:31:09 +00:00
PHOEBE HARRIS-WILSON
8c54380e01 The first gun elements 
the first ui gun element outlines
 2023-02-27 16:12:59 +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
Alicia
a9a2fe1cc0 added maya file 
steampunk building
 2023-02-27 17:03:36 +01:00
Emily Taylor
c9148973ca Added Character Folder 
FBX and Textures for Merchant Character
 2023-02-27 15:57:14 +00:00
Blue Probert
4d1edea71d Added links to additional meterial about combat and enemys 
Added a link to the enemy spread sheet and updated the ones for the combat google doc and the combat google sheet
 2023-02-27 15:51:03 +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
PHOEBE HARRIS-WILSON
dfb3e203d7 UI symbols 2023-02-27 15:42:38 +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
e496cf07e9 Updated TurnBasedCombat to Use StatusSystem 2023-02-27 04:55:55 +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
671ab8e3d7 Merge remote-tracking branch 'origin/UI-designs' into dev 2023-02-25 02:27:07 +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
Charlie Seymour
c7760f042b Added Maya file for Tutorial level 2023-02-23 17:55:36 +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
37deb51b5f Added HealOverTime Status Effect for Testing 2023-02-23 03:50:26 +00:00
PHILIP White
adba724dba Updated StatusSystem for Base UI and Time Functionality 2023-02-23 03:05:09 +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
985e713659 Bugfix No Post Processing Volume Crashes Engine 2023-02-23 01:28:29 +00:00
PHILIP White
c880eb27ac Updated StatusSystem Struct for Bool Comparisons 2023-02-23 01:05:27 +00:00