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

505 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PHILIP White
31a6a5d98e Added StatusEffect Stub for Multiple Status Effects 2023-02-20 17:58:32 +00:00
PHILIP WHITE
5dae3b2691 Merge pull request #9 from Games-Academy-Student-Work-22-23/Fix-UI-Scaling 
Fix UI scaling
 2023-02-20 16:04:44 +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
Phoebe Harris-Wilson
0d135251df update book 2023-02-20 15:31:49 +00:00
Phoebe Harris-Wilson
06fa5cc09d added ui designs for icons and book 2023-02-20 15:24:00 +00:00
Charlie Seymour
f378d4a4fd Added modular kit test for tutorial 2023-02-20 15:16:26 +00:00
MARCEL HARA
cc8eee9727 Merge pull request #8 from Games-Academy-Student-Work-22-23/resource-mining 
Resource mining
 2023-02-20 15:11:43 +00:00
MARCEL HARA
e9af8b713f Updated EatableItems to fix Ammo Consuming 
Fixed ammo consuming crashing the client
 2023-02-20 14:49:05 +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
3c2d057951 Updated TempCharacter to destory ammo ore 
destroys ammo ore when the player presses e on it
 2023-02-19 15:28:34 +00:00