MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							8d20b563e7 
							
						 
					 
					
						
						
							
							Updated Gun FX to make smoke smaller  
						
						 
						
						
						
						
					 
					
						2023-04-26 12:59:44 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							a90fccd72e 
							
						 
					 
					
						
						
							
							Updated Gun Effects to add smoke and sparks  
						
						 
						
						... 
						
						
						
						added smoke and spark effects to the gun upon firing 
						
						
					 
					
						2023-04-26 12:12:50 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							a770fc47f1 
							
						 
					 
					
						
						
							
							Started working on sparks for gun  
						
						 
						
						
						
						
					 
					
						2023-04-24 18:43:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							ba35cfd06e 
							
						 
					 
					
						
						
							
							Bound Health Percent UI to Get Combat Character Health  
						
						 
						
						
						
						
					 
					
						2023-04-24 12:08:59 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fa3a811553 
							
						 
					 
					
						
						
							
							Added Tutorial Widget with Functionality  
						
						 
						
						
						
						
					 
					
						2023-04-24 11:54:28 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b5d451d948 
							
						 
					 
					
						
						
							
							Updated BookUI for Small Cosmetic Changes  
						
						 
						
						
						
						
					 
					
						2023-04-21 14:35:36 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7c39553dd2 
							
						 
					 
					
						
						
							
							Updated Book UI to Display Only Valid Combos  
						
						 
						
						
						
						
					 
					
						2023-04-21 04:26:09 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							11a58bb836 
							
						 
					 
					
						
						
							
							Added 1st and 2nd Element UI Book Elements  
						
						 
						
						
						
						
					 
					
						2023-04-21 04:16:46 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							02e1ec436c 
							
						 
					 
					
						
						
							
							Updated TurnBasedCombat to Use New Book UI  
						
						 
						
						
						
						
					 
					
						2023-04-21 03:44:01 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							94f45d99c3 
							
						 
					 
					
						
						
							
							Added Combat UI Asset for World Space  
						
						 
						
						
						
						
					 
					
						2023-04-21 02:57:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							793e096ed5 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/tutorial-functionality' into Book-UI  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Levels/Build.umap 
						
						
					 
					
						2023-04-20 22:30:57 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Kacper Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							b50e9dc161 
							
						 
					 
					
						
						
							
							Added UI elements and collisions  
						
						 
						
						... 
						
						
						
						I added ui elements and collisions 
						
						
					 
					
						2023-04-20 16:46:27 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							5e534b3af9 
							
						 
					 
					
						
						
							
							Updated Flashlight brightness  
						
						 
						
						
						
						
					 
					
						2023-03-29 17:16:11 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								EMILY TAYLOR 
							
						 
					 
					
						
						
						
						
							
						
						
							7ec5c4442f 
							
						 
					 
					
						
						
							
							Added Book and Material  
						
						 
						
						... 
						
						
						
						Implemented book asset in game and material. 
						
						
					 
					
						2023-03-29 16:19:37 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								CHARLIE SEYMOUR 
							
						 
					 
					
						
						
						
						
							
						
						
							5307c9c02d 
							
						 
					 
					
						
						
							
							Added combat and material bars  
						
						 
						
						
						
						
					 
					
						2023-03-29 15:48:08 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1b4a2673e3 
							
						 
					 
					
						
						
							
							Updated Combat UI for New Conventions (WIP)  
						
						 
						
						
						
						
					 
					
						2023-03-28 04:36:27 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							544de9810c 
							
						 
					 
					
						
						
							
							Updated Combat Character Increased Sprint Speed  
						
						 
						
						
						
						
					 
					
						2023-03-28 03:46:35 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Charlie Seymour 
							
						 
					 
					
						
						
						
						
							
						
						
							cef9cd9d7b 
							
						 
					 
					
						
						
							
							Added Custom Health bars  
						
						 
						
						... 
						
						
						
						Health only 
						
						
					 
					
						2023-03-23 17:55:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcel Hara 
							
						 
					 
					
						
						
						
						
							
						
						
							6f9f95ab9d 
							
						 
					 
					
						
						
							
							Attempted fix widget to merchant system  
						
						 
						
						
						
						
					 
					
						2023-03-14 13:04:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7d078cbb4c 
							
						 
					 
					
						
						
							
							Added Sprint using Left Shift  
						
						 
						
						
						
						
					 
					
						2023-03-14 04:40:13 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b27f6ef064 
							
						 
					 
					
						
						
							
							Added Flashlight Tutorial  
						
						 
						
						
						
						
					 
					
						2023-03-14 00:34:06 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							63b6c20c13 
							
						 
					 
					
						
						
							
							Updated Combat Character to Toggle Flashlight  
						
						 
						
						
						
						
					 
					
						2023-03-14 00:31:06 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							76b2d78f0e 
							
						 
					 
					
						
						
							
							Updated Dialogue for Choices  
						
						 
						
						
						
						
					 
					
						2023-03-13 04:49:09 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b5048e4be3 
							
						 
					 
					
						
						
							
							Updated Project Settings for Build  
						
						 
						
						
						
						
					 
					
						2023-03-06 00:22:09 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							69b235030a 
							
						 
					 
					
						
						
							
							Updated Combat Character to Add a Flashlight  
						
						 
						
						
						
						
					 
					
						2023-03-03 18:39:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9b0ef82e7c 
							
						 
					 
					
						
						
							
							Updated TurnBasedCombat to Include New Combos  
						
						 
						
						
						
						
					 
					
						2023-02-27 04:07:19 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							939d1e8b92 
							
						 
					 
					
						
						
							
							Bugfix StatusEffects Not Being Added to Player  
						
						 
						
						
						
						
					 
					
						2023-02-25 00:20:49 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							31a6a5d98e 
							
						 
					 
					
						
						
							
							Added StatusEffect Stub for Multiple Status Effects  
						
						 
						
						
						
						
					 
					
						2023-02-20 17:58:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							77c43ab3d1 
							
						 
					 
					
						
						
							
							Updated TempCharacter to find AI Sphere  
						
						 
						
						
						
						
					 
					
						2023-02-16 15:02:58 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9e451d4539 
							
						 
					 
					
						
						
							
							Bugfix Set Mouse Input to Only Poll Yaw Movement  
						
						 
						
						
						
						
					 
					
						2023-02-02 02:19:59 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0de2753dff 
							
						 
					 
					
						
						
							
							Bugfix Clicking Instantly Activates Combat  
						
						 
						
						
						
						
					 
					
						2023-01-31 00:30:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							82c65b3fc4 
							
						 
					 
					
						
						
							
							Fix for Version Conflict  
						
						 
						
						
						
						
					 
					
						2023-01-17 08:46:31 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d1394e98 
							
						 
					 
					
						
						
							
							Updated Action Mapping from Right to Left Click  
						
						 
						
						
						
						
					 
					
						2022-11-29 17:38:39 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3e93e686dd 
							
						 
					 
					
						
						
							
							Updated Main Menu for Merchant  
						
						 
						
						
						
						
					 
					
						2022-11-29 16:13:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							07e7f8c70f 
							
						 
					 
					
						
						
							
							Added NiagaraSystem for Gun Particle Effect  
						
						 
						
						
						
						
					 
					
						2022-11-29 01:54:45 +00:00