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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c0ff4f6b9f 
							
						 
					 
					
						
						
							
							Bugfix Origin on Ropebridge  
						
						 
						
						
						
						
					 
					
						2023-03-29 13:10:14 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e8c29d8004 
							
						 
					 
					
						
						
							
							Updated Build Map to Include Rope Bridge & More Direction  
						
						 
						
						
						
						
					 
					
						2023-03-28 04:53:13 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							24d0f2b334 
							
						 
					 
					
						
						
							
							Added Wooden Sign to Direct Players  
						
						 
						
						
						
						
					 
					
						2023-03-28 03:11:41 +01: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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							acbbed522b 
							
						 
					 
					
						
						
							
							Cooked New Materials for Build  
						
						 
						
						
						
						
					 
					
						2023-03-14 04:47:53 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Taylor 
							
						 
					 
					
						
						
						
						
							
						
						
							d7f98039c0 
							
						 
					 
					
						
						
							
							Imported Rock Assets too General Dressing Folder  
						
						 
						
						
						
						
					 
					
						2023-03-13 15:57:35 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Emily Taylor 
							
						 
					 
					
						
						
						
						
							
						
						
							c4a668c2e9 
							
						 
					 
					
						
						
							
							Added Merchant Shop assets  
						
						 
						
						... 
						
						
						
						Added Merchant shop FBX 
						
						
					 
					
						2023-03-06 15:31:55 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d100a85a0d 
							
						 
					 
					
						
						
							
							Updated Combat to Set Camera to Face Enemy  
						
						 
						
						
						
						
					 
					
						2023-03-06 04:28:13 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							c67bdf6c9c 
							
						 
					 
					
						
						
							
							Updated build level with extra meshes  
						
						 
						
						... 
						
						
						
						I added a few meshes to create tunnels and a cavern in one of our levels to create a better feeling of being in a cavey abyss 
						
						
					 
					
						2023-03-04 19:10:12 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							ffac8b483f 
							
						 
					 
					
						
						
							
							Updated build level with outline material and wall  
						
						 
						
						... 
						
						
						
						I added the big wall in to the build level and added some outlines into the level 
						
						
					 
					
						2023-03-03 21:10:47 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							74a6e239e8 
							
						 
					 
					
						
						
							
							Added enemies and fixed asset collision  
						
						 
						
						
						
						
					 
					
						2023-03-03 18:51:29 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							f1e775dfa1 
							
						 
					 
					
						
						
							
							Updated build level  
						
						 
						
						... 
						
						
						
						Fixed up the tutorial level so it looks a bit better 
						
						
					 
					
						2023-03-03 18:32:42 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							87c2833381 
							
						 
					 
					
						
						
							
							Added a crystal asset  
						
						 
						
						... 
						
						
						
						Added a crystal asset to use for level dressing 
						
						
					 
					
						2023-03-03 18:25:52 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							26c93284d0 
							
						 
					 
					
						
						
							
							Updated build level  
						
						 
						
						... 
						
						
						
						Added a few dressing assets and dressed the level 
						
						
					 
					
						2023-03-03 18:13:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							2b0567ab6e 
							
						 
					 
					
						
						
							
							Added collisions to blockout level  
						
						 
						
						... 
						
						
						
						I added collisions to all assets in the blockout level to be used in testing 
						
						
					 
					
						2023-03-03 15:47:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8e5416e3a9 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into Modular-Kit  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Levels/Top_layer_level.umap
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp 
						
						
					 
					
						2023-02-28 15:25:47 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Taylor 
							
						 
					 
					
						
						
						
						
							
						
						
							37dad4c873 
							
						 
					 
					
						
						
							
							Imported Beam Assets into Unreal  
						
						 
						
						... 
						
						
						
						i Imported the beam assets from maya into the unreal engine 5 
						
						
					 
					
						2023-02-27 16:12:18 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Taylor 
							
						 
					 
					
						
						
						
						
							
						
						
							f2c69dfe3a 
							
						 
					 
					
						
						
							
							Added the assets for the Tutorial Level to Unreal  
						
						 
						
						
						
						
					 
					
						2023-02-27 15:44:19 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Taylor 
							
						 
					 
					
						
						
						
						
							
						
						
							a43ed3a626 
							
						 
					 
					
						
						
							
							Added the Wooden Texture for the Tutorial Assets  
						
						 
						
						
						
						
					 
					
						2023-02-27 15:43:18 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							177a4f685f 
							
						 
					 
					
						
						
							
							Added and made Level 1 Blockout assets  
						
						 
						
						... 
						
						
						
						I added and put implamented the level 1 blockout assets and created the blockout level for it. 
						
						
					 
					
						2023-02-20 14:48:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d36fe6fed0 
							
						 
					 
					
						
						
							
							Added Breakable Walls BP  
						
						 
						
						... 
						
						
						
						Using Particles at the moment 
						
						
					 
					
						2023-02-01 23:37:17 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7a715c2e55 
							
						 
					 
					
						
						
							
							Bugfix Hard Reference for GunEffect not Saving  
						
						 
						
						
						
						
					 
					
						2023-01-31 03:13:17 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							64f5d652ff 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/Enviroment-Art' into dev  
						
						 
						
						
						
						
					 
					
						2023-01-31 02:19:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							afb0429003 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/Beta-Level' into dev  
						
						 
						
						
						
						
					 
					
						2023-01-31 01:53:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							beb110a901 
							
						 
					 
					
						
						
							
							Added Red Jelly Asset  
						
						 
						
						... 
						
						
						
						I added a red Jelly asset to be used in the merchant system as a placeholder asset 
						
						
					 
					
						2023-01-30 22:39:29 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							f4134c478f 
							
						 
					 
					
						
						
							
							Added Blue Jelly asset  
						
						 
						
						... 
						
						
						
						I added a blue jelly asset to be used in the merchant system 
						
						
					 
					
						2023-01-30 22:37:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								george taylor 
							
						 
					 
					
						
						
						
						
							
						
						
							7644f56dd2 
							
						 
					 
					
						
						
							
							Added modular planks for Rope Bridges into Assets Objects  
						
						 
						
						... 
						
						
						
						Created four modular planks for the rope bridges that can be put together too create a longer rope bridge. 
						
						
					 
					
						2023-01-30 18:01:07 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								George Taylor 
							
						 
					 
					
						
						
						
						
							
						
						
							3011042fbd 
							
						 
					 
					
						
						
							
							Cave Dressing Grey Boxes  
						
						 
						
						... 
						
						
						
						The grey boxes for the first level cave dressings. 
						
						
					 
					
						2023-01-26 18:11:43 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e4709f35e7 
							
						 
					 
					
						
						
							
							Bugfix Collision on Large Section  
						
						 
						
						
						
						
					 
					
						2023-01-17 06:34:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							faf37bce52 
							
						 
					 
					
						
						
							
							Bugfix Collisions on Tunnel Pathways Partially Corrected  
						
						 
						
						
						
						
					 
					
						2023-01-17 05:13:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							832efe418b 
							
						 
					 
					
						
						
							
							Created top layer level  
						
						 
						
						... 
						
						
						
						I created the tutorial of our top layer level, where there will be a few enemies to fight and the ability of seeing what else the player will be able to do in the game 
						
						
					 
					
						2023-01-16 17:18:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							bea8e8c396 
							
						 
					 
					
						
						
							
							Added new tunnels  
						
						 
						
						... 
						
						
						
						Added a new tunnel asset 
						
						
					 
					
						2023-01-16 16:16:54 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							16972db8c5 
							
						 
					 
					
						
						
							
							Fixed Rope Bridge asset  
						
						 
						
						... 
						
						
						
						I fixed the rope bridge assets as the textures and models themselves were not looking right 
						
						
					 
					
						2023-01-16 14:25:38 +00:00