KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							0e643e81ba 
							
						 
					 
					
						
						
							
							Create basic greybox of top layer level  
						
						... 
						
						
						
						I created a very blocky greybox, as both a back incase our level doesn't get finished on time, but also as a guide on what to do 
						
						
					 
					
						2023-01-03 14:20:51 +00:00 
						 
				 
			
				
					
						
							
							
								KACPER Szelest 
							
						 
					 
					
						
						
						
						
							
						
						
							78651b1ce4 
							
						 
					 
					
						
						
							
							Created new level  
						
						... 
						
						
						
						I have created the Top_layer level which is where the beta level will be created and housed 
						
						
					 
					
						2023-01-03 12:50:33 +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 
						 
				 
			
				
					
						
							
							
								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 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c6e7dbca62 
							
						 
					 
					
						
						
							
							Added Prototype Gun to Player Character  
						
						
						
						
					 
					
						2022-11-14 23:05:35 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							19d43413ef 
							
						 
					 
					
						
						
							
							Updated Combat UI for Progress Bars  
						
						
						
						
					 
					
						2022-11-14 00:03:24 +00:00 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							c085aae130 
							
						 
					 
					
						
						
							
							Refactored Variable Naming Conventions to Unreal  
						
						
						
						
					 
					
						2022-11-13 21:41:08 +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 
						 
				 
			
				
					
						
							
							
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							ca90d5fc6e 
							
						 
					 
					
						
						
							
							Working on TraceChannel for merchant hit detect  
						
						
						
						
					 
					
						2022-11-10 16:38:38 +00:00 
						 
				 
			
				
					
						
							
							
								MH261677 
							
						 
					 
					
						
						
						
						
							
						
						
							ba713ddb2e 
							
						 
					 
					
						
						
							
							Cleaned up scripts  
						
						
						
						
					 
					
						2022-11-10 12:57:31 +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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
							
						 
					 
					
						
						
						
						
							
						
						
							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 
						 
				 
			
				
					
						
					 
					
						
						
						
						
							
						
						
							84a326be22 
							
						 
					 
					
						
						
							
							Added Blank Unreal 5 Project  
						
						... 
						
						
						
						In c++ mode 
						
						
					 
					
						2022-10-18 10:10:40 +01:00