Commit Graph

754 Commits

Author SHA1 Message Date
Rowland Rowland
0b9c01189e Working on Lighting
Removed current point lights will replace and decorate envrionment
2023-03-13 17:22:15 +00:00
Alicia
06fcc98b3a build wth background buildings 2023-03-13 18:18:12 +01:00
Alicia
d7ad370c99 build with two background buildings 2023-03-13 18:16:55 +01:00
56db7d3e9c Merge pull request #12 from Games-Academy-Student-Work-22-23/UI-Implementation
UI implementation
2023-03-13 17:14:10 +00: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
Marcel Hara
c5ef154a3f Fixed Ammo items being destroyed
Fixed the ammo items being destroyed from the inventory
2023-03-13 17:06:10 +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
d2325b514c Update readme.md 2023-03-07 15:26:13 +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
PHOEBE HARRIS-WILSON
93dc519091 line art of the gun elements
black and transparent veriations of the gun elements.
2023-03-06 17:09:25 +00:00
PHOEBE HARRIS-WILSON
5d5584e691 interior of book design start
Start of the interior book design
2023-03-06 17:08:45 +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
Alicia
b9f54ee51d Merge branch 'Environment-assets' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into houes-modles 2023-03-06 17:10:02 +01: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
da1b3e9137 Bugfix Null Cached AI References 2023-03-06 15:37:31 +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
6db0770582 Bugfix Crouch Crashing Game 2023-03-06 15:00:08 +00:00
b16f632537 Updated Combat to Hide Gold & Health Text 2023-03-06 05:25:36 +00:00
0a0c5ed017 Bugfix Combat Initiation Not Checking AI Blackboard 2023-03-06 04:56:05 +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