| 
						
					 | 
					
						
						
						
						
							
						
						
							e8c20e2d67
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into Turn-Based-Combat
						
						
						
						
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/BungeeMan/Mat_BungeeMan_Rubber.uasset
#	Content/Dialogue/NPCTest.uasset
#	Source/the_twilight_abyss/PlayerTemp/TempCharacter.cpp 
						
						
					 | 
					
						2023-02-28 15:29:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9b0ef82e7c
							
						
					 | 
					
						
						
							
							Updated TurnBasedCombat to Include New Combos
						
						
						
						
						
						
					 | 
					
						2023-02-27 04:07:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce4f3aff1f
							
						
					 | 
					
						
						
							
							Added SneakMechanicTesting level
						
						
						
						
						
						
						
						Added new level for sneak mechanic testing 
						
						
					 | 
					
						2023-02-23 16:03:10 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							45374da8bb
							
						
					 | 
					
						
						
							
							Updated Combat System to Disengage from Combat
						
						
						
						
						
						
					 | 
					
						2023-01-31 01:39:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0de2753dff
							
						
					 | 
					
						
						
							
							Bugfix Clicking Instantly Activates Combat
						
						
						
						
						
						
					 | 
					
						2023-01-31 00:30:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							82c65b3fc4
							
						
					 | 
					
						
						
							
							Fix for Version Conflict
						
						
						
						
						
						
					 | 
					
						2023-01-17 08:46:31 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3efc36344b
							
						
					 | 
					
						
						
							
							Added Stop Behaviour in AI When in Combat
						
						
						
						
						
						
					 | 
					
						2023-01-17 04:20:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fdd9c5debe
							
						
					 | 
					
						
						
							
							Updated AI for Hearing Perception
						
						
						
						
						
						
					 | 
					
						2023-01-15 19:50:39 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 |