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 
							
						 
					 
					
						
						
						
						
							
						
						
							7aa3a702d6 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Script now looks for the camera on the player making it ready to start moving the camera to the items 
						
						
							
						
					 
					
						2023-01-16 17:35:11 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							ab2d2118dd 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Added base functionality for both functions to make camera move 
						
						
							
						
					 
					
						2023-01-16 17:02:12 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							52639d9af6 
							
						 
					 
					
						
						
							
							Updated TempCharacter.cpp, Interaction.cpp  
						
						 
						
						... 
						
						
						
						Added a function which can be called from blueprints to re-enable all input once a button is pressed
Fixed interaction boolean to reset itself back to false to make it so player can talk to NPC again without having to restart the game to interact with it. 
						
						
							
						
					 
					
						2023-01-15 16:15:06 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							4fa9ca74dd 
							
						 
					 
					
						
						
							
							Updated Interaction.cpp  
						
						 
						
						... 
						
						
						
						Fixed the game crashing if there isnt any WBP inputted in tempchar 
						
						
							
						
					 
					
						2023-01-15 16:13:11 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							29c3fdcf09 
							
						 
					 
					
						
						
							
							Updated Interaction, TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						Created InputDisabler functions to disable player controls when dialouge box stops to start working on merchant 
						
						
							
						
					 
					
						2023-01-14 20:35:49 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							cd745b086b 
							
						 
					 
					
						
						
							
							Updated BaseItem, InventoryComponent.cpp  
						
						 
						
						... 
						
						
						
						Fixed an issue where the final item was not dissapearing, added item stacking so when purchasing the same item it will stack instead of being seperate instances. 
						
						
							
						
					 
					
						2023-01-12 15:21:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							3710f33e74 
							
						 
					 
					
						
						
							
							Updated Inventory System  
						
						 
						
						... 
						
						
						
						Done it so the items from the inventory now get removed when used instead of one item never being able to be removed 
						
						
							
						
					 
					
						2023-01-12 13:56:30 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							320a74d4bb 
							
						 
					 
					
						
						
							
							Added Stub for OnInteract Event  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-06 13:55:38 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							6096d5a783 
							
						 
					 
					
						
						
							
							Added Interactable Environment Actor Component Class  
						
						 
						
						
						
						
							
						
					 
					
						2023-01-06 13:43:39 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							c7d1394e98 
							
						 
					 
					
						
						
							
							Updated Action Mapping from Right to Left Click  
						
						 
						
						
						
						
							
						
					 
					
						2022-11-29 17:38:39 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							87e0bb06de 
							
						 
					 
					
						
						
							
							Bugfix TimeToInit Combat to 0.1f  
						
						 
						
						
						
						
							
						
					 
					
						2022-11-29 17:38:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							2512a4950e 
							
						 
					 
					
						
						
							
							Updated TempCharacter.cpp  
						
						 
						
						... 
						
						
						
						cleared unused header file 
						
						
							
  v0.2.0-alpha.2
 
						
					 
					
						2022-11-29 16:40:50 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							ff733f2ab0 
							
						 
					 
					
						
						
							
							Revert "Updated BaseItem.h"  
						
						 
						
						... 
						
						
						
						This reverts commit d365fa6327f7ab6353cefc31cf7ed58f9b504924. 
						
						
							
						
					 
					
						2022-11-29 14:18:05 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							d365fa6327 
							
						 
					 
					
						
						
							
							Updated BaseItem.h  
						
						 
						
						... 
						
						
						
						Changed it so no one can edit the original value ID of an item 
						
						
							
						
					 
					
						2022-11-29 14:16:55 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							2a590c3e33 
							
						 
					 
					
						
						
							
							Updated InventoryComponent,TempCharacter  
						
						 
						
						... 
						
						
						
						Commented InventoryComponent to understand logic easier and removed unused functions from TempCharacter 
						
						
							
						
					 
					
						2022-11-29 12:43:58 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							120da84a3e 
							
						 
					 
					
						
						
							
							Updated Interaction  
						
						 
						
						... 
						
						
						
						Hard coded the 6 second wait timer after testing in engine 
						
						
							
						
					 
					
						2022-11-28 23:21:36 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							26da472db8 
							
						 
					 
					
						
						
							
							Updated MerchantPrototype  
						
						 
						
						... 
						
						
						
						Added an 8 second wait timer to the dialouge in engine 
						
						
							
						
					 
					
						2022-11-28 23:20:55 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							99f1f0c5af 
							
						 
					 
					
						
						
							
							Added C2Plane in Prototype Level  
						
						 
						
						... 
						
						
						
						Restarts level when player falls of the map 
						
						
							
						
					 
					
						2022-11-28 22:30:35 +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