MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							810b4b1680 
							
						 
					 
					
						
						
							
							TemporarilyBroken TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Attempted to fix the close button currently it crashes. 
						
						
					 
					
						2023-01-26 18:12:24 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							7199ee76a3 
							
						 
					 
					
						
						
							
							Updated Items  
						
						 
						
						... 
						
						
						
						Started to create item stacks and fix item not dissapearing bug 
						
						
					 
					
						2022-11-29 15:44:00 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							cc9384a9c1 
							
						 
					 
					
						
						
							
							Updated BP_BuffJelly  
						
						 
						
						... 
						
						
						
						Gave BuffJelly a unique ID of 1 
						
						
					 
					
						2022-11-29 14:19:43 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							f52ea5efb8 
							
						 
					 
					
						
						
							
							Overhauled Items  
						
						 
						
						... 
						
						
						
						Gave every single item a unique ID so no matter the item the ID will always be different 
						
						
					 
					
						2022-11-29 14:15:20 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							3360ea2031 
							
						 
					 
					
						
						
							
							Updated TempCharacter,TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Gave a max inventory slots of 5 for testing purposes and Refactored code in TempCharacter.cpp 
						
						
					 
					
						2022-11-29 12:55:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							07e7f8c70f 
							
						 
					 
					
						
						
							
							Added NiagaraSystem for Gun Particle Effect  
						
						 
						
						
						
						
					 
					
						2022-11-29 01:54:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							be0766cf0c 
							
						 
					 
					
						
						
							
							Added EscapeToMenu Component for Escaping to Menu  
						
						 
						
						
						
						
					 
					
						2022-11-29 00:42:03 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							fdfe4a660c 
							
						 
					 
					
						
						
							
							Bugfix Movement Not being Reenabled on Combat End  
						
						 
						
						
						
						
					 
					
						2022-11-29 00:34:47 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1300c99a3f 
							
						 
					 
					
						
						
							
							Added HoldToInitCombat Actor Component for Manual Combat Init  
						
						 
						
						
						
						
					 
					
						2022-11-29 00:23:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							8c69f58a97 
							
						 
					 
					
						
						
							
							Updated BP_OPENDIAL, Interaction.cpp  
						
						 
						
						... 
						
						
						
						Changed the text in the widget and gave it a little animation. Made the Wait timer in interaction changeable in the editor. 
						
						
					 
					
						2022-11-28 23:15:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							b5772a024c 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Added a wait timer to close the widget once open automatically 
						
						
					 
					
						2022-11-28 22:52:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							06492d69d5 
							
						 
					 
					
						
						
							
							Updated TurnBaseCombat for Keyboard Hotkeys  
						
						 
						
						... 
						
						
						
						Crit Feedback 
						
						
					 
					
						2022-11-24 02:49:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							5dce4dc603 
							
						 
					 
					
						
						
							
							Updated InventoryComponent  
						
						 
						
						... 
						
						
						
						Added comment 
						
						
					 
					
						2022-11-24 00:13:20 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							57b532c256 
							
						 
					 
					
						
						
							
							Updated WBP_PlayerInventory  
						
						 
						
						... 
						
						
						
						Cleaned up the inventory UI and removed unused Blueprint code 
						
						
					 
					
						2022-11-23 19:20:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							9357806178 
							
						 
					 
					
						
						
							
							Updated WBP_ItemDisplay  
						
						 
						
						... 
						
						
						
						Made the item display larger and cleaner, Also added a background to the item 
						
						
					 
					
						2022-11-23 18:16:14 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							26bbe083df 
							
						 
					 
					
						
						
							
							Updated WBP_ItemDisplay, WBP_PlayerInventory  
						
						 
						
						... 
						
						
						
						Changed and resized both the UIS to fit items better and make the whole inventory look a lot cleaner 
						
						
					 
					
						2022-11-23 18:13:13 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							09adfcad27 
							
						 
					 
					
						
						
							
							Updated WBP_PlayerInventory  
						
						 
						
						... 
						
						
						
						Started to work on Inventory UI and re-sized it to be 1920x1080 
						
						
					 
					
						2022-11-23 17:45:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							b7dd592d2c 
							
						 
					 
					
						
						
							
							Created Player folder  
						
						 
						
						... 
						
						
						
						Organized the blueprints into more folders and cleaned up unreal project 
						
						
					 
					
						2022-11-23 17:30:38 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							45369c4dc7 
							
						 
					 
					
						
						
							
							Created Inventory_UI Folder  
						
						 
						
						... 
						
						
						
						Moved all inventory UI to the folder and removed Shop UI as not used anymore 
						
						
					 
					
						2022-11-23 17:29:14 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							36bb1a2265 
							
						 
					 
					
						
						
							
							Updated PlayerInventory  
						
						 
						
						... 
						
						
						
						Made the inventory look slightly nicer, going to work on a nicer alpha version of the UI after this commit 
						
						
					 
					
						2022-11-23 01:56:22 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							7430029db2 
							
						 
					 
					
						
						
							
							BugFix WBP_PlayerInventory  
						
						 
						
						... 
						
						
						
						Fixed cursor still showing up when closing and re-opening the inventory. 
						
						
					 
					
						2022-11-23 01:45:24 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							7dc6f677d4 
							
						 
					 
					
						
						
							
							Updated WBP_PlayerInventory  
						
						 
						
						... 
						
						
						
						Added an override on keypressed so the user can press tab again to close the inventory. Also fixed the widget not being a focusable 
						
						
					 
					
						2022-11-23 01:38:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							168a43d751 
							
						 
					 
					
						
						
							
							Updated BaseItem and ItemBPS  
						
						 
						
						... 
						
						
						
						Gave both items booleans to make the code differentiate what the item does to the player. 
						
						
					 
					
						2022-11-23 00:51:00 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							22c13a8c25 
							
						 
					 
					
						
						
							
							Bugfix Movement Enabled During Combat in TBCv2  
						
						 
						
						
						
						
					 
					
						2022-11-21 22:34:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6a041e4621 
							
						 
					 
					
						
						
							
							Updated RTCombat for Shooting Accuracy via LineTrace  
						
						 
						
						
						
						
					 
					
						2022-11-21 20:59:29 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							1751ffd163 
							
						 
					 
					
						
						
							
							Added Main Menu for Test Levels  
						
						 
						
						
						
						
					 
					
						2022-11-21 12:50:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7184e19dce 
							
						 
					 
					
						
						
							
							Bugfix GunProtoype Handle Subject to Backface Culling  
						
						 
						
						... 
						
						
						
						Flipped Normals on Handle 
						
						
					 
					
						2022-11-21 00:15:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							49a24325ea 
							
						 
					 
					
						
						
							
							Updated TempCharacter, WBPHealth  
						
						 
						
						... 
						
						
						
						Made the health and gold variables for the character blueprintable to start implimenting them into basic UI for visual representation. 
						
						
					 
					
						2022-11-19 20:08:00 +00:00