Commit Graph

479 Commits

Author SHA1 Message Date
Marcel Hara
df4499fdde Updated TempCharacter to fix Camera issues
Fixed the UI not returning after player exits the merchant. Fixed the bug where if a player jumps and interacts with the merchant and then exits the camera is stuck in the air instead of resetting properly.
2023-03-16 16:31:40 +00:00
MH261677
093825dc0d Potential fix for merchant system UI
** POTENTIALLY FIXED NEED TO TEST**
2023-03-16 14:49:17 +00:00
KACPER SZELEST
4d45fff004 Updated readme with a new link
Added the introduction letter writing for our game into the read me in a form of a link to a google doc.
2023-03-16 11:24:16 +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
ca87feaf2a Bugfix Getting Wrong Widget for Dialogue 2023-03-14 01:33:06 +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
1fde04c875 Merge remote-tracking branch 'origin/UI-designs' into dev 2023-03-13 18:12:24 +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
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