ecae96081d 
							
						 
					 
					
						
						
							
							Added Geometry Collection for Destructable Components  
						
						 
						
						
						
						
					 
					
						2023-01-26 17:54:56 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							6297531eba 
							
						 
					 
					
						
						
							
							Updated world space  
						
						 
						
						... 
						
						
						
						I moved a few objects in the world space 
						
						
					 
					
						2023-01-26 17:43:43 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							2f22ec811f 
							
						 
					 
					
						
						
							
							Updated Merchant_UI  
						
						 
						
						... 
						
						
						
						Removed things being removed from parent and transferred it from code to fix many bugs, Also fixed text being instantly displayed once you talk to the merchant again 
						
						
					 
					
						2023-01-26 17:41:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							ee0cd6cc39 
							
						 
					 
					
						
						
							
							Updated shader  
						
						 
						
						... 
						
						
						
						I updated and added a new shader that could be better and has a slightly different effect to the original shader 
						
						
					 
					
						2023-01-26 17:40:08 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							8e71181328 
							
						 
					 
					
						
						
							
							Added outline shader  
						
						 
						
						... 
						
						
						
						I added a shader that adds a black outline to each object in the world to add a stylized effect to our game 
						
						
					 
					
						2023-01-26 16:20:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							c58d5d5592 
							
						 
					 
					
						
						
							
							Updated BP_OPENDIAL  
						
						 
						
						... 
						
						
						
						Added a custom function which gets triggered in the Interaction.cpp 
						
						
					 
					
						2023-01-23 17:41:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							914b7cbc96 
							
						 
					 
					
						
						
							
							Forgot to save  
						
						 
						
						
						
						
					 
					
						2023-01-23 17:25:24 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							949607aa23 
							
						 
					 
					
						
						
							
							Hub names  
						
						 
						
						... 
						
						
						
						Named level assets and started wall 
						
						
					 
					
						2023-01-23 17:24:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							469b585bc2 
							
						 
					 
					
						
						
							
							Hub area  
						
						 
						
						... 
						
						
						
						Made most of the basic structure of the hub area, still need to add Town Hall and finalise abyss walls 
						
						
					 
					
						2023-01-23 17:09:49 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							3f4cdf5bfa 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Optimized some functions and variables by storing them in beginplay 
						
						
					 
					
						2023-01-23 16:14:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							15b56b3598 
							
						 
					 
					
						
						
							
							Updated Engine Version to 5.1  
						
						 
						
						
						
						
					 
					
						2023-01-23 13:35:24 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							b9d87ee07b 
							
						 
					 
					
						
						
							
							Updated Unreal version to 5.1  
						
						 
						
						
						
						
					 
					
						2023-01-21 14:19:49 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							82c65b3fc4 
							
						 
					 
					
						
						
							
							Fix for Version Conflict  
						
						 
						
						
						
						
					 
					
						2023-01-17 08:46:31 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e4709f35e7 
							
						 
					 
					
						
						
							
							Bugfix Collision on Large Section  
						
						 
						
						
						
						
					 
					
						2023-01-17 06:34:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							51c7bd6628 
							
						 
					 
					
						
						
							
							Updated Player Start Location in Tutorial  
						
						 
						
						
						
						
					 
					
						2023-01-17 05:18:44 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							79661ce0a3 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/Music' into dev  
						
						 
						
						
						
						
					 
					
						2023-01-17 05:13:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							faf37bce52 
							
						 
					 
					
						
						
							
							Bugfix Collisions on Tunnel Pathways Partially Corrected  
						
						 
						
						
						
						
					 
					
						2023-01-17 05:13:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							41bee1b0bd 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/merchant-system-v3' into AI-Perception  
						
						 
						
						
						
						
					 
					
						2023-01-17 04:20:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3efc36344b 
							
						 
					 
					
						
						
							
							Added Stop Behaviour in AI When in Combat  
						
						 
						
						
						
						
					 
					
						2023-01-17 04:20:07 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							cba221ec82 
							
						 
					 
					
						
						
							
							Merge branch 'Beta-Level' into merchant-system-v3  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/Combat_UI.uasset 
						
						
					 
					
						2023-01-17 02:46:42 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							084ad419c5 
							
						 
					 
					
						
						
							
							Updated TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Fixed double linetracing issue 
						
						
					 
					
						2023-01-16 23:41:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							355dd06aae 
							
						 
					 
					
						
						
							
							Updated BP_ShopSelector,WBP_BuyHealing  
						
						 
						
						... 
						
						
						
						Added it so when you click the arrows it swaps to the different widgets and made the widget remove from viewport 
						
						
					 
					
						2023-01-16 21:25:18 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							6b131213a6 
							
						 
					 
					
						
						
							
							Created WBP_BuyBuff  
						
						 
						
						... 
						
						
						
						Created the buy screen for the buff jelly 
						
						
					 
					
						2023-01-16 21:24:24 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							77328aa887 
							
						 
					 
					
						
						
							
							Created WBP_BuyHealing  
						
						 
						
						... 
						
						
						
						Created the buy healing jelly promt and gave it functionality to trigger buyitem which triggers linetrace logic 
						
						
					 
					
						2023-01-16 20:42:16 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							74a14f68c7 
							
						 
					 
					
						
						
							
							Added destructable objects  
						
						 
						
						... 
						
						
						
						Added a few things that are able to be destroyed 
						
						
					 
					
						2023-01-16 17:20:50 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							58243e8ccc 
							
						 
					 
					
						
						
							
							Updated BP_ShopSelector, BP_MerchantInteraction  
						
						 
						
						... 
						
						
						
						Added interactivity for the buttons to activate functions in the interaction.cpp 
						
						
					 
					
						2023-01-16 17:01:04 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							5333846266 
							
						 
					 
					
						
						
							
							Added Abyss asset  
						
						 
						
						... 
						
						
						
						Added the abyss asset to be used in level creation 
						
						
					 
					
						2023-01-16 13:52:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							8aa6529f8a 
							
						 
					 
					
						
						
							
							Added rope and metal beam  
						
						 
						
						... 
						
						
						
						Added a few items to be used in level creation 
						
						
					 
					
						2023-01-16 12:38:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							27d51210ec 
							
						 
					 
					
						
						
							
							Added new cave tunnel  
						
						 
						
						
						
						
					 
					
						2023-01-16 12:03:29 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							4a14dbe384 
							
						 
					 
					
						
						
							
							Added countertop asset  
						
						 
						
						... 
						
						
						
						Added a countertop asset to be used with the merchant system 
						
						
					 
					
						2023-01-16 11:52:50 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							db170e9ff5 
							
						 
					 
					
						
						
							
							Added Shelf Object  
						
						 
						
						... 
						
						
						
						Added a shelf object to be paired with the merchant system 
						
						
					 
					
						2023-01-16 11:46:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							a3de58b063 
							
						 
					 
					
						
						
							
							Added Stalegtite asset  
						
						 
						
						... 
						
						
						
						Added stalegtite asset to be used to build our level 
						
						
					 
					
						2023-01-16 11:38:50 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							55ebd7d779 
							
						 
					 
					
						
						
							
							Added Glass material  
						
						 
						
						... 
						
						
						
						I added a new glass material into unreal because the one from blender didn't work 
						
						
					 
					
						2023-01-16 11:36:08 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							6319ab9f8a 
							
						 
					 
					
						
						
							
							Added science buildings  
						
						 
						
						... 
						
						
						
						Added a few science buildings in order to build our level 
						
						
					 
					
						2023-01-16 11:27:16 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							c5ce519fae 
							
						 
					 
					
						
						
							
							Added rope bridge modular pack  
						
						 
						
						... 
						
						
						
						I added the rope bridge modular pack to allow us to create long rope bridges and connect them wherever we want 
						
						
					 
					
						2023-01-16 11:24:18 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							45eae63b76 
							
						 
					 
					
						
						
							
							Added Cave tunnel modular assets  
						
						 
						
						... 
						
						
						
						I added multiple cave tunnels to allow us to create a level placing parts of tunnels down to make it 
						
						
					 
					
						2023-01-16 11:23:43 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fdd9c5debe 
							
						 
					 
					
						
						
							
							Updated AI for Hearing Perception  
						
						 
						
						
						
						
					 
					
						2023-01-15 19:50:39 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							e7fa8f4c63 
							
						 
					 
					
						
						
							
							Updated BP_ShopSelector  
						
						 
						
						... 
						
						
						
						Added a close button which re-enables all the input again by calling a function in TempChar 
						
						
					 
					
						2023-01-15 16:14:03 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							808b567d6f 
							
						 
					 
					
						
						
							
							Created BP_ShopSelector  
						
						 
						
						... 
						
						
						
						Created the widget for the item selector when you are in the shop 
						
						
					 
					
						2023-01-15 15:06:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							b4e741bfd8 
							
						 
					 
					
						
						
							
							Changed BP_GoldCount to BP_ImportantStats  
						
						 
						
						
						
						
					 
					
						2023-01-14 22:11:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							f25b0b970d 
							
						 
					 
					
						
						
							
							Updated BP_GoldCount  
						
						 
						
						... 
						
						
						
						Added health value and made it reflect the players health variable 
						
						
					 
					
						2023-01-14 22:10:29 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							43db88c107 
							
						 
					 
					
						
						
							
							Updated BP_GoldCount  
						
						 
						
						... 
						
						
						
						Made it so it shows the gold count now that you can set in the BP_TempCharacter 
						
						
					 
					
						2023-01-14 22:05:20 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							1d6e0171c4 
							
						 
					 
					
						
						
							
							Created BP_GoldCount in Blueprints/Display_UI  
						
						 
						
						... 
						
						
						
						Started to create the GoldCounter to display the players gold 
						
						
					 
					
						2023-01-14 20:38:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							a582a05a59 
							
						 
					 
					
						
						
							
							Changed BP_Interaction name to BP_MerchantInteract  
						
						 
						
						... 
						
						
						
						Changed BP_Interaction name to BP_MerchantInteraction 
						
						
					 
					
						2023-01-14 20:34:38 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							9878f0f370 
							
						 
					 
					
						
						
							
							Updated ItemDisplay WBP  
						
						 
						
						... 
						
						
						
						Added an item stack to the number to start creating stackable items 
						
						
					 
					
						2023-01-12 13:56:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							c107c9a490 
							
						 
					 
					
						
						
							
							Updated Merchant  
						
						 
						
						... 
						
						
						
						Fixed crash error and merchant dialouge box pops up now, Started working on item stacking 
						
						
					 
					
						2023-01-12 13:05:43 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							d78abda469 
							
						 
					 
					
						
						
							
							Added Sheep model  
						
						 
						
						... 
						
						
						
						I added the sheep model and saved it in the correct folder, adding it in the enemy character folder 
						
						
					 
					
						2023-01-10 16:02:43 +00:00