Marcel Hara
|
688a724a62
|
Merge branch 'dev' into UI-Implementation
# Conflicts:
# Content/Blueprints/Player/BP_MyTempCharacter.uasset
# Content/Levels/Top_layer_level.umap
|
2023-03-13 17:13:56 +00:00 |
|
Marcel Hara
|
7e8ded362a
|
Added All Item ammo types
Added every item ammo type to the game
|
2023-03-13 17:00:08 +00:00 |
|
Marcel Hara
|
7343484038
|
Updated MainWidget to fix scaling issues
|
2023-03-13 16:13:27 +00:00 |
|
Charlie Seymour
|
e0f7a2682a
|
Bugfix Old Version of the Character with Missing References
|
2023-03-13 16:11:44 +00:00 |
|
Marcel Hara
|
e8000eb823
|
Updated GameUI to Rounded buttons and optimisation
removed unwanted blueprints to speed up menus and make them work better and made all the buttons rounded to make it look nicer
|
2023-03-13 16:06:41 +00:00 |
|
Marcel Hara
|
cffbe29981
|
Imported Font to replace all ui fonts
Replaced all the ui fonts with the new imported font
|
2023-03-13 15:55:34 +00:00 |
|
MH261677
|
93ed73e678
|
Changed Inventory_UI to Game_UI folder
Changed folder names and added a Quit button to the settings menu
|
2023-03-07 14:25:08 +00:00 |
|
MH261677
|
f90a75f599
|
Added Icons to replace MainWidg text
Imported the icons into unreal and replaced all the text on Mainwidget to the respected icons
|
2023-03-07 14:18:48 +00:00 |
|
MH261677
|
b88f787315
|
Updated MainWidg to change hover colour
Added a hovor colour to make it more obvious what the user is clicking on
|
2023-03-07 14:09:09 +00:00 |
|
MH261677
|
0c2dc067da
|
Updated PlayerInv,TempChar to enable hotkeys
Enabled pressing tab to go straight to inventory instead of having to go to settings via escape key and then switching to inventory manually
|
2023-03-07 13:36:04 +00:00 |
|
MH261677
|
72d6ac39fc
|
Created WBP_Gear,WBP_Lore and fixed scaling issues
Created the final widgets for the menu and fixed some issues of buttons being out of place and not anchored properly
|
2023-03-07 13:18:45 +00:00 |
|
MH261677
|
3cac587f30
|
Updated MainWidget, TempCharacter to menu opening
Fixed the menu not being able to close properly
|
2023-03-07 13:00:24 +00:00 |
|
Marcel Hara
|
17df5728d9
|
Added WBP_Maps,WBP_Settings to MainMenuWidg
Added new widgets and now adding functionaity to escape button to make it close and re-open the menu
|
2023-03-06 17:27:16 +00:00 |
|
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 |
|
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 |
|
|
|
b16f632537
|
Updated Combat to Hide Gold & Health Text
|
2023-03-06 05:25:36 +00:00 |
|
|
|
b5048e4be3
|
Updated Project Settings for Build
|
2023-03-06 00:22:09 +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 |
|
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
|
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 |
|
|
|
69b235030a
|
Updated Combat Character to Add a Flashlight
|
2023-03-03 18:39:59 +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 |
|
|
|
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 |
|
|
|
e8c20e2d67
|
Merge branch 'dev' into Turn-Based-Combat
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
# Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
# Content/Dialogue/NPCTest.uasset
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
|
2023-02-28 15:29:35 +00:00 |
|
MARCEL HARA
|
1ead32f0c8
|
Added InventoryImage to Inventory UI
|
2023-02-27 17:45:58 +00:00 |
|
|
|
fb697f3588
|
Added Thorns Status Effect for Combat
|
2023-02-27 04:55:12 +00:00 |
|
|
|
9b0ef82e7c
|
Updated TurnBasedCombat to Include New Combos
|
2023-02-27 04:07:19 +00:00 |
|
|
|
e96c3411c0
|
Updated StatusSystem for Seconds Countdown
|
2023-02-27 03:46:06 +00:00 |
|
|
|
939d1e8b92
|
Bugfix StatusEffects Not Being Added to Player
|
2023-02-25 00:20:49 +00:00 |
|
|
|
88323e4ea6
|
Updated EatableItems to Add Status Effects
|
2023-02-23 17:48:20 +00:00 |
|
MARCEL HARA
|
119b5a141a
|
Updated TempCharacter to remove unused Ulogs
|
2023-02-23 15:19:32 +00:00 |
|
|
|
2eae4b6c0e
|
Added Status Indicator Widget for HUD Indication
|
2023-02-23 03:01:21 +00:00 |
|
|
|
31a6a5d98e
|
Added StatusEffect Stub for Multiple Status Effects
|
2023-02-20 17:58:32 +00:00 |
|
MARCEL HARA
|
5e448c897d
|
Updated Widgets to fix scaling issue
Fixed scaling issue on all widgets to fit all monitor types
|
2023-02-20 16:03:25 +00:00 |
|
MH261677
|
618a9509ca
|
Updated EatableItems to add ammo {UNSTABLE}
Added functionality to the ammo count currently unstable as need to wait for other programmer to understand why it crashes.
|
2023-02-19 15:29:16 +00:00 |
|
MARCEL HARA
|
77c43ab3d1
|
Updated TempCharacter to find AI Sphere
|
2023-02-16 15:02:58 +00:00 |
|
MH261677
|
a6436c9110
|
Added BP_AmmoItem
Added Ammo into the game for the player to find
|
2023-02-07 00:11:19 +00:00 |
|
MH261677
|
797c447d47
|
Added Ammo Icon to Images
|
2023-02-06 23:51:45 +00:00 |
|
MARCEL HARA
|
5b4da1f02e
|
Updated TempCharacter for Jump and Sneak
Added A sneak function and Jump function for the character
|
2023-02-06 15:26:22 +00:00 |
|
MARCEL HARA
|
0cf4ace43a
|
Updated TempCharacter
Added Jump function which is using ACharacter and started working on custom Sneak function
|
2023-02-06 14:30:13 +00:00 |
|
|
|
a16de31aa2
|
Merge remote-tracking branch 'origin/merchant-system-v4' into dev
|
2023-02-06 13:53:22 +00:00 |
|
MH261677
|
5364f92edb
|
Updated WBP_ItemDisplay
Item_Stack now changes to however many stacks the player has bought of the item
|
2023-02-04 17:49:17 +00:00 |
|
MH261677
|
f4e0511f5c
|
Updated TempCharacter blueprint
Added a check to make sure the player is not in the shop when opening inventory
|
2023-02-04 17:41:09 +00:00 |
|
|
|
9e451d4539
|
Bugfix Set Mouse Input to Only Poll Yaw Movement
|
2023-02-02 02:19:59 +00:00 |
|
|
|
7a715c2e55
|
Bugfix Hard Reference for GunEffect not Saving
|
2023-01-31 03:13:17 +00:00 |
|
|
|
8cf4d1d52e
|
Built Lighting for Build
|
2023-01-31 02:45:23 +00:00 |
|
|
|
75f373e0c4
|
Updated Beta Level Map for Temp Jelly Assets
|
2023-01-31 02:15:07 +00:00 |
|
