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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							af1813fd9a 
							
						 
					 
					
						
						
							
							Merge branch 'merchant-system' into Turn-Base-System-V2  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Merchant/BP_MerchantGameMode.uasset 
						
						
					 
					
						2022-11-29 15:53:39 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							07e7f8c70f 
							
						 
					 
					
						
						
							
							Added NiagaraSystem for Gun Particle Effect  
						
						 
						
						
						
						
					 
					
						2022-11-29 01:54:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							77b32edde4 
							
						 
					 
					
						
						
							
							Organized Content Browser  
						
						 
						
						... 
						
						
						
						Organized the content browser to make it easier to know where everything is 
						
						
					 
					
						2022-11-23 17:26:35 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							22c13a8c25 
							
						 
					 
					
						
						
							
							Bugfix Movement Enabled During Combat in TBCv2  
						
						 
						
						
						
						
					 
					
						2022-11-21 22:34:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1751ffd163 
							
						 
					 
					
						
						
							
							Added Main Menu for Test Levels  
						
						 
						
						
						
						
					 
					
						2022-11-21 12:50:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							e64b4057ac 
							
						 
					 
					
						
						
							
							Created Health_Gold UI  
						
						 
						
						
						
						
					 
					
						2022-11-18 20:05:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e5e24c848a 
							
						 
					 
					
						
						
							
							Updated Prototype Environment for Inventory  
						
						 
						
						
						
						
					 
					
						2022-11-15 03:40:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							91667f89b2 
							
						 
					 
					
						
						
							
							Updated MerchantGameMode  
						
						 
						
						... 
						
						
						
						Added a print string to tell the player to press TAB to open the inventory 
						
						
					 
					
						2022-11-15 00:16:26 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							eeaf52df89 
							
						 
					 
					
						
						
							
							Attempted to reference UserWidget  
						
						 
						
						
						
						
					 
					
						2022-11-13 03:00:21 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							4d53a2cdda 
							
						 
					 
					
						
						
							
							Cant even get a widget to open after 4 hours  
						
						 
						
						
						
						
					 
					
						2022-11-12 18:47:13 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							cdab08dcdf 
							
						 
					 
					
						
						
							
							Added Dialouge box for Shop  
						
						 
						
						
						
						
					 
					
						2022-11-11 23:33:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							fb981ce2d6 
							
						 
					 
					
						
						
							
							Created Custom FP Character with custom Interact  
						
						 
						
						... 
						
						
						
						Created a Temp Character script and gave it functionallity, also gave it the custom keybind E so when pressed it displays a log message so I know it works. Also created a temporary gamemode for merchant level 
						
						
					 
					
						2022-11-10 11:52:10 +00:00