Marcel Hara
|
7e8ded362a
|
Added All Item ammo types
Added every item ammo type to the game
|
2023-03-13 17:00:08 +00:00 |
|
Charlie Seymour
|
e0f7a2682a
|
Bugfix Old Version of the Character with Missing References
|
2023-03-13 16:11:44 +00:00 |
|
Charlie Seymour
|
6ff315dfe7
|
Changed AIBruh hitbox
Moved hitbox
|
2023-03-13 15:57:48 +00:00 |
|
Charlie Seymour
|
2f2ecc2d76
|
Change AIBruh to actual model
Mesh and material changed.
|
2023-03-13 15:54:30 +00:00 |
|
Kacper Szelest
|
a67482c6d7
|
Merge remote-tracking branch 'origin/Tutorial-final' into dev
# Conflicts:
# Content/Levels/Build.umap
|
2023-03-13 15:45:56 +00:00 |
|
Kacper Szelest
|
0146e89f88
|
Merge remote-tracking branch 'origin/Merchant' into art-implementation
# Conflicts:
# Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset
# Content/Blueprints/Player/BP_MyTempCharacter.uasset
# Content/Levels/Build.umap
# Content/Levels/Top_layer_level.umap
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
|
2023-03-13 15:35:46 +00:00 |
|
Kacper Szelest
|
6c3b6b1ad2
|
Merge remote-tracking branch 'origin/Environment-assets' into art-implementation
|
2023-03-13 15:29:04 +00:00 |
|
Kacper Szelest
|
271f0163ff
|
Updated build level
I added crystals and lights into the level to finish the look of the tutorial.
|
2023-03-06 17:19:38 +00:00 |
|
GEORGE TAYLOR
|
144d4ab3da
|
Imported Assets for Town Dressing into Unreal
|
2023-03-06 16:53:38 +00:00 |
|
Kacper Szelest
|
22402626a3
|
Added crystal assets into Build level
I added the crysta levels into the tutorial of the build level
|
2023-03-06 16:33:57 +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 |
|
Kacper Szelest
|
eab68734e1
|
Merge remote-tracking branch 'origin/Environment-assets' into Tutorial-final
|
2023-03-06 16:17:18 +00:00 |
|
GEORGE TAYLOR
|
57c97bfaa5
|
Imported General Dressing Assets too Unreal
Imported assets used for general dressing into a new folder in unreal.
|
2023-03-06 16:17:15 +00:00 |
|
|
|
b532eaaa4e
|
Merge remote-tracking branch 'origin/Hub-level-blockout' into dev
|
2023-03-06 16:11:37 +00:00 |
|
Kacper Szelest
|
1f9e1c3f93
|
Updated build level
I added a collision to one object in the build level
|
2023-03-06 16:08:35 +00:00 |
|
GEORGE TAYLOR
|
f4f8edb6eb
|
Imported the crystal assets to Unreal
|
2023-03-06 15:42:52 +00:00 |
|
Emily Taylor
|
c4a668c2e9
|
Added Merchant Shop assets
Added Merchant shop FBX
|
2023-03-06 15:31:55 +00:00 |
|
|
|
b16f632537
|
Updated Combat to Hide Gold & Health Text
|
2023-03-06 05:25:36 +00:00 |
|
|
|
d100a85a0d
|
Updated Combat to Set Camera to Face Enemy
|
2023-03-06 04:28:13 +00:00 |
|
|
|
b5048e4be3
|
Updated Project Settings for Build
|
2023-03-06 00:22:09 +00:00 |
|
|
|
1cf40d1c05
|
Merge branch 'Hub-level-blockout' into dev
|
2023-03-06 00:20:01 +00:00 |
|
|
|
704ba824e6
|
Merge branch 'Turn-Based-Combat' into Hub-level-blockout
|
2023-03-05 18:47:08 +00:00 |
|
MH261677
|
34f6d6451b
|
Updated AIController adding Hearing sense + config
Added hearing sense to the aicontroller and added it to the BTTask.
|
2023-03-05 17:42:21 +00:00 |
|
MH261677
|
4357537009
|
Updated TempCharacter to create NoiseEmitter
Got the NoiseEmitter component and then used the makenoise function to make it create noise everytime the player walks
|
2023-03-05 17:41:39 +00:00 |
|
KACPER Szelest
|
a0d3a1a34b
|
Updated build level
I just added textures to a few untextured objects with temp rock textures
|
2023-03-04 20:43:00 +00:00 |
|
KACPER Szelest
|
71c6e641c1
|
Updated build level
I added some walls around things to avoid having the game look bad and empty. and more like an actual abyss and cave system
|
2023-03-04 20:41:46 +00:00 |
|
KACPER Szelest
|
c67bdf6c9c
|
Updated build level with extra meshes
I added a few meshes to create tunnels and a cavern in one of our levels to create a better feeling of being in a cavey abyss
|
2023-03-04 19:10:12 +00:00 |
|
KACPER Szelest
|
ffac8b483f
|
Updated build level with outline material and wall
I added the big wall in to the build level and added some outlines into the level
|
2023-03-03 21:10:47 +00:00 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
06deee7b0b
|
Merge branch 'dev' into Hub-level-blockout
|
2023-02-28 15:34:49 +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 |
|
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 |
|
