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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							57e8b76e89 
							
						 
					 
					
						
						
							
							Added Chase Blueprint AI  
						
						 
						
						
						
						
					 
					
						2022-11-17 03:39:12 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e6fa31ef04 
							
						 
					 
					
						
						
							
							Added TurnBaseSystemV2 Test Level  
						
						 
						
						
						
						
					 
					
						2022-11-17 03:03:54 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							9a2835f54c 
							
						 
					 
					
						
						
							
							Added Rock Megascan Temp Mesh  
						
						 
						
						
						
						
					 
					
						2022-11-17 03:03:32 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							96273d16d9 
							
						 
					 
					
						
						
							
							Updated Prototype Environment for TurnBaseCombat  
						
						 
						
						
						
						
					 
					
						2022-11-15 01:45:52 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dab9182814 
							
						 
					 
					
						
						
							
							Merge remote-tracking branch 'origin/Level' into Turn-Base-System  
						
						 
						
						
						
						
					 
					
						2022-11-15 01:35:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							dbe213ef77 
							
						 
					 
					
						
						
							
							Updated Prototype level  
						
						 
						
						... 
						
						
						
						I have updated the prototype level to include the environment assets and added a small material to a big rock 
						
						
					 
					
						2022-11-15 01:34:32 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							f6c59adda0 
							
						 
					 
					
						
						
							
							Added empty level "prototype"  
						
						 
						
						... 
						
						
						
						I added an empty level called prototype to wel.. prototype on 
						
						
					 
					
						2022-11-15 01:20:37 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							181fcd0103 
							
						 
					 
					
						
						
							
							Added Environment assets  
						
						 
						
						... 
						
						
						
						I added some assets that could be used for the tutorial level 
						
						
					 
					
						2022-11-15 01:18:26 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							e070b32f0e 
							
						 
					 
					
						
						
							
							Created BaseItem and InventoryComponent for Items  
						
						 
						
						... 
						
						
						
						Created both the baseitem and inventorycomponent class to start adding in the custom items to the game. 
						
						
					 
					
						2022-11-14 14:57:02 +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  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							d29bb501c7 
							
						 
					 
					
						
						
							
							Updated Interaction,TempCharacter to cleanup  
						
						 
						
						... 
						
						
						
						I cleaned up and removed unused functions in both interaction and tempcharacter scripts. 
						
						
					 
					
						2022-11-13 22:21:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							58db9e7459 
							
						 
					 
					
						
						
							
							Updated TurnBaseCombat to Reference HUD Blueprint  
						
						 
						
						
						
						
					 
					
						2022-11-13 21:41:09 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c085aae130 
							
						 
					 
					
						
						
							
							Refactored Variable Naming Conventions to Unreal  
						
						 
						
						
						
						
					 
					
						2022-11-13 21:41:08 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bf3b2e3837 
							
						 
					 
					
						
						
							
							Added Combat Test Game Mode Base  
						
						 
						
						
						
						
					 
					
						2022-11-13 21:41:07 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							0ce1fd4a1d 
							
						 
					 
					
						
						
							
							Added Combat Test Map  
						
						 
						
						
						
						
					 
					
						2022-11-13 19:19:45 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							846b21e4e9 
							
						 
					 
					
						
						
							
							Fixed Interaction Pop-Ups  
						
						 
						
						... 
						
						
						
						Interaction is now working with the merchant also added interaction class to setup this up. 
						
						
					 
					
						2022-11-13 16:43:01 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							f632a010a4 
							
						 
					 
					
						
						
							
							Refactored TempCharacter code  
						
						 
						
						
						
						
					 
					
						2022-11-11 22:21:10 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							2c7a717617 
							
						 
					 
					
						
						
							
							Interaction between player and merchant works.  
						
						 
						
						
						
						
					 
					
						2022-11-11 20:35:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							8ee792226c 
							
						 
					 
					
						
						
							
							LineTrace works and is detecting objects.  
						
						 
						
						... 
						
						
						
						LineTrace works and is detecting objects from the player using the interact button. Also cleaned up some scripts and deleted unused MerchantTriggerBox script. 
						
						
					 
					
						2022-11-11 20:21:44 +00:00