e8e4e86873
Updated Status System to Add Buff Jelly Functionality
2023-05-11 05:59:49 +01:00
d197dc4d7e
Updated Both Jellies to Use New Icons
2023-05-11 05:20:58 +01:00
d79159ef8a
Updated Combat Character to Have a Healing Jelly
2023-05-11 05:15:55 +01:00
88f73fe5db
Updated Build for Pick Up Book & Gun Quest
2023-05-11 04:50:45 +01:00
7b185adaf4
Updated Combat UI for Damage & Status Indicator, Miss Chance & Removed Battle Log
2023-05-11 04:00:03 +01:00
918ea38889
Updated Resource Items for UI Icons and Descriptions
2023-05-11 01:16:45 +01:00
MARCEL HARA
8a68ac5213
Merge pull request #35 from Games-Academy-Student-Work-22-23/implimenting-miningcrystals
...
Implimenting miningcrystals
2023-05-10 13:28:52 +01:00
MarcelHara
fc25c8adf0
Updated TempCharacter to start fixing bugs
2023-05-09 16:22:35 +01:00
MarcelHara
b0e9ad546b
Replaced mining crystals with the assets
2023-05-09 13:50:23 +01:00
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
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
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
e7121dbb49
Updated BookUI to Include Escape Button & Percent
2023-04-25 01:08:26 +01:00
eb43c252af
Updated BookUI to Include Element Icons
2023-04-25 01:07:35 +01:00
MH261677
a770fc47f1
Started working on sparks for gun
2023-04-24 18:43:22 +01:00
18ceedfa03
Updated Character to Convert Screen Space to World for Interaction
2023-04-24 18:01:51 +01:00
Kacper Szelest
0384c4977d
Changed location of text int tutorial
...
I changed the lovation of the text in the tutorial to fit the page better.
2023-04-24 16:08:45 +01:00
Kacper Szelest
00a22d1c39
Changed tutorial text
...
I shortened the text on the tutorial to condense it and not dump the player with text.
2023-04-24 16:07:09 +01:00
ba35cfd06e
Bound Health Percent UI to Get Combat Character Health
2023-04-24 12:08:59 +01:00
fa3a811553
Added Tutorial Widget with Functionality
2023-04-24 11:54:28 +01:00
bc94d3aeae
Updated Intro Text for Cosmetic Changes
2023-04-21 14:41:06 +01:00
b5d451d948
Updated BookUI for Small Cosmetic Changes
2023-04-21 14:35:36 +01:00
7c39553dd2
Updated Book UI to Display Only Valid Combos
2023-04-21 04:26:09 +01:00
11a58bb836
Added 1st and 2nd Element UI Book Elements
2023-04-21 04:16:46 +01:00
02e1ec436c
Updated TurnBasedCombat to Use New Book UI
2023-04-21 03:44:01 +01:00
94f45d99c3
Added Combat UI Asset for World Space
2023-04-21 02:57:18 +01:00
793e096ed5
Merge remote-tracking branch 'origin/tutorial-functionality' into Book-UI
...
# Conflicts:
# Content/Levels/Build.umap
2023-04-20 22:30:57 +01:00
Kacper Szelest
b50e9dc161
Added UI elements and collisions
...
I added ui elements and collisions
2023-04-20 16:46:27 +01:00
MARCEL HARA
2f74de4889
Updated IntroText to add close button
2023-04-17 17:34:26 +01:00
MARCEL HARA
c412e8c163
Added TutorialText to game
...
added a ui and made it appear at the start of the game
2023-04-17 17:33:40 +01:00
MARCEL HARA
5e534b3af9
Updated Flashlight brightness
2023-03-29 17:16:11 +01:00
EMILY TAYLOR
7ec5c4442f
Added Book and Material
...
Implemented book asset in game and material.
2023-03-29 16:19:37 +01:00
CHARLIE SEYMOUR
5307c9c02d
Added combat and material bars
2023-03-29 15:48:08 +01:00
2e6398da59
Bugfix Input Not Being Re-Enabled On Respawn
2023-03-28 05:19:41 +01:00
b51ac385cd
Bugfix Inventory Widget Anchors Not Correctly Set
2023-03-28 04:56:56 +01:00
1b4a2673e3
Updated Combat UI for New Conventions (WIP)
2023-03-28 04:36:27 +01:00
544de9810c
Updated Combat Character Increased Sprint Speed
2023-03-28 03:46:35 +01:00
3f5c7bcf1c
Bugfix Merchant Unable to Purchase Items
2023-03-28 03:43:31 +01:00
Charlie Seymour
cef9cd9d7b
Added Custom Health bars
...
Health only
2023-03-23 17:55:59 +00:00
Marcel Hara
0779e31c75
Updated Positions of Items to Merchant Shop
...
Fixed the origin of the items and properly positioned and scaled items to make the merchant shop work fully
2023-03-16 17:18:01 +00:00
Marcel Hara
6f9f95ab9d
Attempted fix widget to merchant system
2023-03-14 13:04:33 +00:00
7d078cbb4c
Added Sprint using Left Shift
2023-03-14 04:40:13 +00:00
7585520586
Added Death Screen
2023-03-14 04:17:29 +00:00
c5409fcaa7
Removed Merchant Soft Lock for Build
...
Merchant SEVERELY BUGGY FUNCTIONALITY HAS BEEN DISABLED
2023-03-14 04:01:09 +00:00
b27f6ef064
Added Flashlight Tutorial
2023-03-14 00:34:06 +00:00
63b6c20c13
Updated Combat Character to Toggle Flashlight
2023-03-14 00:31:06 +00:00
4d77431338
Merge branch 'Quest-&-Dialogue-System' into dev
2023-03-13 22:02:36 +00:00
af86084f3e
Updated Quest UI to Display Tasks
2023-03-13 18:11:42 +00:00
