MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ead32f0c8
							
						
					 | 
					
						
						
							
							Added InventoryImage to Inventory UI
						
						
						
						
						
						
					 | 
					
						2023-02-27 17:45:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a6ef9f76cd
							
						
					 | 
					
						
						
							
							Merge branch 'Dialogue-System' into dev
						
						
						
						
						
						
					 | 
					
						2023-02-25 02:27:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							76043108b1
							
						
					 | 
					
						
						
							
							Merge pull request #10 from Games-Academy-Student-Work-22-23/Stealth-Mechanics-v1.0.2
						
						
						
						
						
						
						
						Stealth mechanics v1.0.2 
						
						
					 | 
					
						2023-02-23 16:04:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce4f3aff1f
							
						
					 | 
					
						
						
							
							Added SneakMechanicTesting level
						
						
						
						
						
						
						
						Added new level for sneak mechanic testing 
						
						
					 | 
					
						2023-02-23 16:03:10 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ROWLAND ROWLAND
							
						 
					 | 
					
						
						
						
						
							
						
						
							69f4b8e603
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into Level-1-bloackout
						
						
						
						
						
						
					 | 
					
						2023-02-23 15:49:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							119b5a141a
							
						
					 | 
					
						
						
							
							Updated TempCharacter to remove unused Ulogs
						
						
						
						
						
						
					 | 
					
						2023-02-23 15:19:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb0bd09bb2
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/dev' into Level-Design
						
						
						
						
						
						
					 | 
					
						2023-02-23 15:06:57 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							5e448c897d
							
						
					 | 
					
						
						
							
							Updated Widgets to fix scaling issue
						
						
						
						
						
						
						
						Fixed scaling issue on all widgets to fit all monitor types 
						
						
					 | 
					
						2023-02-20 16:03:25 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kacper Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							177a4f685f
							
						
					 | 
					
						
						
							
							Added and made Level 1 Blockout assets
						
						
						
						
						
						
						
						I added and put implamented the level 1 blockout assets and created the blockout level for it. 
						
						
					 | 
					
						2023-02-20 14:48:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Kacper Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							a67d96943c
							
						
					 | 
					
						
						
							
							Added file level
						
						
						
						
						
						
						
						I added a new level file named level 1, to house the blockout of level one and the future first level 
						
						
					 | 
					
						2023-02-20 14:47:52 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							26f21a9136
							
						
					 | 
					
						
						
							
							Updated DialogueNPC to use Ranged For Loops
						
						
						
						
						
						
					 | 
					
						2023-02-20 09:50:09 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							618a9509ca
							
						
					 | 
					
						
						
							
							Updated EatableItems to add ammo {UNSTABLE}
						
						
						
						
						
						
						
						Added functionality to the ammo count currently unstable as need to wait for other programmer to understand why it crashes. 
						
						
					 | 
					
						2023-02-19 15:29:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							43ef8e2110
							
						
					 | 
					
						
						
							
							Updated TempCharacter to sneak functionality
						
						
						
						
						
						
						
						Added sneak functionality which makes the sphere radius smaller near enemies. 
						
						
					 | 
					
						2023-02-17 13:12:28 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							77c43ab3d1
							
						
					 | 
					
						
						
							
							Updated TempCharacter to find AI Sphere
						
						
						
						
						
						
					 | 
					
						2023-02-16 15:02:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							f032ac91c9
							
						
					 | 
					
						
						
							
							Cleaning Level
						
						
						
						
						
						
						
						Using booleans to remove excess assets 
						
						
					 | 
					
						2023-02-09 17:02:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d1fab9f9a1
							
						
					 | 
					
						
						
							
							Updated DialogueNPC for Structs and Dialogue Paths
						
						
						
						
						
						
					 | 
					
						2023-02-09 03:12:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							a6436c9110
							
						
					 | 
					
						
						
							
							Added BP_AmmoItem
						
						
						
						
						
						
						
						Added Ammo into the game for the player to find 
						
						
					 | 
					
						2023-02-07 00:11:19 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							324f062cc7
							
						
					 | 
					
						
						
							
							Updated EatableItems for AmmoFunctionality
						
						
						
						
						
						
						
						Added ammo base functionality for using the ammo item in game 
						
						
					 | 
					
						2023-02-07 00:11:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							797c447d47
							
						
					 | 
					
						
						
							
							Added Ammo Icon to Images
						
						
						
						
						
						
					 | 
					
						2023-02-06 23:51:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							30d22975b7
							
						
					 | 
					
						
						
							
							Updated Level
						
						
						
						
						
						
						
						Added textures and began experimenting with curves. Planning to investigate Splines 
						
						
					 | 
					
						2023-02-06 17:24:41 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							36c18382a2
							
						
					 | 
					
						
						
							
							Updated TempCharacter for sneaking vignette effect
						
						
						
						
						
						
						
						Added a Vignette effect when crouching 
						
						
					 | 
					
						2023-02-06 15:55:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							5b4da1f02e
							
						
					 | 
					
						
						
							
							Updated TempCharacter for Jump and Sneak
						
						
						
						
						
						
						
						Added A sneak function and Jump function for the character 
						
						
					 | 
					
						2023-02-06 15:26:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							0cf4ace43a
							
						
					 | 
					
						
						
							
							Updated TempCharacter
						
						
						
						
						
						
						
						Added Jump function which is using ACharacter and started working on custom Sneak function 
						
						
					 | 
					
						2023-02-06 14:30:13 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a16de31aa2
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/merchant-system-v4' into dev
						
						
						
						
						
						
					 | 
					
						2023-02-06 13:53:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d21486797d
							
						
					 | 
					
						
						
							
							Merge branch 'Dialogue-System' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset 
						
						
					 | 
					
						2023-02-06 13:53:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dc7e9c8c15
							
						
					 | 
					
						
						
							
							Merge branch 'Interactable-Environment' into dev
						
						
						
						
						
						
					 | 
					
						2023-02-06 13:52:20 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7f3e3cbb52
							
						
					 | 
					
						
						
							
							Updated DialogueNPC to Add Dialogue via Blueprints
						
						
						
						
						
						
					 | 
					
						2023-02-06 03:28:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e5b624411d
							
						
					 | 
					
						
						
							
							Updated TextPrompt for Choices
						
						
						
						
						
						
					 | 
					
						2023-02-06 03:27:49 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							5364f92edb
							
						
					 | 
					
						
						
							
							Updated WBP_ItemDisplay
						
						
						
						
						
						
						
						Item_Stack now changes to however many stacks the player has bought of the item 
						
						
					 | 
					
						2023-02-04 17:49:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							f4e0511f5c
							
						
					 | 
					
						
						
							
							Updated TempCharacter blueprint
						
						
						
						
						
						
						
						Added a check to make sure the player is not in the shop when opening inventory 
						
						
					 | 
					
						2023-02-04 17:41:09 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acefce8bbc
							
						
					 | 
					
						
						
							
							Added InteractNPC to Line Trace for Interact
						
						
						
						
						
						
					 | 
					
						2023-02-02 03:15:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e451d4539
							
						
					 | 
					
						
						
							
							Bugfix Set Mouse Input to Only Poll Yaw Movement
						
						
						
						
						
						
					 | 
					
						2023-02-02 02:19:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3433254463
							
						
					 | 
					
						
						
							
							Added DialogueNPC Actor Component with Text Animation
						
						
						
						
						
						
					 | 
					
						2023-02-02 01:59:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5988272890
							
						
					 | 
					
						
						
							
							Added Base Text Prompt Widget Blueprint
						
						
						
						
						
						
					 | 
					
						2023-02-01 23:47:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							42ce95b84e
							
						
					 | 
					
						
						
							
							Added Dialogue Testing Map with Temp NPC
						
						
						
						
						
						
					 | 
					
						2023-02-01 23:47:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d36fe6fed0
							
						
					 | 
					
						
						
							
							Added Breakable Walls BP
						
						
						
						
						
						
						
						Using Particles at the moment 
						
						
					 | 
					
						2023-02-01 23:37:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e2f91a11b5
							
						
					 | 
					
						
						
							
							Bugfix Platform Too High to Get Across
						
						
						
						
						
						
					 | 
					
						2023-01-31 03:29:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7a715c2e55
							
						
					 | 
					
						
						
							
							Bugfix Hard Reference for GunEffect not Saving
						
						
						
						
						
						
					 | 
					
						2023-01-31 03:13:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8cf4d1d52e
							
						
					 | 
					
						
						
							
							Built Lighting for Build
						
						
						
						
						
						
					 | 
					
						2023-01-31 02:45:23 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							326e64e7ed
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/Level-Design' into dev
						
						
						
						
						
						
					 | 
					
						2023-01-31 02:19:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							64f5d652ff
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/Enviroment-Art' into dev
						
						
						
						
						
						
					 | 
					
						2023-01-31 02:19:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							75f373e0c4
							
						
					 | 
					
						
						
							
							Updated Beta Level Map for Temp Jelly Assets
						
						
						
						
						
						
					 | 
					
						2023-01-31 02:15:07 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a15054656e
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into Shaders
						
						
						
						
						
						
						
						# Conflicts:
#	Content/Levels/Top_layer_level.umap 
						
						
					 | 
					
						2023-01-31 02:04:48 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							afb0429003
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/Beta-Level' into dev
						
						
						
						
						
						
					 | 
					
						2023-01-31 01:53:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ed0bcc7c76
							
						
					 | 
					
						
						
							
							Updated CombatCharacter to Spawn GunEffect onClick
						
						
						
						
						
						
					 | 
					
						2023-01-31 01:48:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							45374da8bb
							
						
					 | 
					
						
						
							
							Updated Combat System to Disengage from Combat
						
						
						
						
						
						
					 | 
					
						2023-01-31 01:39:42 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d9584f3b55
							
						
					 | 
					
						
						
							
							Removed Escape To Main Menu
						
						
						
						
						
						
					 | 
					
						2023-01-31 01:23:28 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ad91d6eac7
							
						
					 | 
					
						
						
							
							Updated GunEffect Changed Texture from White
						
						
						
						
						
						
					 | 
					
						2023-01-31 01:02:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d18c547632
							
						
					 | 
					
						
						
							
							Bugfix Cursor Not Hiding After Combat
						
						
						
						
						
						
					 | 
					
						2023-01-31 00:56:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7e81387247
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/merchant-system-v4' into Turn-Based-Combat
						
						
						
						
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset 
						
						
					 | 
					
						2023-01-31 00:50:59 +00:00 | 
					
					
						
						
							
							
							
						
					 |