MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							ba713ddb2e 
							
						 
					 
					
						
						
							
							Cleaned up scripts  
						
						 
						
						
						
						
					 
					
						2022-11-10 12:57:31 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							38ab588226 
							
						 
					 
					
						
						
							
							Added comments on what next to do for merchant  
						
						 
						
						
						
						
					 
					
						2022-11-10 11:56:19 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							fb981ce2d6 
							
						 
					 
					
						
						
							
							Created Custom FP Character with custom Interact  
						
						 
						
						... 
						
						
						
						Created a Temp Character script and gave it functionallity, also gave it the custom keybind E so when pressed it displays a log message so I know it works. Also created a temporary gamemode for merchant level 
						
						
					 
					
						2022-11-10 11:52:10 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							d96c540bcf 
							
						 
					 
					
						
						
							
							Cleaned Up Project  
						
						 
						
						... 
						
						
						
						Deleted Old enemycollision script and deleted thirdperson content 
						
						
					 
					
						2022-11-10 10:15:43 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							25fa3d3414 
							
						 
					 
					
						
						
							
							Started working on Merchant Logic  
						
						 
						
						... 
						
						
						
						Started to create the base merchant trigger box to start making the interaction between player and merchant npc 
						
						
					 
					
						2022-11-10 01:09:02 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							bfe2de2d5d 
							
						 
					 
					
						
						
							
							Added interact input key E  
						
						 
						
						
						
						
					 
					
						2022-11-10 00:03:09 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							48ca848710 
							
						 
					 
					
						
						
							
							Specficially ignored Riderlink in .gitignore  
						
						 
						
						
						
						
					 
					
						2022-11-09 23:55:31 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							96dd28f1b1 
							
						 
					 
					
						
						
							
							Ignored just Plugins folder to avoid errors  
						
						 
						
						
						
						
					 
					
						2022-11-09 23:27:39 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bea0e1b735 
							
						 
					 
					
						
						
							
							Updated TurnBaseCombat to Reference Actors  
						
						 
						
						... 
						
						
						
						Grabs all actors active within scene 
						
						
					 
					
						2022-11-09 21:24:36 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							5907d5dbe8 
							
						 
					 
					
						
						
							
							Updated TurnBaseCombat for Switching Active Roles  
						
						 
						
						... 
						
						
						
						Added Switching Active Roles and Constrained Active Action Points 
						
						
					 
					
						2022-11-09 21:03:47 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							b678c25377 
							
						 
					 
					
						
						
							
							Added Base TurnBasedComabat System WIP  
						
						 
						
						
						
						
					 
					
						2022-11-09 20:32:31 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							bcd8127346 
							
						 
					 
					
						
						
							
							Revert "Added .gitignore for all Rider related plugins"  
						
						 
						
						... 
						
						
						
						This reverts commit ab922824e2c830c514a74999790788cd4eda8560. 
						
						
					 
					
						2022-11-09 20:31:47 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							ab922824e2 
							
						 
					 
					
						
						
							
							Added .gitignore for all Rider related plugins  
						
						 
						
						... 
						
						
						
						Gitignore is now working for all IDES and languages. 
						
						
					 
					
						2022-11-09 17:13:01 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							14d07f375a 
							
						 
					 
					
						
						
							
							Added Rider to .gitignore  
						
						 
						
						
						
						
					 
					
						2022-11-09 17:05:20 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							94574da7c4 
							
						 
					 
					
						
						
							
							Added enemy test player  
						
						 
						
						... 
						
						
						
						created a simple object which will act as the test collision for enemy player. 
						
						
					 
					
						2022-11-07 17:41:34 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							aad21aa491 
							
						 
					 
					
						
						
							
							Added Enemycollision script  
						
						 
						
						... 
						
						
						
						Added enemy collision script and made it output the player being hit. 
						
						
					 
					
						2022-11-07 17:40:38 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							d6b1a1d0c2 
							
						 
					 
					
						
						
							
							Started working on basic enemy collision  
						
						 
						
						
						
						
					 
					
						2022-11-07 01:07:41 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							4fa8f85a17 
							
						 
					 
					
						
						
							
							Fixed some personal engine issues  
						
						 
						
						... 
						
						
						
						Had a problem where things were not appearing. 
						
						
					 
					
						2022-11-07 00:56:51 +00:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcel Hara 
							
						 
					 
					
						
						
						
						
							
						
						
							8a30db0118 
							
						 
					 
					
						
						
							
							Got rid of old gamemode and added new working one  
						
						 
						
						
						
						
					 
					
						2022-10-24 00:55:18 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcel Hara 
							
						 
					 
					
						
						
						
						
							
						
						
							bc96dc4556 
							
						 
					 
					
						
						
							
							Added a plane to the main level  
						
						 
						
						... 
						
						
						
						added a plane to stop the character just falling into the void 
						
						
					 
					
						2022-10-24 00:54:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Marcel Hara 
							
						 
					 
					
						
						
						
						
							
						
						
							e928b223c8 
							
						 
					 
					
						
						
							
							Added Thirdperson Starter Content  
						
						 
						
						... 
						
						
						
						Added the third person starter content in the game so I can start making the 3rd person to 1st person switch mechanic. 
						
						
					 
					
						2022-10-24 00:52:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							3fad4a2e13 
							
						 
					 
					
						
						
							
							Updated Readme.md  
						
						 
						
						
						
						
					 
					
						2022-10-22 16:24:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							41c3c015a6 
							
						 
					 
					
						
						
							
							Updated Project Configuration  
						
						 
						
						... 
						
						
						
						It now reflects our targeted platforms and custom game mode 
						
						
					 
					
						2022-10-22 16:20:05 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							e45f874147 
							
						 
					 
					
						
						
							
							Added VSCode Workspace File for VSCode Users  
						
						 
						
						
						
						
					 
					
						2022-10-22 16:04:32 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							dd140623c3 
							
						 
					 
					
						
						
							
							Updated .gitignore to Handle VSCode IDE  
						
						 
						
						
						
						
					 
					
						2022-10-22 16:00:23 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							98e28b1fce 
							
						 
					 
					
						
						
							
							Merge branch 'main' into dev  
						
						 
						
						
						
						
					 
					
						2022-10-22 15:42:12 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							7e4fd97a90 
							
						 
					 
					
						
						
							
							Merge pull request  #2  from Games-Academy-Student-Work-22-23/dev  
						
						 
						
						... 
						
						
						
						Cleaned Unreal Project 
						
						
					 
					
						2022-10-18 10:55:07 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								MARCEL HARA 
							
						 
					 
					
						
						
						
						
							
						
						
							d655109a82 
							
						 
					 
					
						
						
							
							Cleaned Unreal Project  
						
						 
						
						... 
						
						
						
						Deleted the starter content and made Main the default level 
						
						
					 
					
						2022-10-18 10:53:22 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							84a326be22 
							
						 
					 
					
						
						
							
							Added Blank Unreal 5 Project  
						
						 
						
						... 
						
						
						
						In c++ mode 
						
						
					 
					
						2022-10-18 10:10:40 +01:00  
					
					
						 
						
							
							
							 
						
					 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							50677faa26 
							
						 
					 
					
						
						
							
							Initial commit  
						
						 
						
						
						
						
					 
					
						2022-10-18 10:04:24 +01:00