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
MH261677
a845c079a4
Merge branch 'fx-creation' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/__RealTime/CombatCharacterRT.uasset
2023-04-26 13:09:58 +01:00
MH261677
873671db64
Updated BreakAsset to add FX
2023-04-26 13:04:05 +01:00
MH261677
8d20b563e7
Updated Gun FX to make smoke smaller
2023-04-26 12:59:44 +01:00
MH261677
be31b90112
Updated Gun FX to making smoke more realistic and emission change
...
Updated the color and the way the smoke moves to look more realistic and made the emission a lot lower to prevent smoke from lighting up the whole scene
2023-04-26 12:55:38 +01:00
MH261677
a90fccd72e
Updated Gun Effects to add smoke and sparks
...
added smoke and spark effects to the gun upon firing
2023-04-26 12:12:50 +01:00
MH261677
70b8c41c99
Imported Smoke Texture and created smoke mat
2023-04-26 12:12:30 +01:00
4f336263fb
Bugfix Enemy Always Started First
2023-04-26 06:21:08 +01:00
37268a3dc2
Bugfix Unable to Escape in Some Situations
2023-04-26 05:51:07 +01:00
5634557af2
Bugfix Game End on Player Death & Lock Combat on Tutorial
2023-04-26 05:28:02 +01:00
b1bdcb7618
Merge remote-tracking branch 'origin/Tutorial' into Combat
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatTutorial.uasset
2023-04-26 04:18:42 +01:00
32f20c12c3
Updated Combat to Include Damage Stacking
2023-04-26 03:52:22 +01:00
15d2734c52
Bugfix Pointer Retaining Position After Combat Has Ended
2023-04-26 03:51:17 +01:00
0c13de4668
Bugfix BindAction Consuming Left Mouse Input
2023-04-26 03:22:13 +01:00
f7c4fdac3f
Updated Combat to Include a Reload Effect
2023-04-26 02:10:01 +01:00
feea306d11
Updated Combat to Replace Old Combos
2023-04-25 04:38:06 +01:00
fde1537dc0
Merge branch 'Book-UI' into dev
2023-04-25 04:31:26 +01:00
cf2a198c3e
Updated BookUI to Display Turn State and Escape Percentage
2023-04-25 04:23:51 +01:00
32e65e3f47
Updated BookUI for Cast & Clear Buttons
2023-04-25 03:46:52 +01:00
d0eaf37de7
Updated BookUI for Icon Positioning
2023-04-25 01:13:04 +01:00
