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