|
|
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 |
|
