Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							30d22975b7 
							
						 
					 
					
						
						
							
							Updated Level  
						
						 
						
						... 
						
						
						
						Added textures and began experimenting with curves. Planning to investigate Splines 
						
						
					 
					
						2023-02-06 17:24:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							36c18382a2 
							
						 
					 
					
						
						
							
							Updated TempCharacter for sneaking vignette effect  
						
						 
						
						... 
						
						
						
						Added a Vignette effect when crouching 
						
						
					 
					
						2023-02-06 15:55:12 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							5b4da1f02e 
							
						 
					 
					
						
						
							
							Updated TempCharacter for Jump and Sneak  
						
						 
						
						... 
						
						
						
						Added A sneak function and Jump function for the character 
						
						
					 
					
						2023-02-06 15:26:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							0cf4ace43a 
							
						 
					 
					
						
						
							
							Updated TempCharacter  
						
						 
						
						... 
						
						
						
						Added Jump function which is using ACharacter and started working on custom Sneak function 
						
						
					 
					
						2023-02-06 14:30:13 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a16de31aa2 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/merchant-system-v4' into dev  
						
						 
						
						
						
						
					 
					
						2023-02-06 13:53:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d21486797d 
							
						 
					 
					
						
						
							
							Merge branch 'Dialogue-System' into dev  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset 
						
						
					 
					
						2023-02-06 13:53:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dc7e9c8c15 
							
						 
					 
					
						
						
							
							Merge branch 'Interactable-Environment' into dev  
						
						 
						
						
						
						
					 
					
						2023-02-06 13:52:20 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7f3e3cbb52 
							
						 
					 
					
						
						
							
							Updated DialogueNPC to Add Dialogue via Blueprints  
						
						 
						
						
						
						
					 
					
						2023-02-06 03:28:53 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e5b624411d 
							
						 
					 
					
						
						
							
							Updated TextPrompt for Choices  
						
						 
						
						
						
						
					 
					
						2023-02-06 03:27:49 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							5364f92edb 
							
						 
					 
					
						
						
							
							Updated WBP_ItemDisplay  
						
						 
						
						... 
						
						
						
						Item_Stack now changes to however many stacks the player has bought of the item 
						
						
					 
					
						2023-02-04 17:49:17 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							f4e0511f5c 
							
						 
					 
					
						
						
							
							Updated TempCharacter blueprint  
						
						 
						
						... 
						
						
						
						Added a check to make sure the player is not in the shop when opening inventory 
						
						
					 
					
						2023-02-04 17:41:09 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							acefce8bbc 
							
						 
					 
					
						
						
							
							Added InteractNPC to Line Trace for Interact  
						
						 
						
						
						
						
					 
					
						2023-02-02 03:15:50 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9e451d4539 
							
						 
					 
					
						
						
							
							Bugfix Set Mouse Input to Only Poll Yaw Movement  
						
						 
						
						
						
						
					 
					
						2023-02-02 02:19:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3433254463 
							
						 
					 
					
						
						
							
							Added DialogueNPC Actor Component with Text Animation  
						
						 
						
						
						
						
					 
					
						2023-02-02 01:59:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5988272890 
							
						 
					 
					
						
						
							
							Added Base Text Prompt Widget Blueprint  
						
						 
						
						
						
						
					 
					
						2023-02-01 23:47:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							42ce95b84e 
							
						 
					 
					
						
						
							
							Added Dialogue Testing Map with Temp NPC  
						
						 
						
						
						
						
					 
					
						2023-02-01 23:47:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d36fe6fed0 
							
						 
					 
					
						
						
							
							Added Breakable Walls BP  
						
						 
						
						... 
						
						
						
						Using Particles at the moment 
						
						
					 
					
						2023-02-01 23:37:17 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e2f91a11b5 
							
						 
					 
					
						
						
							
							Bugfix Platform Too High to Get Across  
						
						 
						
						
						
						
					 
					
						2023-01-31 03:29:35 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7a715c2e55 
							
						 
					 
					
						
						
							
							Bugfix Hard Reference for GunEffect not Saving  
						
						 
						
						
						
						
					 
					
						2023-01-31 03:13:17 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							8cf4d1d52e 
							
						 
					 
					
						
						
							
							Built Lighting for Build  
						
						 
						
						
						
						
					 
					
						2023-01-31 02:45:23 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							326e64e7ed 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/Level-Design' into dev  
						
						 
						
						
						
						
					 
					
						2023-01-31 02:19:42 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							64f5d652ff 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/Enviroment-Art' into dev  
						
						 
						
						
						
						
					 
					
						2023-01-31 02:19:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							75f373e0c4 
							
						 
					 
					
						
						
							
							Updated Beta Level Map for Temp Jelly Assets  
						
						 
						
						
						
						
					 
					
						2023-01-31 02:15:07 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a15054656e 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into Shaders  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Levels/Top_layer_level.umap 
						
						
					 
					
						2023-01-31 02:04:48 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							afb0429003 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/Beta-Level' into dev  
						
						 
						
						
						
						
					 
					
						2023-01-31 01:53:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ed0bcc7c76 
							
						 
					 
					
						
						
							
							Updated CombatCharacter to Spawn GunEffect onClick  
						
						 
						
						
						
						
					 
					
						2023-01-31 01:48:35 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							45374da8bb 
							
						 
					 
					
						
						
							
							Updated Combat System to Disengage from Combat  
						
						 
						
						
						
						
					 
					
						2023-01-31 01:39:42 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d9584f3b55 
							
						 
					 
					
						
						
							
							Removed Escape To Main Menu  
						
						 
						
						
						
						
					 
					
						2023-01-31 01:23:28 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ad91d6eac7 
							
						 
					 
					
						
						
							
							Updated GunEffect Changed Texture from White  
						
						 
						
						
						
						
					 
					
						2023-01-31 01:02:36 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d18c547632 
							
						 
					 
					
						
						
							
							Bugfix Cursor Not Hiding After Combat  
						
						 
						
						
						
						
					 
					
						2023-01-31 00:56:53 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7e81387247 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/merchant-system-v4' into Turn-Based-Combat  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset 
						
						
					 
					
						2023-01-31 00:50:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0de2753dff 
							
						 
					 
					
						
						
							
							Bugfix Clicking Instantly Activates Combat  
						
						 
						
						
						
						
					 
					
						2023-01-31 00:30:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							cd17363421 
							
						 
					 
					
						
						
							
							Removed Legacy Source Code to Reduce Compilation  
						
						 
						
						
						
						
					 
					
						2023-01-30 23:03:20 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Rowland Rowland 
							
						 
					 
					
						
						
						
						
							
						
						
							1d02d5b3a3 
							
						 
					 
					
						
						
							
							Updated Level-Design. Hub Town 'finished'  
						
						 
						
						... 
						
						
						
						Grey box 'finished'. Need to tidy up values. Likely need to update Abyss walls. Further discussion needed in regard to abyss structure. 
						
						
					 
					
						2023-01-30 17:29:28 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcel Hara 
							
						 
					 
					
						
						
						
						
							
						
						
							d658c63627 
							
						 
					 
					
						
						
							
							Updated WBP_ShopSelector  
						
						 
						
						... 
						
						
						
						Got rid of it casting from tempcharacter but instead it casts from interaction which then activates a function in interaction which activates a different function in tempcharacter 
						
						
					 
					
						2023-01-30 17:20:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							810b4b1680 
							
						 
					 
					
						
						
							
							TemporarilyBroken TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Attempted to fix the close button currently it crashes. 
						
						
					 
					
						2023-01-26 18:12:24 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							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