Commit Graph

569 Commits

Author SHA1 Message Date
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
Alicia
b9f54ee51d Merge branch 'Environment-assets' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into houes-modles 2023-03-06 17:10:02 +01: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
da1b3e9137 Bugfix Null Cached AI References 2023-03-06 15:37:31 +00:00
Emily Taylor
c4a668c2e9 Added Merchant Shop assets
Added Merchant shop FBX
2023-03-06 15:31:55 +00:00
Marcel Hara
0da833f0f7 Created Combos,MainWidget to allow widget switch
Created a Combos and MainMenu Widget screen. Also reworked the inventory UI and fixed layering and scaling issues
2023-03-06 15:12:06 +00:00
6db0770582 Bugfix Crouch Crashing Game 2023-03-06 15:00:08 +00:00
b16f632537 Updated Combat to Hide Gold & Health Text 2023-03-06 05:25:36 +00:00
0a0c5ed017 Bugfix Combat Initiation Not Checking AI Blackboard 2023-03-06 04:56:05 +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
f8f6d28925 Merge remote-tracking branch 'origin/houes-modles' into dev 2023-03-06 00:21:09 +00:00
5f8ba8d57b Merge remote-tracking branch 'origin/UI-designs' into dev 2023-03-06 00:20:58 +00:00
884fa87df8 Merge remote-tracking branch 'origin/Merchant' into dev 2023-03-06 00:20:42 +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
82400fe203 Merge pull request #11 from Games-Academy-Student-Work-22-23/stealth-rework
Stealth rework
2023-03-05 18:11:30 +00:00
MH261677
fd16d32de7 Updated TempCharacter to cleanup
Cleaned up unused code/logs
2023-03-05 17:44:58 +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
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