f82e8a892e
Merge pull request #13 from Games-Academy-Student-Work-22-23/Extra-ammoTypes
...
Extra ammo types
2023-03-13 17:11:33 +00:00
Rowland Rowland
b7924578be
Updated NavMesh
...
Removed all but 1 NavMesh. Single NavMesh now covers entire level
2023-03-13 17:02:22 +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
Kacper Szelest
141ee97312
implemented crystals
...
I implemented the crystals into the game tutorial after they were removed due to merge conflicts
2023-03-13 16:16:50 +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
Charlie Seymour
6ff315dfe7
Changed AIBruh hitbox
...
Moved hitbox
2023-03-13 15:57:48 +00:00
George Taylor
d7f98039c0
Imported Rock Assets too General Dressing Folder
2023-03-13 15:57:35 +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
Charlie Seymour
2f2ecc2d76
Change AIBruh to actual model
...
Mesh and material changed.
2023-03-13 15:54:30 +00:00
Kacper Szelest
a67482c6d7
Merge remote-tracking branch 'origin/Tutorial-final' into dev
...
# Conflicts:
# Content/Levels/Build.umap
2023-03-13 15:45:56 +00:00
Kacper Szelest
0146e89f88
Merge remote-tracking branch 'origin/Merchant' into art-implementation
...
# Conflicts:
# Content/Assets/Objects/Level_1_assets/Level_1_Blockout_with_tunnels_Cube_004.uasset
# Content/Blueprints/Player/BP_MyTempCharacter.uasset
# Content/Levels/Build.umap
# Content/Levels/Top_layer_level.umap
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-03-13 15:35:46 +00:00
Kacper Szelest
6c3b6b1ad2
Merge remote-tracking branch 'origin/Environment-assets' into art-implementation
2023-03-13 15:29:04 +00:00
3a99e71bde
Added Base Stub for Quest System
2023-03-13 05:19:13 +00:00
76b2d78f0e
Updated Dialogue for Choices
2023-03-13 04:49:09 +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
Kacper Szelest
271f0163ff
Updated build level
...
I added crystals and lights into the level to finish the look of the tutorial.
2023-03-06 17:19:38 +00:00
GEORGE TAYLOR
144d4ab3da
Imported Assets for Town Dressing into Unreal
2023-03-06 16:53:38 +00:00
Kacper Szelest
22402626a3
Added crystal assets into Build level
...
I added the crysta levels into the tutorial of the build level
2023-03-06 16:33:57 +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
Kacper Szelest
eab68734e1
Merge remote-tracking branch 'origin/Environment-assets' into Tutorial-final
2023-03-06 16:17:18 +00:00
GEORGE TAYLOR
57c97bfaa5
Imported General Dressing Assets too Unreal
...
Imported assets used for general dressing into a new folder in unreal.
2023-03-06 16:17:15 +00:00
b532eaaa4e
Merge remote-tracking branch 'origin/Hub-level-blockout' into dev
2023-03-06 16:11:37 +00:00
Kacper Szelest
1f9e1c3f93
Updated build level
...
I added a collision to one object in the build level
2023-03-06 16:08:35 +00:00
GEORGE TAYLOR
f4f8edb6eb
Imported the crystal assets to Unreal
2023-03-06 15:42:52 +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
d100a85a0d
Updated Combat to Set Camera to Face Enemy
2023-03-06 04:28:13 +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
34f6d6451b
Updated AIController adding Hearing sense + config
...
Added hearing sense to the aicontroller and added it to the BTTask.
2023-03-05 17:42:21 +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
a0d3a1a34b
Updated build level
...
I just added textures to a few untextured objects with temp rock textures
2023-03-04 20:43:00 +00:00
KACPER Szelest
71c6e641c1
Updated build level
...
I added some walls around things to avoid having the game look bad and empty. and more like an actual abyss and cave system
2023-03-04 20:41:46 +00:00
KACPER Szelest
c67bdf6c9c
Updated build level with extra meshes
...
I added a few meshes to create tunnels and a cavern in one of our levels to create a better feeling of being in a cavey abyss
2023-03-04 19:10:12 +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
be7af7e6a5
Updated Build Map for Merchant
2023-03-03 20:18:15 +00:00
Rowland Rowland
74a6e239e8
Added enemies and fixed asset collision
2023-03-03 18:51:29 +00:00
69b235030a
Updated Combat Character to Add a Flashlight
2023-03-03 18:39:59 +00:00
Kacper Szelest
f1e775dfa1
Updated build level
...
Fixed up the tutorial level so it looks a bit better
2023-03-03 18:32:42 +00:00
Kacper Szelest
87c2833381
Added a crystal asset
...
Added a crystal asset to use for level dressing
2023-03-03 18:25:52 +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
Rowland Rowland
e335e039fd
Updated Build Scene
...
Ordered levels for build
2023-03-03 16:23:20 +00:00
Kacper Szelest
f0e13d9522
Added a new level titled build
...
I added a new level called build so that we can make our new build level in for showcase and testing
2023-03-03 16:02:34 +00:00
Kacper Szelest
2b0567ab6e
Added collisions to blockout level
...
I added collisions to all assets in the blockout level to be used in testing
2023-03-03 15:47:45 +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
06deee7b0b
Merge branch 'dev' into Hub-level-blockout
2023-02-28 15:34:49 +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
9845639e8c
Merge branch 'dev' into ui-art-replacement
2023-02-28 15:26:27 +00:00
8e5416e3a9
Merge branch 'dev' into Modular-Kit
...
# Conflicts:
# Content/Levels/Top_layer_level.umap
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2023-02-28 15:25:47 +00:00
Emily Taylor
2a4300066c
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss
2023-02-28 13:18:35 +00:00
Emily Taylor
1958eabc3d
Added Goat Enemy for Tutorial Level
...
Goat FBX and materials ready for rigging and importing to engine
2023-02-28 13:18:14 +00:00
Charlie Seymour
216275cb53
Implemented modular kit for tutorial level
2023-02-28 11:43:42 +00:00
Charlie Seymour
7a36b200ca
Merge branch 'Modular-Kit' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into Modular-Kit
2023-02-27 18:15:11 +00:00
Charlie Seymour
4e11a3a63f
Added tutorial modular kit for first level
2023-02-27 18:14:51 +00:00
MARCEL HARA
1ead32f0c8
Added InventoryImage to Inventory UI
2023-02-27 17:45:58 +00:00
George Taylor
37dad4c873
Imported Beam Assets into Unreal
...
i Imported the beam assets from maya into the unreal engine 5
2023-02-27 16:12:18 +00:00
George Taylor
f2c69dfe3a
Added the assets for the Tutorial Level to Unreal
2023-02-27 15:44:19 +00:00
George Taylor
a43ed3a626
Added the Wooden Texture for the Tutorial Assets
2023-02-27 15:43:18 +00:00
Kacper Szelest
70d0c545ed
Moddeled hub level blockout
...
I created the hub level blockout to be used as a showcase and inspiration for a final design creation
2023-02-27 15:31:06 +00:00
Kacper Szelest
26c6885e86
Created platform blockout asset
...
I created a temporary asset blockout for the big science building platform asset to use as a showcase
2023-02-27 15:28:53 +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
a6ef9f76cd
Merge branch 'Dialogue-System' into dev
2023-02-25 02:27:38 +00:00
2f47693608
Bugfix Expiry Timers Not Getting Invalidated
2023-02-25 01:25:32 +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
George Taylor
4b886518fd
Imported Modular Planks into Unreal
...
Imported the Modular Planks for the Tutorial Level into Unreal from Maya
2023-02-23 17:40:57 +00:00
76043108b1
Merge pull request #10 from Games-Academy-Student-Work-22-23/Stealth-Mechanics-v1.0.2
...
Stealth mechanics v1.0.2
2023-02-23 16:04:33 +00:00
MARCEL HARA
ce4f3aff1f
Added SneakMechanicTesting level
...
Added new level for sneak mechanic testing
2023-02-23 16:03:10 +00:00
ROWLAND ROWLAND
69f4b8e603
Merge branch 'dev' into Level-1-bloackout
2023-02-23 15:49:45 +00:00
MARCEL HARA
119b5a141a
Updated TempCharacter to remove unused Ulogs
2023-02-23 15:19:32 +00:00
fb0bd09bb2
Merge remote-tracking branch 'origin/dev' into Level-Design
2023-02-23 15:06:57 +00:00
56b61bd1d2
Added Temp Status Icons and Font for Status Testing
2023-02-23 03:02:49 +00:00
2eae4b6c0e
Added Status Indicator Widget for HUD Indication
2023-02-23 03:01:21 +00:00
3b1f33006a
Added Combat Test Level for New Combat Features
2023-02-23 01:29:01 +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
Charlie Seymour
f378d4a4fd
Added modular kit test for tutorial
2023-02-20 15:16:26 +00:00
Kacper Szelest
177a4f685f
Added and made Level 1 Blockout assets
...
I added and put implamented the level 1 blockout assets and created the blockout level for it.
2023-02-20 14:48:45 +00:00
Kacper Szelest
a67d96943c
Added file level
...
I added a new level file named level 1, to house the blockout of level one and the future first level
2023-02-20 14:47:52 +00:00
26f21a9136
Updated DialogueNPC to use Ranged For Loops
2023-02-20 09:50:09 +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
MH261677
43ef8e2110
Updated TempCharacter to sneak functionality
...
Added sneak functionality which makes the sphere radius smaller near enemies.
2023-02-17 13:12:28 +00:00
MARCEL HARA
77c43ab3d1
Updated TempCharacter to find AI Sphere
2023-02-16 15:02:58 +00:00
Rowland Rowland
f032ac91c9
Cleaning Level
...
Using booleans to remove excess assets
2023-02-09 17:02:47 +00:00
d1fab9f9a1
Updated DialogueNPC for Structs and Dialogue Paths
2023-02-09 03:12:27 +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
324f062cc7
Updated EatableItems for AmmoFunctionality
...
Added ammo base functionality for using the ammo item in game
2023-02-07 00:11:00 +00:00
MH261677
797c447d47
Added Ammo Icon to Images
2023-02-06 23:51:45 +00:00
Rowland Rowland
30d22975b7
Updated Level
...
Added textures and began experimenting with curves. Planning to investigate Splines
2023-02-06 17:24:41 +00:00
MARCEL HARA
36c18382a2
Updated TempCharacter for sneaking vignette effect
...
Added a Vignette effect when crouching
2023-02-06 15:55:12 +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
d21486797d
Merge branch 'Dialogue-System' into dev
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
2023-02-06 13:53:15 +00:00
dc7e9c8c15
Merge branch 'Interactable-Environment' into dev
2023-02-06 13:52:20 +00:00
7f3e3cbb52
Updated DialogueNPC to Add Dialogue via Blueprints
2023-02-06 03:28:53 +00:00
e5b624411d
Updated TextPrompt for Choices
2023-02-06 03:27:49 +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
acefce8bbc
Added InteractNPC to Line Trace for Interact
2023-02-02 03:15:50 +00:00
9e451d4539
Bugfix Set Mouse Input to Only Poll Yaw Movement
2023-02-02 02:19:59 +00:00
3433254463
Added DialogueNPC Actor Component with Text Animation
2023-02-02 01:59:33 +00:00
5988272890
Added Base Text Prompt Widget Blueprint
2023-02-01 23:47:59 +00:00
42ce95b84e
Added Dialogue Testing Map with Temp NPC
2023-02-01 23:47:22 +00:00
d36fe6fed0
Added Breakable Walls BP
...
Using Particles at the moment
2023-02-01 23:37:17 +00:00
e2f91a11b5
Bugfix Platform Too High to Get Across
2023-01-31 03:29:35 +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
326e64e7ed
Merge remote-tracking branch 'origin/Level-Design' into dev
2023-01-31 02:19:42 +00:00
64f5d652ff
Merge remote-tracking branch 'origin/Enviroment-Art' into dev
2023-01-31 02:19:30 +00:00
75f373e0c4
Updated Beta Level Map for Temp Jelly Assets
2023-01-31 02:15:07 +00:00
a15054656e
Merge branch 'dev' into Shaders
...
# Conflicts:
# Content/Levels/Top_layer_level.umap
2023-01-31 02:04:48 +00:00
afb0429003
Merge remote-tracking branch 'origin/Beta-Level' into dev
2023-01-31 01:53:37 +00:00
ed0bcc7c76
Updated CombatCharacter to Spawn GunEffect onClick
2023-01-31 01:48:35 +00:00
45374da8bb
Updated Combat System to Disengage from Combat
2023-01-31 01:39:42 +00:00
d9584f3b55
Removed Escape To Main Menu
2023-01-31 01:23:28 +00:00
ad91d6eac7
Updated GunEffect Changed Texture from White
2023-01-31 01:02:36 +00:00
d18c547632
Bugfix Cursor Not Hiding After Combat
2023-01-31 00:56:53 +00:00
7e81387247
Merge remote-tracking branch 'origin/merchant-system-v4' into Turn-Based-Combat
...
# Conflicts:
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
2023-01-31 00:50:59 +00:00
0de2753dff
Bugfix Clicking Instantly Activates Combat
2023-01-31 00:30:45 +00:00
cd17363421
Removed Legacy Source Code to Reduce Compilation
2023-01-30 23:03:20 +00:00
KACPER Szelest
beb110a901
Added Red Jelly Asset
...
I added a red Jelly asset to be used in the merchant system as a placeholder asset
2023-01-30 22:39:29 +00:00
KACPER Szelest
f4134c478f
Added Blue Jelly asset
...
I added a blue jelly asset to be used in the merchant system
2023-01-30 22:37:15 +00:00
george taylor
7644f56dd2
Added modular planks for Rope Bridges into Assets Objects
...
Created four modular planks for the rope bridges that can be put together too create a longer rope bridge.
2023-01-30 18:01:07 +00:00
Rowland Rowland
1d02d5b3a3
Updated Level-Design. Hub Town 'finished'
...
Grey box 'finished'. Need to tidy up values. Likely need to update Abyss walls. Further discussion needed in regard to abyss structure.
2023-01-30 17:29:28 +00:00
Marcel Hara
d658c63627
Updated WBP_ShopSelector
...
Got rid of it casting from tempcharacter but instead it casts from interaction which then activates a function in interaction which activates a different function in tempcharacter
2023-01-30 17:20:22 +00:00
MARCEL HARA
810b4b1680
TemporarilyBroken TempCharacter.cpp
...
Attempted to fix the close button currently it crashes.
2023-01-26 18:12:24 +00:00
George Taylor
3011042fbd
Cave Dressing Grey Boxes
...
The grey boxes for the first level cave dressings.
2023-01-26 18:11:43 +00:00
ecae96081d
Added Geometry Collection for Destructable Components
2023-01-26 17:54:56 +00:00
Kacper Szelest
6297531eba
Updated world space
...
I moved a few objects in the world space
2023-01-26 17:43:43 +00:00
MARCEL HARA
2f22ec811f
Updated Merchant_UI
...
Removed things being removed from parent and transferred it from code to fix many bugs, Also fixed text being instantly displayed once you talk to the merchant again
2023-01-26 17:41:51 +00:00
Kacper Szelest
ee0cd6cc39
Updated shader
...
I updated and added a new shader that could be better and has a slightly different effect to the original shader
2023-01-26 17:40:08 +00:00
Kacper Szelest
8e71181328
Added outline shader
...
I added a shader that adds a black outline to each object in the world to add a stylized effect to our game
2023-01-26 16:20:46 +00:00
MARCEL HARA
c58d5d5592
Updated BP_OPENDIAL
...
Added a custom function which gets triggered in the Interaction.cpp
2023-01-23 17:41:30 +00:00
Rowland Rowland
914b7cbc96
Forgot to save
2023-01-23 17:25:24 +00:00
Rowland Rowland
949607aa23
Hub names
...
Named level assets and started wall
2023-01-23 17:24:41 +00:00
Rowland Rowland
469b585bc2
Hub area
...
Made most of the basic structure of the hub area, still need to add Town Hall and finalise abyss walls
2023-01-23 17:09:49 +00:00
MARCEL HARA
3f4cdf5bfa
Updated Interaction.cpp
...
Optimized some functions and variables by storing them in beginplay
2023-01-23 16:14:15 +00:00
15b56b3598
Updated Engine Version to 5.1
2023-01-23 13:35:24 +00:00
MH261677
b9d87ee07b
Updated Unreal version to 5.1
2023-01-21 14:19:49 +00:00
82c65b3fc4
Fix for Version Conflict
2023-01-17 08:46:31 +00:00
e4709f35e7
Bugfix Collision on Large Section
2023-01-17 06:34:22 +00:00
51c7bd6628
Updated Player Start Location in Tutorial
2023-01-17 05:18:44 +00:00
79661ce0a3
Merge remote-tracking branch 'origin/Music' into dev
2023-01-17 05:13:59 +00:00
faf37bce52
Bugfix Collisions on Tunnel Pathways Partially Corrected
2023-01-17 05:13:02 +00:00
41bee1b0bd
Merge remote-tracking branch 'origin/merchant-system-v3' into AI-Perception
2023-01-17 04:20:15 +00:00
3efc36344b
Added Stop Behaviour in AI When in Combat
2023-01-17 04:20:07 +00:00
MH261677
cba221ec82
Merge branch 'Beta-Level' into merchant-system-v3
...
# Conflicts:
# Content/Blueprints/Combat_UI/Combat_UI.uasset
2023-01-17 02:46:42 +00:00
MH261677
084ad419c5
Updated TempCharacter.cpp
...
Fixed double linetracing issue
2023-01-16 23:41:22 +00:00
MH261677
355dd06aae
Updated BP_ShopSelector,WBP_BuyHealing
...
Added it so when you click the arrows it swaps to the different widgets and made the widget remove from viewport
2023-01-16 21:25:18 +00:00
MH261677
6b131213a6
Created WBP_BuyBuff
...
Created the buy screen for the buff jelly
2023-01-16 21:24:24 +00:00
MH261677
77328aa887
Created WBP_BuyHealing
...
Created the buy healing jelly promt and gave it functionality to trigger buyitem which triggers linetrace logic
2023-01-16 20:42:16 +00:00
KACPER Szelest
74a14f68c7
Added destructable objects
...
Added a few things that are able to be destroyed
2023-01-16 17:20:50 +00:00
KACPER Szelest
832efe418b
Created top layer level
...
I created the tutorial of our top layer level, where there will be a few enemies to fight and the ability of seeing what else the player will be able to do in the game
2023-01-16 17:18:32 +00:00
MH261677
58243e8ccc
Updated BP_ShopSelector, BP_MerchantInteraction
...
Added interactivity for the buttons to activate functions in the interaction.cpp
2023-01-16 17:01:04 +00:00
KACPER Szelest
bea8e8c396
Added new tunnels
...
Added a new tunnel asset
2023-01-16 16:16:54 +00:00
KACPER Szelest
16972db8c5
Fixed Rope Bridge asset
...
I fixed the rope bridge assets as the textures and models themselves were not looking right
2023-01-16 14:25:38 +00:00
KACPER Szelest
5333846266
Added Abyss asset
...
Added the abyss asset to be used in level creation
2023-01-16 13:52:15 +00:00
KACPER Szelest
8aa6529f8a
Added rope and metal beam
...
Added a few items to be used in level creation
2023-01-16 12:38:41 +00:00
KACPER Szelest
27d51210ec
Added new cave tunnel
2023-01-16 12:03:29 +00:00
KACPER Szelest
4a14dbe384
Added countertop asset
...
Added a countertop asset to be used with the merchant system
2023-01-16 11:52:50 +00:00
KACPER Szelest
db170e9ff5
Added Shelf Object
...
Added a shelf object to be paired with the merchant system
2023-01-16 11:46:32 +00:00
KACPER Szelest
a3de58b063
Added Stalegtite asset
...
Added stalegtite asset to be used to build our level
2023-01-16 11:38:50 +00:00
KACPER Szelest
55ebd7d779
Added Glass material
...
I added a new glass material into unreal because the one from blender didn't work
2023-01-16 11:36:08 +00:00
KACPER Szelest
6319ab9f8a
Added science buildings
...
Added a few science buildings in order to build our level
2023-01-16 11:27:16 +00:00
KACPER Szelest
c5ce519fae
Added rope bridge modular pack
...
I added the rope bridge modular pack to allow us to create long rope bridges and connect them wherever we want
2023-01-16 11:24:18 +00:00
KACPER Szelest
45eae63b76
Added Cave tunnel modular assets
...
I added multiple cave tunnels to allow us to create a level placing parts of tunnels down to make it
2023-01-16 11:23:43 +00:00
fdd9c5debe
Updated AI for Hearing Perception
2023-01-15 19:50:39 +00:00
MH261677
e7fa8f4c63
Updated BP_ShopSelector
...
Added a close button which re-enables all the input again by calling a function in TempChar
2023-01-15 16:14:03 +00:00
MH261677
808b567d6f
Created BP_ShopSelector
...
Created the widget for the item selector when you are in the shop
2023-01-15 15:06:30 +00:00
MH261677
b4e741bfd8
Changed BP_GoldCount to BP_ImportantStats
2023-01-14 22:11:15 +00:00
MH261677
f25b0b970d
Updated BP_GoldCount
...
Added health value and made it reflect the players health variable
2023-01-14 22:10:29 +00:00
MH261677
43db88c107
Updated BP_GoldCount
...
Made it so it shows the gold count now that you can set in the BP_TempCharacter
2023-01-14 22:05:20 +00:00
MH261677
1d6e0171c4
Created BP_GoldCount in Blueprints/Display_UI
...
Started to create the GoldCounter to display the players gold
2023-01-14 20:38:02 +00:00
MH261677
a582a05a59
Changed BP_Interaction name to BP_MerchantInteract
...
Changed BP_Interaction name to BP_MerchantInteraction
2023-01-14 20:34:38 +00:00
MH261677
9878f0f370
Updated ItemDisplay WBP
...
Added an item stack to the number to start creating stackable items
2023-01-12 13:56:02 +00:00
MH261677
c107c9a490
Updated Merchant
...
Fixed crash error and merchant dialouge box pops up now, Started working on item stacking
2023-01-12 13:05:43 +00:00
KACPER Szelest
d78abda469
Added Sheep model
...
I added the sheep model and saved it in the correct folder, adding it in the enemy character folder
2023-01-10 16:02:43 +00:00
KACPER Szelest
1061fb0f84
Added place holder enemy
...
I created some new folders to organize assets, whilst also adding the enemy placeholder character
2023-01-03 14:38:26 +00:00
KACPER Szelest
0e643e81ba
Create basic greybox of top layer level
...
I created a very blocky greybox, as both a back incase our level doesn't get finished on time, but also as a guide on what to do
2023-01-03 14:20:51 +00:00
KACPER Szelest
78651b1ce4
Created new level
...
I have created the Top_layer level which is where the beta level will be created and housed
2023-01-03 12:50:33 +00:00
KACPER Szelest
5d9b0b80e5
Implamented Soft wind
...
I have implamented the soft wind sound cue to play when a player reaches a certain area
2022-12-01 18:02:09 +00:00
KACPER Szelest
28bdc5b3f9
Added soft wind sound effect and cue
...
Added a soft wind sound effect and cue into the files
2022-12-01 17:52:24 +00:00
KACPER Szelest
15ad639b84
Added Wind and Rope sound into the level
...
I've added the Wind and Rope sound into the prototype level and made it play based on player characters distance from the noise object.
2022-12-01 17:38:16 +00:00
KACPER Szelest
ad1aa0c50b
Added Wind and rope sound effect
...
I have added the wind and rope sound effect into the game files and created a sound cue for them.
2022-12-01 17:26:37 +00:00
KACPER Szelest
e2cfb63ff9
Added background ambience
...
I've added the background ambience into the game and made it loop.
2022-12-01 17:23:32 +00:00
KACPER Szelest
ee339fc71b
Added cave ambience asset
...
I have added a file that I can loop to create a sense of dread and horror. It is loopable.
2022-12-01 17:15:02 +00:00
MARCEL HARA
c7d1394e98
Updated Action Mapping from Right to Left Click
2022-11-29 17:38:39 +00:00
3e93e686dd
Updated Main Menu for Merchant
2022-11-29 16:13:30 +00:00
af1813fd9a
Merge branch 'merchant-system' into Turn-Base-System-V2
...
# Conflicts:
# Config/DefaultEngine.ini
# Content/Blueprints/Combat_UI/CombatCharacter.uasset
# Content/Merchant/BP_MerchantGameMode.uasset
2022-11-29 15:53:39 +00:00
MH261677
7199ee76a3
Updated Items
...
Started to create item stacks and fix item not dissapearing bug
2022-11-29 15:44:00 +00:00
MH261677
cc9384a9c1
Updated BP_BuffJelly
...
Gave BuffJelly a unique ID of 1
2022-11-29 14:19:43 +00:00
MH261677
f52ea5efb8
Overhauled Items
...
Gave every single item a unique ID so no matter the item the ID will always be different
2022-11-29 14:15:20 +00:00
MH261677
3360ea2031
Updated TempCharacter,TempCharacter.cpp
...
Gave a max inventory slots of 5 for testing purposes and Refactored code in TempCharacter.cpp
2022-11-29 12:55:46 +00:00
07e7f8c70f
Added NiagaraSystem for Gun Particle Effect
2022-11-29 01:54:45 +00:00
be0766cf0c
Added EscapeToMenu Component for Escaping to Menu
2022-11-29 00:42:03 +00:00
fdfe4a660c
Bugfix Movement Not being Reenabled on Combat End
2022-11-29 00:34:47 +00:00
1300c99a3f
Added HoldToInitCombat Actor Component for Manual Combat Init
2022-11-29 00:23:15 +00:00
MH261677
26da472db8
Updated MerchantPrototype
...
Added an 8 second wait timer to the dialouge in engine
2022-11-28 23:20:55 +00:00
MH261677
8c69f58a97
Updated BP_OPENDIAL, Interaction.cpp
...
Changed the text in the widget and gave it a little animation. Made the Wait timer in interaction changeable in the editor.
2022-11-28 23:15:41 +00:00
MH261677
b5772a024c
Updated Interaction.cpp
...
Added a wait timer to close the widget once open automatically
2022-11-28 22:52:51 +00:00
99f1f0c5af
Added C2Plane in Prototype Level
...
Restarts level when player falls of the map
2022-11-28 22:30:35 +00:00
06492d69d5
Updated TurnBaseCombat for Keyboard Hotkeys
...
Crit Feedback
2022-11-24 02:49:37 +00:00
MH261677
5dce4dc603
Updated InventoryComponent
...
Added comment
2022-11-24 00:13:20 +00:00
MH261677
57b532c256
Updated WBP_PlayerInventory
...
Cleaned up the inventory UI and removed unused Blueprint code
2022-11-23 19:20:32 +00:00
MH261677
9357806178
Updated WBP_ItemDisplay
...
Made the item display larger and cleaner, Also added a background to the item
2022-11-23 18:16:14 +00:00
MH261677
26bbe083df
Updated WBP_ItemDisplay, WBP_PlayerInventory
...
Changed and resized both the UIS to fit items better and make the whole inventory look a lot cleaner
2022-11-23 18:13:13 +00:00
MH261677
09adfcad27
Updated WBP_PlayerInventory
...
Started to work on Inventory UI and re-sized it to be 1920x1080
2022-11-23 17:45:32 +00:00
MH261677
b7dd592d2c
Created Player folder
...
Organized the blueprints into more folders and cleaned up unreal project
2022-11-23 17:30:38 +00:00
MH261677
45369c4dc7
Created Inventory_UI Folder
...
Moved all inventory UI to the folder and removed Shop UI as not used anymore
2022-11-23 17:29:14 +00:00
MH261677
77b32edde4
Organized Content Browser
...
Organized the content browser to make it easier to know where everything is
2022-11-23 17:26:35 +00:00
MH261677
36bb1a2265
Updated PlayerInventory
...
Made the inventory look slightly nicer, going to work on a nicer alpha version of the UI after this commit
2022-11-23 01:56:22 +00:00
MH261677
7430029db2
BugFix WBP_PlayerInventory
...
Fixed cursor still showing up when closing and re-opening the inventory.
2022-11-23 01:45:24 +00:00
MH261677
7dc6f677d4
Updated WBP_PlayerInventory
...
Added an override on keypressed so the user can press tab again to close the inventory. Also fixed the widget not being a focusable
2022-11-23 01:38:45 +00:00
MH261677
168a43d751
Updated BaseItem and ItemBPS
...
Gave both items booleans to make the code differentiate what the item does to the player.
2022-11-23 00:51:00 +00:00
22c13a8c25
Bugfix Movement Enabled During Combat in TBCv2
2022-11-21 22:34:33 +00:00
6a041e4621
Updated RTCombat for Shooting Accuracy via LineTrace
2022-11-21 20:59:29 +00:00
1751ffd163
Added Main Menu for Test Levels
2022-11-21 12:50:59 +00:00
7184e19dce
Bugfix GunProtoype Handle Subject to Backface Culling
...
Flipped Normals on Handle
2022-11-21 00:15:37 +00:00
MH261677
49a24325ea
Updated TempCharacter, WBPHealth
...
Made the health and gold variables for the character blueprintable to start implimenting them into basic UI for visual representation.
2022-11-19 20:08:00 +00:00
MH261677
e64b4057ac
Created Health_Gold UI
2022-11-18 20:05:33 +00:00
MH261677
ba2b6b599c
Merge branch 'dev' into merchant-system
2022-11-18 19:20:20 +00:00
MH261677
c835567fac
Updated Item Assets
...
Added the gold value for each of the item assets
2022-11-18 14:54:30 +00:00
MH261677
220b21f2ca
Added BuffItem Placeholder
...
Added the buffitem placeholder to the world. Currently the buffitem just does the same as the healing item.
2022-11-18 13:53:47 +00:00
MH261677
900feee5a9
Updated InventoryComponent and Shop
...
Fixed InventoryComponent to now work with singular items so you can purchase items from the shop!
2022-11-18 13:07:44 +00:00
9780242271
Added RealTimeCombat Map, Character & GameModeBase
2022-11-17 04:51:33 +00:00
09ec1cb181
Added BP HUD Combat_UI_RT for RealTimeCombat
2022-11-17 04:15:50 +00:00
0b18bcc5c9
Updated CombatCharacter and AI for Tagging
2022-11-17 03:42:35 +00:00
57e8b76e89
Added Chase Blueprint AI
2022-11-17 03:39:12 +00:00
e6fa31ef04
Added TurnBaseSystemV2 Test Level
2022-11-17 03:03:54 +00:00
9a2835f54c
Added Rock Megascan Temp Mesh
2022-11-17 03:03:32 +00:00
e5e24c848a
Updated Prototype Environment for Inventory
2022-11-15 03:40:59 +00:00
9b9cc6f02b
Merge branch 'merchant-system' into Turn-Base-System
...
# Conflicts:
# Content/Blueprints/WBP_PlayerInventory.uasset
# Content/Merchant/BP_MerchantGameMode.uasset
2022-11-15 03:28:55 +00:00
MH261677
0c0876770b
Updated Inventory System
...
Added BuffJelly
2022-11-15 03:27:44 +00:00
96273d16d9
Updated Prototype Environment for TurnBaseCombat
2022-11-15 01:45:52 +00:00
dab9182814
Merge remote-tracking branch 'origin/Level' into Turn-Base-System
2022-11-15 01:35:02 +00:00
KACPER Szelest
dbe213ef77
Updated Prototype level
...
I have updated the prototype level to include the environment assets and added a small material to a big rock
2022-11-15 01:34:32 +00:00
KACPER Szelest
f6c59adda0
Added empty level "prototype"
...
I added an empty level called prototype to wel.. prototype on
2022-11-15 01:20:37 +00:00
KACPER Szelest
181fcd0103
Added Environment assets
...
I added some assets that could be used for the tutorial level
2022-11-15 01:18:26 +00:00
9d72f60208
Updated TurnBaseCombat for ResourceBar Functionality
2022-11-15 01:12:45 +00:00
189b6d25b8
Updated Combat UI for Resource Bars
2022-11-15 00:43:15 +00:00
MH261677
91667f89b2
Updated MerchantGameMode
...
Added a print string to tell the player to press TAB to open the inventory
2022-11-15 00:16:26 +00:00
bc090192f3
Bugfix Player Inventory for Items Rendering
2022-11-15 00:12:14 +00:00
MH261677
e602d83a31
Updated Inventory system for Items in UI
...
The Inventory System is working fully with the healing jelly working
2022-11-15 00:04:46 +00:00
a976775e61
Updated TurnBaseCombat for Enemy Death onHealthZero
2022-11-14 23:41:55 +00:00
b20004e599
Updated TurnBaseCombat to Start Combat onCollision
2022-11-14 23:24:37 +00:00
c6e7dbca62
Added Prototype Gun to Player Character
2022-11-14 23:05:35 +00:00
02c14525a5
Added BungeeMan for Temp Enemy
2022-11-14 23:01:06 +00:00
d8dcef64e8
Merge branch 'merchant-system' into Turn-Base-System
...
# Conflicts:
# Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp
2022-11-14 22:41:33 +00:00
MH261677
593badeca9
Updated AllInventory BP's
...
Updated all the blueprints
2022-11-14 22:40:09 +00:00
f2857b3c57
Updated Combat_UI for Battle Log
2022-11-14 22:30:31 +00:00
MH261677
7a8dead59b
Added Default Item to test
...
Added a default item to the inventory BP.
2022-11-14 20:28:34 +00:00
MH261677
fe75a8c388
Created Inventory BP
...
Created the Inventory UI
2022-11-14 19:50:57 +00:00
MH261677
5ebf6a3431
Updated PlayerInventory->ItemDisplay
...
Added a placeholder jelly image to the first item and finished blueprinting and creating the itemdisplay
2022-11-14 19:47:17 +00:00
MH261677
83da7265d5
Added HealingJelly Item, Added PlayerInventory
...
Added healing jelly item blueprint and started working on the playerinventory UI
2022-11-14 19:22:50 +00:00
MH261677
a40aa57f70
Added all BP Items in the game and updated scripts
...
All Items are added in BP with the values they are meant to have. Starting to now actually implement them into the inventory UI and creating the Inventory UI
2022-11-14 17:42:26 +00:00
MH261677
e070b32f0e
Created BaseItem and InventoryComponent for Items
...
Created both the baseitem and inventorycomponent class to start adding in the custom items to the game.
2022-11-14 14:57:02 +00:00
3b627518ca
Updated Blueprint Combat UI for Prototype Buttons
2022-11-14 03:04:11 +00:00
19d43413ef
Updated Combat UI for Progress Bars
2022-11-14 00:03:24 +00:00
c23bbb4f08
Added Test Combat Player Character
2022-11-14 00:02:46 +00:00
MH261677
d29bb501c7
Updated Interaction,TempCharacter to cleanup
...
I cleaned up and removed unused functions in both interaction and tempcharacter scripts.
2022-11-13 22:21:51 +00:00
58db9e7459
Updated TurnBaseCombat to Reference HUD Blueprint
2022-11-13 21:41:09 +00:00
c085aae130
Refactored Variable Naming Conventions to Unreal
2022-11-13 21:41:08 +00:00
bf3b2e3837
Added Combat Test Game Mode Base
2022-11-13 21:41:07 +00:00
0ce1fd4a1d
Added Combat Test Map
2022-11-13 19:19:45 +00:00
MH261677
846b21e4e9
Fixed Interaction Pop-Ups
...
Interaction is now working with the merchant also added interaction class to setup this up.
2022-11-13 16:43:01 +00:00
MH261677
eeaf52df89
Attempted to reference UserWidget
2022-11-13 03:00:21 +00:00
MH261677
4d53a2cdda
Cant even get a widget to open after 4 hours
2022-11-12 18:47:13 +00:00
MH261677
cdab08dcdf
Added Dialouge box for Shop
2022-11-11 23:33:37 +00:00
MH261677
f632a010a4
Refactored TempCharacter code
2022-11-11 22:21:10 +00:00
MH261677
2c7a717617
Interaction between player and merchant works.
2022-11-11 20:35:41 +00:00
MH261677
8ee792226c
LineTrace works and is detecting objects.
...
LineTrace works and is detecting objects from the player using the interact button. Also cleaned up some scripts and deleted unused MerchantTriggerBox script.
2022-11-11 20:21:44 +00:00
MH261677
ca90d5fc6e
Working on TraceChannel for merchant hit detect
2022-11-10 16:38:38 +00:00
MH261677
ba713ddb2e
Cleaned up scripts
2022-11-10 12:57:31 +00:00
MH261677
fb981ce2d6
Created Custom FP Character with custom Interact
...
Created a Temp Character script and gave it functionallity, also gave it the custom keybind E so when pressed it displays a log message so I know it works. Also created a temporary gamemode for merchant level
2022-11-10 11:52:10 +00:00
MH261677
25fa3d3414
Started working on Merchant Logic
...
Started to create the base merchant trigger box to start making the interaction between player and merchant npc
2022-11-10 01:09:02 +00:00
MH261677
bfe2de2d5d
Added interact input key E
2022-11-10 00:03:09 +00:00
MH261677
94574da7c4
Added enemy test player
...
created a simple object which will act as the test collision for enemy player.
2022-11-07 17:41:34 +00:00
MH261677
d6b1a1d0c2
Started working on basic enemy collision
2022-11-07 01:07:41 +00:00
MH261677
4fa8f85a17
Fixed some personal engine issues
...
Had a problem where things were not appearing.
2022-11-07 00:56:51 +00:00
Marcel Hara
bc96dc4556
Added a plane to the main level
...
added a plane to stop the character just falling into the void
2022-10-24 00:54:12 +01:00
MARCEL HARA
d655109a82
Cleaned Unreal Project
...
Deleted the starter content and made Main the default level
2022-10-18 10:53:22 +01:00
84a326be22
Added Blank Unreal 5 Project
...
In c++ mode
2022-10-18 10:10:40 +01:00
