|
|
be7af7e6a5
|
Updated Build Map for Merchant
|
2023-03-03 20:18:15 +00:00 |
|
Rowland Rowland
|
74a6e239e8
|
Added enemies and fixed asset collision
|
2023-03-03 18:51:29 +00:00 |
|
|
|
69b235030a
|
Updated Combat Character to Add a Flashlight
|
2023-03-03 18:39:59 +00:00 |
|
Kacper Szelest
|
f1e775dfa1
|
Updated build level
Fixed up the tutorial level so it looks a bit better
|
2023-03-03 18:32:42 +00:00 |
|
Kacper Szelest
|
87c2833381
|
Added a crystal asset
Added a crystal asset to use for level dressing
|
2023-03-03 18:25:52 +00:00 |
|
Kacper Szelest
|
26c93284d0
|
Updated build level
Added a few dressing assets and dressed the level
|
2023-03-03 18:13:30 +00:00 |
|
Emily Taylor
|
26235757f5
|
Added Merchant Store Assets
Merchant FBX assets ready to be textured
|
2023-03-03 17:32:18 +00:00 |
|
Rowland Rowland
|
e335e039fd
|
Updated Build Scene
Ordered levels for build
|
2023-03-03 16:23:20 +00:00 |
|
Kacper Szelest
|
f0e13d9522
|
Added a new level titled build
I added a new level called build so that we can make our new build level in for showcase and testing
|
2023-03-03 16:02:34 +00:00 |
|
Kacper Szelest
|
2b0567ab6e
|
Added collisions to blockout level
I added collisions to all assets in the blockout level to be used in testing
|
2023-03-03 15:47:45 +00:00 |
|
PHOEBE HARRIS-WILSON
|
b0505fa293
|
gun elements colour edited
some new colours for the gun elements
|
2023-03-03 15:25:29 +00:00 |
|
PHOEBE HARRIS-WILSON
|
e2bab074c6
|
gun elements first colour
the original colouring for the gun element before i alter them
|
2023-03-03 13:39:30 +00:00 |
|
|
|
9acc103506
|
Updated readme.md to Move Links to Root Folder
|
2023-03-02 16:18:31 +00:00 |
|
|
|
7491a47cc0
|
Update Links To Additional Resources.md
|
2023-03-02 16:15:43 +00:00 |
|
|
|
fdfd244a29
|
Updated Link to Resources to Markdown for Readability
|
2023-03-02 16:14:12 +00:00 |
|
|
|
0bf0b5a220
|
Updated StatusSystem to Display Active Turns
|
2023-03-02 15:37:36 +00:00 |
|
|
|
c742abfce4
|
Added DamageOverTime Status Effect for Combat
|
2023-03-02 15:06:31 +00:00 |
|
|
|
0be235f6b1
|
Updated Thorns Status Effect to Trigger OnPlayerDamage
|
2023-03-02 03:25:00 +00:00 |
|
Alicia
|
6e0d50b926
|
Final version of the building
|
2023-03-01 14:16:49 +01:00 |
|
Alicia
|
b796116315
|
Merge branch 'houes-modles' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into houes-modles
|
2023-02-28 17:55:44 +01:00 |
|
Alicia
|
f0368f1530
|
Uploaded previous versions of the steampunk building
|
2023-02-28 17:51:46 +01:00 |
|
|
|
6227b4952c
|
Updated StatusSystem to Bind Player/Enemy Turn Events
|
2023-02-28 16:48:30 +00:00 |
|
|
|
06deee7b0b
|
Merge branch 'dev' into Hub-level-blockout
|
2023-02-28 15:34:49 +00:00 |
|
|
|
98c07aab17
|
Merge branch 'dev' into houes-modles
|
2023-02-28 15:33:06 +00:00 |
|
|
|
d7c3ebfa74
|
Merge branch 'dev' into UI-designs
|
2023-02-28 15:30:31 +00:00 |
|
|
|
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 |
|
|
|
9845639e8c
|
Merge branch 'dev' into ui-art-replacement
|
2023-02-28 15:26:27 +00:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
