Commit Graph

726 Commits

Author SHA1 Message Date
Alicia
20cf821fd1 FBX 2023-04-17 16:25:56 +01:00
Alicia
24ef284d4e walking cycle 2023-04-17 16:16:49 +01:00
60fa3a720b Merge branch 'Quest-&-Dialogue-System' into dev
# Conflicts:
#	Content/Levels/Build.umap
2023-04-17 15:04:52 +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
f57960bed6 Added Quest System Stub 2023-03-29 17:36:24 +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
Alicia
adf5e5ab52 WALK CYCLE GOAT FILE 2023-03-27 20:28:20 +01:00
Alicia
ee6c779c3a ATTACK ANIMATION FILE 2023-03-27 20:28:09 +01:00
Alicia
c6c366b229 bridge model 2023-03-27 20:06:54 +01:00
Alicia
5ef21fcc71 GOAT ATTACK ANIMATION 2023-03-27 20:05:29 +01:00
Alicia
02cdfd760c WALK CYCLE GOAT 2023-03-27 20:04:02 +01:00
phoebe
fe60960c21 ADDED SMALL MUSHROOMS 2023-03-27 17:31:10 +01:00
Charlie Seymour
178428c6e8 Merge branch 'dev' of https://github.falmouth.ac.uk/Games-Academy-Student-Work-22-23/the-twilight-abyss into dev 2023-03-23 17:56:07 +00: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
Blue Probert
e2ca14c83f Bugfix Important Stats Widget Renamed 2023-03-23 17:27:17 +00:00
Blue Probert
33fdf4ad71 Bugfix Important Stats Widget Renamed 2023-03-23 15:55:57 +00:00
Emily Taylor
34e7124861 Added Assets for Tutorial Lvl
High and Low poly bones assets , BookClosed_low
All not UV mapped yet
2023-03-21 21:11:37 +00:00
Emily taylor
83619f95ed WIP Assets for tutorial
Backup high poly assets
2023-03-20 17:26:03 +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
a838c82e9c Merge pull request #16 from Games-Academy-Student-Work-22-23/merchant-cleanup
Updated TempCharacter to fix Camera issues
2023-03-16 16:38:14 +00:00
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