Commit Graph

649 Commits

Author SHA1 Message Date
d1f959a9dc Updated Quest & Dialogue to Add Quests from Dialogue 2023-05-02 07:16:40 +01:00
e3027fcd24 Updated Quest System for Functionality 2023-05-02 05:42:48 +01:00
bff44b56a7 Bugfix Able to Click Dialogue on Choice Select 2023-05-01 05:23:43 +01:00
25e9a4f4fc Updated Dialogue UI for Style Consistency 2023-05-01 05:22:56 +01:00
f7ab9a2cfb Reorganised Build Level for Easy Searchability 2023-04-30 21:25:10 +01:00
393eea2250 Updated Map to Remove Rope on Model as Impossible to Align
Rope is curved
2023-04-30 20:11:16 +01:00
MarcelHara
2a35dc1ea1 Fixed Merge issues to dev 2023-04-30 13:14:32 +01:00
MarcelHara
bef17b7f04 Merge branch 'volumetric-fog' into dev
# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Levels/Build.umap
2023-04-30 13:06:51 +01:00
MarcelHara
06b9586fd3 Duplicated Build for merge 2023-04-30 13:04:19 +01:00
dcab1c483f Updated Quest Text for Consistentcy 2023-04-28 05:44:07 +01:00
99f88bb31c Bugfix Combat Initialisation Calculation Failure on Tutorial 2023-04-28 05:33:08 +01:00
69dd199ad3 Updated Character to Expose Reaction Speed 2023-04-28 05:31:57 +01:00
cf433291a9 Bugfix Larger Health Values Break Health UI 2023-04-28 04:47:34 +01:00
38ffd4f339 Bugfix Force Look Pitch Not Correctly Set 2023-04-28 03:59:03 +01:00
9ecbd9c52d Updated GoatAI to Trigger Attack Animations 2023-04-28 03:40:41 +01:00
744b24c8c1 Bugfix Cell Shading
Disabled on some objects
2023-04-28 02:40:46 +01:00
825e2a7631 Added Movement Animation to Goats 2023-04-28 02:40:18 +01:00
9199db00df Bugfix Merchant Unable to Interact 2023-04-28 01:40:49 +01:00
bc171eba80 Added Idle Merchant Animations 2023-04-28 01:23:18 +01:00
003edc4e0a Reimported Goat Walking Animation & Imported Merchant Animation 2023-04-28 00:37:06 +01:00
7d87e3d94f Merge branch 'dev' into Combat 2023-04-27 23:59:39 +01:00
3a672fb52e Merge branch 'dev' into houes-modles 2023-04-27 23:52:54 +01:00
Phoebe Harris-Wilson
e666ed28fb Rope and talisman and textures 2023-04-27 18:00:30 +01:00
Blue Probert
0f0618ed0a Bugfix Heal Over Time Exposed Heal Amount 2023-04-27 17:59:06 +01:00
Rowland Rowland
c61d8ed9e3 Merge branch 'dev' into Collisions
# Conflicts:
#	Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset
#	Content/Levels/Build.umap
2023-04-27 17:51:21 +01:00
Blue Probert
fc8c6bae19 Bugfix Crash On Damage Over Time Kill 2023-04-27 17:50:13 +01:00
Blue Probert
82ce8b2074 Bugfix Crash on No Post Processing Component 2023-04-27 17:40:40 +01:00
Rowland Rowland
6865b506b8 Added quest giver
Quest giver is now placed to the side of the cave entrance
2023-04-27 17:35:46 +01:00
Rowland Rowland
b4a8af9d43 Added platform for quest giver
Copied temporary platform at rope bridge and placed one next to it for the guest giver
2023-04-27 17:28:49 +01:00
Rowland Rowland
4579c73929 Fixed collision issues
Had an issue on Monday, seems to be fixed and pushed now
2023-04-27 17:20:07 +01:00
MARCEL HARA
b0615eafdd Added Volumetric fog and fine tuned 2023-04-27 17:19:16 +01:00
MARCEL HARA
38caa46e58 Updated Interaction.cpp to fix certain crashes 2023-04-27 17:19:01 +01:00
MARCEL HARA
dd1ab03357 Changed UI to 2D to make it look 3D on the book 2023-04-27 17:18:46 +01:00
Kacper Szelest
f8e130f727 Fixed quest system
I fixed the quest system and made it interactable
2023-04-27 16:47:26 +01:00
Kacper Szelest
1d076b851b Implemented the quest system
I implemented the quest system into the game
2023-04-27 16:42:40 +01:00
Kacper Szelest
f990cd20c9 Added quest giver mesh
Added the quest giver mesh into the world space so you can recieve quests from her
2023-04-27 16:40:55 +01:00
Kacper Szelest
e2dd3cfd9c Added quest giver
I added the quest giver into the game so we can have quests
2023-04-27 16:25:12 +01:00
Kacper Szelest
6c3e358460 Updated tunnels
I added the improved tunnels which werent in already
2023-04-27 16:21:21 +01:00
Kacper Szelest
97d0cb2505 Created collisions for level
Added collisions for certain objects which didnt have any
2023-04-27 16:15:31 +01:00
MarcelHara
3b725f53bb Started to work on main menu 2023-04-27 12:31:32 +01:00
MarcelHara
1a039023ed Updated SmokeParticles to breaking walls 2023-04-27 11:57:03 +01:00
69bd004895 Bugfix Combat Values Not Being Reset on Combat End 2023-04-27 07:22:40 +01:00
4f8f2b37d1 Updated Combat to Hide Book in Non-Combat 2023-04-27 07:19:19 +01:00
11c905613a Updated Combat to Include Red Vignette on Damage Taken 2023-04-27 06:59:52 +01:00
9fd372ed9d Updated Combat to Include Camera Shake on Shoot & Wall Break 2023-04-27 05:13:41 +01:00
19fcc0c063 Updated Combat to Include Enemy UI 2023-04-27 04:24:54 +01:00
2df31aa719 Bugfix Camera Clipping and Render Depth On Book & Gun 2023-04-27 03:47:24 +01:00
Alicia
6c3692b9ae merchant rig 2023-04-26 18:21:33 +01:00
Alicia
df2d103184 changed the walking cycle 2023-04-26 18:21:11 +01:00
383a85449e Merge branch 'Combat' into dev 2023-04-26 13:20:48 +01:00