| 
						
					 | 
					
						
						
						
						
							
						
						
							3b1f33006a
							
						
					 | 
					
						
						
							
							Added Combat Test Level for New Combat Features
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-23 01:29:01 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							985e713659
							
						
					 | 
					
						
						
							
							Bugfix No Post Processing Volume Crashes Engine
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-23 01:28:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c880eb27ac
							
						
					 | 
					
						
						
							
							Updated StatusSystem Struct for Bool Comparisons
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-23 01:05:27 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							31a6a5d98e
							
						
					 | 
					
						
						
							
							Added StatusEffect Stub for Multiple Status Effects
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-20 17:58:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5dae3b2691
							
						
					 | 
					
						
						
							
							Merge pull request #9 from Games-Academy-Student-Work-22-23/Fix-UI-Scaling
						
						
						
						
						
						
						
						Fix UI scaling 
						
						
							
						
					 | 
					
						2023-02-20 16:04:44 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc8eee9727
							
						
					 | 
					
						
						
							
							Merge pull request #8 from Games-Academy-Student-Work-22-23/resource-mining
						
						
						
						
						
						
						
						Resource mining 
						
						
							
						
					 | 
					
						2023-02-20 15:11:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9af8b713f
							
						
					 | 
					
						
						
							
							Updated EatableItems to fix Ammo Consuming
						
						
						
						
						
						
						
						Fixed ammo consuming crashing the client 
						
						
							
						
					 | 
					
						2023-02-20 14:49:05 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							3c2d057951
							
						
					 | 
					
						
						
							
							Updated TempCharacter to destory ammo ore
						
						
						
						
						
						
						
						destroys ammo ore when the player presses e on it 
						
						
							
						
					 | 
					
						2023-02-19 15:28:34 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							73262b425e
							
						
					 | 
					
						
						
							
							Merge pull request #7 from Games-Academy-Student-Work-22-23/additional-movement
						
						
						
						
						
						
						
						Additional movement 
						
						
							
						
					 | 
					
						2023-02-06 15:57:36 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							19a53529e9
							
						
					 | 
					
						
						
							
							Added Sneak keybind
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-06 14:29:26 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ce78e1d53b
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/Turn-Based-Combat' into dev
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-06 13:52:46 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6310050647
							
						
					 | 
					
						
						
							
							Updated DialogueNPC for Text Animation Speed Property
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-06 01:13:17 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							14c7d6b6d7
							
						
					 | 
					
						
						
							
							Updated TempCharacter.cpp
						
						
						
						
						
						
						
						Cached the camera reference isntead of constantly casting for it 
						
						
							
						
					 | 
					
						2023-02-04 18:34:53 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							81d926ffb3
							
						
					 | 
					
						
						
							
							Updated EatableItems.cpp
						
						
						
						
						
						
						
						Made it so when the players health is above 100 they cant heal anymore. (Removed healing stacking) 
						
						
							
						
					 | 
					
						2023-02-04 17:56:25 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							182f54a3c8
							
						
					 | 
					
						
						
							
							Updated TempCharacter.cpp
						
						
						
						
						
						
						
						Added boolean to make inventory not open when in shop 
						
						
							
						
					 | 
					
						2023-02-04 17:39:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							acefce8bbc
							
						
					 | 
					
						
						
							
							Added InteractNPC to Line Trace for Interact
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-02 03:15:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5c5b915225
							
						
					 | 
					
						
						
							
							Updated DialogueNPC to Disable Character Movement
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-02 02:39:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							a12b632caf
							
						
					 | 
					
						
						
							
							Merge pull request #6 from Games-Academy-Student-Work-22-23/Bugfix-Player-Movement-Camera-Movement-Lock
						
						
						
						
						
						
						
						Bugfix Set Mouse Input to Only Poll Yaw Movement 
						
						
							
						
					 | 
					
						2023-02-02 02:22:49 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9e451d4539
							
						
					 | 
					
						
						
							
							Bugfix Set Mouse Input to Only Poll Yaw Movement
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-02 02:19:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							014a670ec5
							
						
					 | 
					
						
						
							
							Bugfix Widget Focus Not Correctly Being Set
						
						
						
						
						
						
							
						
					 | 
					
						2023-02-02 02:06:55 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							0a7025b684
							
						
					 | 
					
						
						
							
							Added new links to Dev
						
						
						
						
						
						
						
						Added Google Slides for art and levels 
						
						
							
						
					 | 
					
						2023-01-31 12:32:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e2f91a11b5
							
						
					 | 
					
						
						
							
							Bugfix Platform Too High to Get Across
						
						
						
						
						
						
							
 v0.3.103-alpha
						
					 | 
					
						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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7c3a9e8725
							
						
					 | 
					
						
						
							
							Updated Combat System to Clear Battle Log on Combat Start
						
						
						
						
						
						
							
						
					 | 
					
						2023-01-31 02:19:11 +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 | 
					
					
						
						
							
							
							
						
					 |