|
|
fde1537dc0
|
Merge branch 'Book-UI' into dev
|
2023-04-25 04:31:26 +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 |
|
EMILY TAYLOR
|
795732d147
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-04-24 16:07: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 |
|
EMILY TAYLOR
|
58730a8573
|
Added Civilian Material in content drawer
Created material for Civilian Character for side quest, re-use Merchant Mesh from Merchant folder
|
2023-04-24 16:06:45 +01:00 |
|
George Taylor
|
e97ee6a9c7
|
Imported new beams into unreal
I updated the beams asset too have smoother edges
|
2023-04-24 15:54:24 +01:00 |
|
|
|
3e34ab4c5c
|
Bugfix Bridge Massive Gap
|
2023-04-24 12:18:04 +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 |
|
|
|
233125cc81
|
Merge branch 'Animations' into dev
|
2023-04-21 15:36:29 +01:00 |
|
|
|
8342865f74
|
Added Delay On Escape From Combat
|
2023-04-21 15:32:41 +01:00 |
|
|
|
39113cad58
|
Added Animation Blueprint for Goat Walking
|
2023-04-21 14:59:22 +01:00 |
|
|
|
2987ac3bb1
|
Merge remote-tracking branch 'origin/Animations' into dev
|
2023-04-21 14:46:12 +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
|
19ebf111a3
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-04-20 16:46:39 +01:00 |
|
Kacper Szelest
|
b50e9dc161
|
Added UI elements and collisions
I added ui elements and collisions
|
2023-04-20 16:46:27 +01:00 |
|
George Taylor
|
5e28b7e6e2
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-04-20 16:30:24 +01:00 |
|
George Taylor
|
66c26efeef
|
Improved Rock Texture in Unreal
changed the bitmaps and graph for the rock texture
|
2023-04-20 16:29:56 +01:00 |
|
Kacper Szelest
|
8102db3bc7
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-04-20 16:07:35 +01:00 |
|
Kacper Szelest
|
e3c83ba4ff
|
Added collisions to assets
I added collisions to assets
|
2023-04-20 16:07:17 +01:00 |
|
George Taylor
|
2ec38c4c60
|
Imported the improved environment assets
i imported the level environment too the unreal build
|
2023-04-20 15:53:07 +01:00 |
|
KACPER Szelest
|
9db6138385
|
Added river to level
I added a little river to our level
|
2023-04-19 22:39:51 +01:00 |
|
KACPER Szelest
|
6c59905e9b
|
Created Water marterial
I created a water material to use for a little river we have in the level
|
2023-04-19 22:39:32 +01:00 |
|
KACPER Szelest
|
9c5f607b83
|
Updated cave level 1 objects with temp textures
I added temporary textures to the assets to have a decent looking level
|
2023-04-19 22:25:44 +01:00 |
|
KACPER Szelest
|
b88cc9dfe8
|
Added Temporary texture
I added a temporary texture to use for the level for testing purposes
|
2023-04-19 21:31:32 +01:00 |
|
KACPER Szelest
|
0616e21fbc
|
Added temporary level assets
|
2023-04-19 21:30:10 +01:00 |
|
EMILY TAYLOR
|
7150d69759
|
Added Tutorial Assets in engine
|
2023-04-17 18:07:22 +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 |
|
|
|
985fdfa3af
|
Updated Goat Textures
|
2023-04-17 17:21:45 +01:00 |
|
George Taylor
|
6455ce96a8
|
Fixed the Wood and Rock Textures
Imported the bitmaps as targas and fixed the wood and rock textures so they can be used in the build
|
2023-04-17 16:53:47 +01:00 |
|
|
|
dc7e00b5f3
|
Imported Goat Attack and Walking Animations
|
2023-04-17 16:53:01 +01:00 |
|
|
|
fa4857447c
|
Merge branch 'UI_implementation' into dev
|
2023-04-17 15:03:56 +01:00 |
|
|
|
6003b61098
|
Merge remote-tracking branch 'origin/lighting-updates' into dev
|
2023-04-17 15:03:27 +01:00 |
|
Rowland Rowland
|
fb79fc9bdf
|
Forgot to save the last change appropriatley
|
2023-03-30 17:01:18 +01:00 |
|
Rowland Rowland
|
574bd4a33d
|
Added additonal lighting in front of the Merchant's cave
The player should now be guided towards the merchant once they enter the cavern
|
2023-03-30 17:00:22 +01:00 |
|
Rowland Rowland
|
3be617e9df
|
Merge branch 'dev' into Combat-Testing
|
2023-03-30 16:43:42 +01:00 |
|
Rowland Rowland
|
e4187fad25
|
Removed remnants of hub
|
2023-03-30 16:37:05 +01:00 |
|
Rowland Rowland
|
01d90fcb3b
|
Updated Merchant position and removed an enemy
|
2023-03-30 16:03:40 +01:00 |
|
Phoebe
|
76699b3be2
|
Mushrooms and textures
|
2023-03-30 15:40:30 +01:00 |
|
MARCEL HARA
|
fd64b18f61
|
Updated LOD to all crystals
|
2023-03-29 17:16:50 +01:00 |
|
MARCEL HARA
|
5e534b3af9
|
Updated Flashlight brightness
|
2023-03-29 17:16:11 +01:00 |
|
MARCEL HARA
|
95f81d3a10
|
Merge branch 'UI_implementation' into lighting-updates
# Conflicts:
# Content/Levels/Build.umap
|
2023-03-29 17:08:57 +01:00 |
|
MARCEL HARA
|
00677164b3
|
Updated all lighting to whole scene
Changed the lighting and crystal placements in the starter place and the hub world
|
2023-03-29 17:03:00 +01:00 |
|
Phoebe
|
2787f29e16
|
mushrooms added and textures
|
2023-03-29 16:59:07 +01:00 |
|
EMILY TAYLOR
|
25e20d53f7
|
Added Lamp Asset for Tutorial Level
|
2023-03-29 16:22:00 +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 |
|
George Taylor
|
f723db11c9
|
Imported the styalised textures bitmaps into Unreal
|
2023-03-29 14:40:05 +01:00 |
|
|
|
c0ff4f6b9f
|
Bugfix Origin on Ropebridge
|
2023-03-29 13:10:14 +01:00 |
|
|
|
2e6398da59
|
Bugfix Input Not Being Re-Enabled On Respawn
|
2023-03-28 05:19:41 +01:00 |
|
|
|
8407c02042
|
Updated Build Map for Light Build
|
2023-03-28 05:08:52 +01:00 |
|
|
|
2c9de7ee58
|
Bugfix Invisible Plane When Entering Large Room Block
|
2023-03-28 05:01:07 +01:00 |
|
|
|
b51ac385cd
|
Bugfix Inventory Widget Anchors Not Correctly Set
|
2023-03-28 04:56:56 +01:00 |
|
|
|
e8c29d8004
|
Updated Build Map to Include Rope Bridge & More Direction
|
2023-03-28 04:53:13 +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 |
|
|
|
e28da9ab26
|
Added Lights In Shop
|
2023-03-28 03:16:39 +01:00 |
|
|
|
24d0f2b334
|
Added Wooden Sign to Direct Players
|
2023-03-28 03:11:41 +01:00 |
|
phoebe
|
fe60960c21
|
ADDED SMALL MUSHROOMS
|
2023-03-27 17:31:10 +01:00 |
|
Charlie Seymour
|
cef9cd9d7b
|
Added Custom Health bars
Health only
|
2023-03-23 17:55:59 +00:00 |
|
Blue Probert
|
470c78421b
|
Added level for enemy testing aswell as made reaction speed public.
|
2023-03-23 17:50:13 +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 |
|
|
|
363623a315
|
Updated Build Map for Goat Tweaks
|
2023-03-14 05:05:20 +00:00 |
|
|
|
acbbed522b
|
Cooked New Materials for Build
|
2023-03-14 04:47:53 +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 |
|
|
|
5b6461224a
|
Updated Build Map for Organisation of Objects
|
2023-03-14 00:44:57 +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 |
|
|
|
576c8fc2a5
|
Baked Atlas for Break Particle Effect
|
2023-03-14 00:22:57 +00:00 |
|
|
|
a12aedde9d
|
Added Breathing Effect on Breakable Walls
|
2023-03-13 23:59:40 +00:00 |
|
|
|
78382d7b97
|
Updated Build Level to Re-Add Science Buildings
|
2023-03-13 23:18:43 +00:00 |
|
|
|
fd99e87d77
|
Updated Science Buildings to Fix Origins & Scales
|
2023-03-13 23:18:13 +00:00 |
|
|
|
b7a5d974ac
|
Updated Build Map to Stop Goats from Colliding
|
2023-03-13 22:17:44 +00:00 |
|
|
|
4d77431338
|
Merge branch 'Quest-&-Dialogue-System' into dev
|
2023-03-13 22:02:36 +00:00 |
|
|
|
17afc60c22
|
Merge branch 'houes-modles' into dev
# Conflicts:
# Content/Levels/Build.umap
|
2023-03-13 18:20:17 +00:00 |
|
|
|
bef31d5738
|
Merge branch 'environment_assets' into dev
|
2023-03-13 18:12:50 +00:00 |
|
|
|
af86084f3e
|
Updated Quest UI to Display Tasks
|
2023-03-13 18:11:42 +00:00 |
|
|
|
bfa6c24ee9
|
Bugfix New UI Not Displaying
|
2023-03-13 18:10:02 +00:00 |
|
Rowland Rowland
|
23985317a2
|
Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev
|
2023-03-13 17:23:18 +00:00 |
|
Rowland Rowland
|
0b9c01189e
|
Working on Lighting
Removed current point lights will replace and decorate envrionment
|
2023-03-13 17:22:15 +00:00 |
|
Alicia
|
d7ad370c99
|
build with two background buildings
|
2023-03-13 18:16:55 +01:00 |
|
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 |
|
|
|
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 |
|
