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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							e64b4057ac 
							
						 
					 
					
						
						
							
							Created Health_Gold UI  
						
						 
						
						
						
						
					 
					
						2022-11-18 20:05:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							ba2b6b599c 
							
						 
					 
					
						
						
							
							Merge branch 'dev' into merchant-system  
						
						 
						
						
						
						
					 
					
						2022-11-18 19:20:20 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							c835567fac 
							
						 
					 
					
						
						
							
							Updated Item Assets  
						
						 
						
						... 
						
						
						
						Added the gold value for each of the item assets 
						
						
					 
					
						2022-11-18 14:54:30 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							220b21f2ca 
							
						 
					 
					
						
						
							
							Added BuffItem Placeholder  
						
						 
						
						... 
						
						
						
						Added the buffitem placeholder to the world. Currently the buffitem just does the same as the healing item. 
						
						
					 
					
						2022-11-18 13:53:47 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							900feee5a9 
							
						 
					 
					
						
						
							
							Updated InventoryComponent and Shop  
						
						 
						
						... 
						
						
						
						Fixed InventoryComponent to now work with singular items so you can purchase items from the shop! 
						
						
					 
					
						2022-11-18 13:07:44 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9780242271 
							
						 
					 
					
						
						
							
							Added RealTimeCombat Map, Character & GameModeBase  
						
						 
						
						
						
						
					 
					
						2022-11-17 04:51:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							09ec1cb181 
							
						 
					 
					
						
						
							
							Added BP HUD Combat_UI_RT for RealTimeCombat  
						
						 
						
						
						
						
					 
					
						2022-11-17 04:15:50 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0b18bcc5c9 
							
						 
					 
					
						
						
							
							Updated CombatCharacter and AI for Tagging  
						
						 
						
						
						
						
					 
					
						2022-11-17 03:42:35 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e5e24c848a 
							
						 
					 
					
						
						
							
							Updated Prototype Environment for Inventory  
						
						 
						
						
						
						
					 
					
						2022-11-15 03:40:59 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9b9cc6f02b 
							
						 
					 
					
						
						
							
							Merge branch 'merchant-system' into Turn-Base-System  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Content/Blueprints/WBP_PlayerInventory.uasset
#	Content/Merchant/BP_MerchantGameMode.uasset 
						
						
					 
					
						2022-11-15 03:28:55 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							0c0876770b 
							
						 
					 
					
						
						
							
							Updated Inventory System  
						
						 
						
						... 
						
						
						
						Added BuffJelly 
						
						
					 
					
						2022-11-15 03:27:44 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9d72f60208 
							
						 
					 
					
						
						
							
							Updated TurnBaseCombat for ResourceBar Functionality  
						
						 
						
						
						
						
					 
					
						2022-11-15 01:12:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							189b6d25b8 
							
						 
					 
					
						
						
							
							Updated Combat UI for Resource Bars  
						
						 
						
						
						
						
					 
					
						2022-11-15 00:43:15 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bc090192f3 
							
						 
					 
					
						
						
							
							Bugfix Player Inventory for Items Rendering  
						
						 
						
						
						
						
					 
					
						2022-11-15 00:12:14 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							e602d83a31 
							
						 
					 
					
						
						
							
							Updated Inventory system for Items in UI  
						
						 
						
						... 
						
						
						
						The Inventory System is working fully with the healing jelly working 
						
						
					 
					
						2022-11-15 00:04:46 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							a976775e61 
							
						 
					 
					
						
						
							
							Updated TurnBaseCombat for Enemy Death onHealthZero  
						
						 
						
						
						
						
					 
					
						2022-11-14 23:41:55 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b20004e599 
							
						 
					 
					
						
						
							
							Updated TurnBaseCombat to Start Combat onCollision  
						
						 
						
						
						
						
					 
					
						2022-11-14 23:24:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c6e7dbca62 
							
						 
					 
					
						
						
							
							Added Prototype Gun to Player Character  
						
						 
						
						
						
						
					 
					
						2022-11-14 23:05:35 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							02c14525a5 
							
						 
					 
					
						
						
							
							Added BungeeMan for Temp Enemy  
						
						 
						
						
						
						
					 
					
						2022-11-14 23:01:06 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							d8dcef64e8 
							
						 
					 
					
						
						
							
							Merge branch 'merchant-system' into Turn-Base-System  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp 
						
						
					 
					
						2022-11-14 22:41:33 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							593badeca9 
							
						 
					 
					
						
						
							
							Updated AllInventory BP's  
						
						 
						
						... 
						
						
						
						Updated all the blueprints 
						
						
					 
					
						2022-11-14 22:40:09 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							f2857b3c57 
							
						 
					 
					
						
						
							
							Updated Combat_UI for Battle Log  
						
						 
						
						
						
						
					 
					
						2022-11-14 22:30:31 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							7a8dead59b 
							
						 
					 
					
						
						
							
							Added Default Item to test  
						
						 
						
						... 
						
						
						
						Added a default item to the inventory BP. 
						
						
					 
					
						2022-11-14 20:28:34 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							fe75a8c388 
							
						 
					 
					
						
						
							
							Created Inventory BP  
						
						 
						
						... 
						
						
						
						Created the Inventory UI 
						
						
					 
					
						2022-11-14 19:50:57 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							5ebf6a3431 
							
						 
					 
					
						
						
							
							Updated PlayerInventory->ItemDisplay  
						
						 
						
						... 
						
						
						
						Added a placeholder jelly image to the first item and finished blueprinting and creating the itemdisplay 
						
						
					 
					
						2022-11-14 19:47:17 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							83da7265d5 
							
						 
					 
					
						
						
							
							Added HealingJelly Item, Added PlayerInventory  
						
						 
						
						... 
						
						
						
						Added healing jelly item blueprint and started working on the playerinventory UI 
						
						
					 
					
						2022-11-14 19:22:50 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							a40aa57f70 
							
						 
					 
					
						
						
							
							Added all BP Items in the game and updated scripts  
						
						 
						
						... 
						
						
						
						All Items are added in BP with the values they are meant to have. Starting to now actually implement them into the inventory UI and creating the Inventory UI 
						
						
					 
					
						2022-11-14 17:42:26 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3b627518ca 
							
						 
					 
					
						
						
							
							Updated Blueprint Combat UI for Prototype Buttons  
						
						 
						
						
						
						
					 
					
						2022-11-14 03:04:11 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							19d43413ef 
							
						 
					 
					
						
						
							
							Updated Combat UI for Progress Bars  
						
						 
						
						
						
						
					 
					
						2022-11-14 00:03:24 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c23bbb4f08 
							
						 
					 
					
						
						
							
							Added Test Combat Player Character  
						
						 
						
						
						
						
					 
					
						2022-11-14 00:02:46 +00:00