2638e71f97
Updated Combat UI to Make Extra Turn More Readable
2023-05-09 13:29:52 +01:00
MarcelHara
e1027d5d8e
Merge remote-tracking branch 'origin/merchant-polish' into dev
2023-05-09 13:15:33 +01:00
MarcelHara
458bb20227
Git issues to upload part of merchant fix
2023-05-09 13:14:19 +01:00
6a94ce98ec
Merge pull request #34 from Games-Academy-Student-Work-22-23/merchant-polish
...
Merchant polish
2023-05-09 13:10:38 +01:00
MarcelHara
3887290df8
Fixed merchant crash issue
2023-05-09 13:07:30 +01:00
487c46d7b8
Updated Combat System to Include Healing During Combat
2023-05-09 05:40:31 +01:00
cfde5f9d68
Added Healing Jelly Button in Combat Widget
2023-05-09 00:42:56 +01:00
MarcelHara
0632a1770b
Updated DialougeBox for merchant to finish UI overhall
2023-05-09 00:04:33 +01:00
MarcelHara
d538543fbc
Updated Selection,confirmation UI for merchant
2023-05-09 00:00:47 +01:00
b32e3c21d9
Applied New Gun Model to Combat Character
2023-05-08 23:40:44 +01:00
MarcelHara
14e5549e88
Added Shadow text to display by default
2023-05-07 15:53:52 +01:00
MarcelHara
86a969c9de
Replaced TempDrowpDown to MainMenu with new ones
2023-05-07 14:52:29 +01:00
5b1abf1a70
Merge pull request #31 from Games-Academy-Student-Work-22-23/MainMenu-Creation
...
Main menu creation
2023-05-04 18:00:19 +01:00
MARCEL HARA
b2c81bf9eb
Added Shadow settings and QOL Fixes
2023-05-04 17:57:25 +01:00
MARCEL HARA
d69809a64e
Added Resolution settings functionality
2023-05-04 17:22:01 +01:00
MARCEL HARA
49496861a0
Updated Buttons to be dropdown buttons
2023-05-04 16:29:14 +01:00
MarcelHara
098aa0bb74
Gave buttons functionality
...
Play and quit works and gave settings placeholders
2023-05-04 13:56:42 +01:00
MarcelHara
a82d277a26
Updated GunEffect to fix sparks not feeling realistic
2023-05-04 13:41:18 +01:00
daaa624dd9
Exposed Quest Flags to Dialogue System
2023-05-04 06:31:59 +01:00
f24fcc2d25
Updated Quest System for UI
2023-05-04 05:04:37 +01:00
9bb98b314b
Updated Dialogue for Optimisations and Abstraction
2023-05-04 01:42:54 +01:00
d237e6c8de
Replaced Ripped Paper Image to Remove Padding
2023-05-02 11:23:35 +01:00
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
MarcelHara
9295fa2fbc
Imported Play,Quit,Settings icon and applied to mainmenu
2023-05-01 23:22:26 +01:00
25e9a4f4fc
Updated Dialogue UI for Style Consistency
2023-05-01 05:22:56 +01:00
MarcelHara
c5990be70c
Updated MainMenu buttons to be more spaced out
...
Built lighting and updated mainmenu to be more spaced out
2023-04-30 15:18:58 +01:00
MarcelHara
fab7a72b84
Updated MainMenu Scene to have a background
...
Added new assets to the mainmenu to make it look better behind the book
2023-04-30 15:14:59 +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
99f88bb31c
Bugfix Combat Initialisation Calculation Failure on Tutorial
2023-04-28 05:33:08 +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
MARCEL HARA
b0615eafdd
Added Volumetric fog and fine tuned
2023-04-27 17:19:16 +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
MarcelHara
3b725f53bb
Started to work on main menu
2023-04-27 12:31:32 +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
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
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
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
