Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							c6669aebdb 
							
						 
					 
					
						
						
							
							Updated 2nd group of grey blocks  
						
						 
						
						... 
						
						
						
						Added Blue_rocks texture and repositioned them so that the player can jump up and get to the top of the level 
						
						
					 
					
						2023-05-02 10:48:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							df11877377 
							
						 
					 
					
						
						
							
							Added textures to grey blocks  
						
						 
						
						... 
						
						
						
						Texture grey blocks with Blue_rocks material. Don't know if this will be permanent but figured it'd be good to do in case they never get addressed. 
						
						
					 
					
						2023-05-02 10:43:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							372acb7302 
							
						 
					 
					
						
						
							
							Changed enemy health  
						
						 
						
						... 
						
						
						
						Lowered enemy health pool to increase pace of combat 
						
						
					 
					
						2023-05-02 10:25:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							6217026ee1 
							
						 
					 
					
						
						
							
							Moved sign onto wall  
						
						 
						
						... 
						
						
						
						Moved shop sign onto wall as opposed to having it float midair 
						
						
					 
					
						2023-05-02 10:14:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f7ab9a2cfb 
							
						 
					 
					
						
						
							
							Reorganised Build Level for Easy Searchability  
						
						 
						
						
						
						
					 
					
						2023-04-30 21:25:10 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							393eea2250 
							
						 
					 
					
						
						
							
							Updated Map to Remove Rope on Model as Impossible to Align  
						
						 
						
						... 
						
						
						
						Rope is curved 
						
						
					 
					
						2023-04-30 20:11:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MarcelHara 
							
						 
					 
					
						
						
						
						
							
						
						
							2a35dc1ea1 
							
						 
					 
					
						
						
							
							Fixed Merge issues to dev  
						
						 
						
						
						
						
					 
					
						2023-04-30 13:14:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MarcelHara 
							
						 
					 
					
						
						
						
						
							
						
						
							bef17b7f04 
							
						 
					 
					
						
						
							
							Merge branch 'volumetric-fog' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Levels/Build.umap 
						
						
					 
					
						2023-04-30 13:06:51 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MarcelHara 
							
						 
					 
					
						
						
						
						
							
						
						
							06b9586fd3 
							
						 
					 
					
						
						
							
							Duplicated Build for merge  
						
						 
						
						
						
						
					 
					
						2023-04-30 13:04:19 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dcab1c483f 
							
						 
					 
					
						
						
							
							Updated Quest Text for Consistentcy  
						
						 
						
						
						
						
					 
					
						2023-04-28 05:44:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							cf433291a9 
							
						 
					 
					
						
						
							
							Bugfix Larger Health Values Break Health UI  
						
						 
						
						
						
						
					 
					
						2023-04-28 04:47:34 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							38ffd4f339 
							
						 
					 
					
						
						
							
							Bugfix Force Look Pitch Not Correctly Set  
						
						 
						
						
						
						
					 
					
						2023-04-28 03:59:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9ecbd9c52d 
							
						 
					 
					
						
						
							
							Updated GoatAI to Trigger Attack Animations  
						
						 
						
						
						
						
					 
					
						2023-04-28 03:40:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							744b24c8c1 
							
						 
					 
					
						
						
							
							Bugfix Cell Shading  
						
						 
						
						... 
						
						
						
						Disabled on some objects 
						
						
					 
					
						2023-04-28 02:40:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9199db00df 
							
						 
					 
					
						
						
							
							Bugfix Merchant Unable to Interact  
						
						 
						
						
						
						
					 
					
						2023-04-28 01:40:49 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bc171eba80 
							
						 
					 
					
						
						
							
							Added Idle Merchant Animations  
						
						 
						
						
						
						
					 
					
						2023-04-28 01:23:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Phoebe Harris-Wilson 
							
						 
					 
					
						
						
						
						
							
						
						
							e666ed28fb 
							
						 
					 
					
						
						
							
							Rope and talisman and textures  
						
						 
						
						
						
						
					 
					
						2023-04-27 18:00:30 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							b0615eafdd 
							
						 
					 
					
						
						
							
							Added Volumetric fog and fine tuned  
						
						 
						
						
						
						
					 
					
						2023-04-27 17:19:16 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							dd1ab03357 
							
						 
					 
					
						
						
							
							Changed UI to 2D to make it look 3D on the book  
						
						 
						
						
						
						
					 
					
						2023-04-27 17:18:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							f8e130f727 
							
						 
					 
					
						
						
							
							Fixed quest system  
						
						 
						
						... 
						
						
						
						I fixed the quest system and made it interactable 
						
						
					 
					
						2023-04-27 16:47:26 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							f990cd20c9 
							
						 
					 
					
						
						
							
							Added quest giver mesh  
						
						 
						
						... 
						
						
						
						Added the quest giver mesh into the world space so you can recieve quests from her 
						
						
					 
					
						2023-04-27 16:40:55 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							e2dd3cfd9c 
							
						 
					 
					
						
						
							
							Added quest giver  
						
						 
						
						... 
						
						
						
						I added the quest giver into the game so we can have quests 
						
						
					 
					
						2023-04-27 16:25:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							6c3e358460 
							
						 
					 
					
						
						
							
							Updated tunnels  
						
						 
						
						... 
						
						
						
						I added the improved tunnels which werent in already 
						
						
					 
					
						2023-04-27 16:21:21 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MarcelHara 
							
						 
					 
					
						
						
						
						
							
						
						
							3b725f53bb 
							
						 
					 
					
						
						
							
							Started to work on main menu  
						
						 
						
						
						
						
					 
					
						2023-04-27 12:31:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MarcelHara 
							
						 
					 
					
						
						
						
						
							
						
						
							1a039023ed 
							
						 
					 
					
						
						
							
							Updated SmokeParticles to breaking walls  
						
						 
						
						
						
						
					 
					
						2023-04-27 11:57:03 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							11c905613a 
							
						 
					 
					
						
						
							
							Updated Combat to Include Red Vignette on Damage Taken  
						
						 
						
						
						
						
					 
					
						2023-04-27 06:59:52 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9fd372ed9d 
							
						 
					 
					
						
						
							
							Updated Combat to Include Camera Shake on Shoot & Wall Break  
						
						 
						
						
						
						
					 
					
						2023-04-27 05:13:41 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							be31b90112 
							
						 
					 
					
						
						
							
							Updated Gun FX to making smoke more realistic and emission change  
						
						 
						
						... 
						
						
						
						Updated the color and the way the smoke moves to look more realistic and made the emission a lot lower to prevent smoke from lighting up the whole scene 
						
						
					 
					
						2023-04-26 12:55:38 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							a770fc47f1 
							
						 
					 
					
						
						
							
							Started working on sparks for gun  
						
						 
						
						
						
						
					 
					
						2023-04-24 18:43:22 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3e34ab4c5c 
							
						 
					 
					
						
						
							
							Bugfix Bridge Massive Gap  
						
						 
						
						
						
						
					 
					
						2023-04-24 12:18:04 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							e3c83ba4ff 
							
						 
					 
					
						
						
							
							Added collisions to assets  
						
						 
						
						... 
						
						
						
						I added collisions to assets 
						
						
					 
					
						2023-04-20 16:07:17 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							fd64b18f61 
							
						 
					 
					
						
						
							
							Updated LOD to all crystals  
						
						 
						
						
						
						
					 
					
						2023-03-29 17:16:50 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e8c29d8004 
							
						 
					 
					
						
						
							
							Updated Build Map to Include Rope Bridge & More Direction  
						
						 
						
						
						
						
					 
					
						2023-03-28 04:53:13 +01:00