| 
						
					 | 
					
						
						
						
						
							
						
						
							c7f7619e09
							
						
					 | 
					
						
						
							
							Bugfix Unknown Characters in Merchant Sisters Dialogue
						
						
						
						
						
						
					 | 
					
						2023-05-04 06:59:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2ab212324b
							
						
					 | 
					
						
						
							
							Bugfix Choosing Another Option Other Than a Add Quest Breaks Dialogue
						
						
						
						
						
						
					 | 
					
						2023-05-04 06:59:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							daaa624dd9
							
						
					 | 
					
						
						
							
							Exposed Quest Flags to Dialogue System
						
						
						
						
						
						
					 | 
					
						2023-05-04 06:31:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fc9597ed33
							
						
					 | 
					
						
						
							
							Added Starter Quests
						
						
						
						
						
						
					 | 
					
						2023-05-04 05:12:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							23c9c5b07a
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into Quest
						
						
						
						
						
						
					 | 
					
						2023-05-04 05:05:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f24fcc2d25
							
						
					 | 
					
						
						
							
							Updated Quest System for UI
						
						
						
						
						
						
					 | 
					
						2023-05-04 05:04:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9bb98b314b
							
						
					 | 
					
						
						
							
							Updated Dialogue for Optimisations and Abstraction
						
						
						
						
						
						
					 | 
					
						2023-05-04 01:42:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							22c004c9e0
							
						
					 | 
					
						
						
							
							Merge branch 'Side-Area' into dev
						
						
						
						
						
						
					 | 
					
						2023-05-02 11:50:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							f5e868cc27
							
						
					 | 
					
						
						
							
							Minor changes
						
						
						
						
						
						
						
						Enemy health and a new cube 
						
						
					 | 
					
						2023-05-02 11:49:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb1fcf7258
							
						
					 | 
					
						
						
							
							Added additional skeleton
						
						
						
						
						
						
						
						Added a skeleton pointing towards side area 
						
						
					 | 
					
						2023-05-02 11:47:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d237e6c8de
							
						
					 | 
					
						
						
							
							Replaced Ripped Paper Image to Remove Padding
						
						
						
						
						
						
					 | 
					
						2023-05-02 11:23:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							d09c108b57
							
						
					 | 
					
						
						
							
							Changed side area and final area
						
						
						
						
						
						
						
						Removed grey tunnel and blocked off unused area (didn't delete in case we need it later) 
						
						
					 | 
					
						2023-05-02 11:21:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0d0852fbe
							
						
					 | 
					
						
						
							
							Removed grey block
						
						
						
						
						
						
						
						Minor level clean up 
						
						
					 | 
					
						2023-05-02 11:13:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							69f53aa61c
							
						
					 | 
					
						
						
							
							Added wooden bridge
						
						
						
						
						
						
						
						Replaced white bridge with rope bridge 
						
						
					 | 
					
						2023-05-02 11:13:05 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							c6669aebdb
							
						
					 | 
					
						
						
							
							Updated 2nd group of grey blocks
						
						
						
						
						
						
						
						Added Blue_rocks texture and repositioned them so that the player can jump up and get to the top of the level 
						
						
					 | 
					
						2023-05-02 10:48:09 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							df11877377
							
						
					 | 
					
						
						
							
							Added textures to grey blocks
						
						
						
						
						
						
						
						Texture grey blocks with Blue_rocks material. Don't know if this will be permanent but figured it'd be good to do in case they never get addressed. 
						
						
					 | 
					
						2023-05-02 10:43:12 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							372acb7302
							
						
					 | 
					
						
						
							
							Changed enemy health
						
						
						
						
						
						
						
						Lowered enemy health pool to increase pace of combat 
						
						
					 | 
					
						2023-05-02 10:25:01 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							6217026ee1
							
						
					 | 
					
						
						
							
							Moved sign onto wall
						
						
						
						
						
						
						
						Moved shop sign onto wall as opposed to having it float midair 
						
						
					 | 
					
						2023-05-02 10:14:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d1f959a9dc
							
						
					 | 
					
						
						
							
							Updated Quest & Dialogue to Add Quests from Dialogue
						
						
						
						
						
						
					 | 
					
						2023-05-02 07:16:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e3027fcd24
							
						
					 | 
					
						
						
							
							Updated Quest System for Functionality
						
						
						
						
						
						
					 | 
					
						2023-05-02 05:42:48 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bff44b56a7
							
						
					 | 
					
						
						
							
							Bugfix Able to Click Dialogue on Choice Select
						
						
						
						
						
						
					 | 
					
						2023-05-01 05:23:43 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							25e9a4f4fc
							
						
					 | 
					
						
						
							
							Updated Dialogue UI for Style Consistency
						
						
						
						
						
						
					 | 
					
						2023-05-01 05:22:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							f7ab9a2cfb
							
						
					 | 
					
						
						
							
							Reorganised Build Level for Easy Searchability
						
						
						
						
						
						
					 | 
					
						2023-04-30 21:25:10 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							393eea2250
							
						
					 | 
					
						
						
							
							Updated Map to Remove Rope on Model as Impossible to Align
						
						
						
						
						
						
						
						Rope is curved 
						
						
					 | 
					
						2023-04-30 20:11:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcelHara
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a35dc1ea1
							
						
					 | 
					
						
						
							
							Fixed Merge issues to dev
						
						
						
						
						
						
					 | 
					
						2023-04-30 13:14:32 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcelHara
							
						 
					 | 
					
						
						
						
						
							
						
						
							bef17b7f04
							
						
					 | 
					
						
						
							
							Merge branch 'volumetric-fog' into dev
						
						
						
						
						
						
						
						# Conflicts:
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Levels/Build.umap 
						
						
					 | 
					
						2023-04-30 13:06:51 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MarcelHara
							
						 
					 | 
					
						
						
						
						
							
						
						
							06b9586fd3
							
						
					 | 
					
						
						
							
							Duplicated Build for merge
						
						
						
						
						
						
					 | 
					
						2023-04-30 13:04:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dcab1c483f
							
						
					 | 
					
						
						
							
							Updated Quest Text for Consistentcy
						
						
						
						
						
						
					 | 
					
						2023-04-28 05:44:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99f88bb31c
							
						
					 | 
					
						
						
							
							Bugfix Combat Initialisation Calculation Failure on Tutorial
						
						
						
						
						
						
					 | 
					
						2023-04-28 05:33:08 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							69dd199ad3
							
						
					 | 
					
						
						
							
							Updated Character to Expose Reaction Speed
						
						
						
						
						
						
					 | 
					
						2023-04-28 05:31:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							cf433291a9
							
						
					 | 
					
						
						
							
							Bugfix Larger Health Values Break Health UI
						
						
						
						
						
						
					 | 
					
						2023-04-28 04:47:34 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							38ffd4f339
							
						
					 | 
					
						
						
							
							Bugfix Force Look Pitch Not Correctly Set
						
						
						
						
						
						
					 | 
					
						2023-04-28 03:59:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9ecbd9c52d
							
						
					 | 
					
						
						
							
							Updated GoatAI to Trigger Attack Animations
						
						
						
						
						
						
					 | 
					
						2023-04-28 03:40:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							744b24c8c1
							
						
					 | 
					
						
						
							
							Bugfix Cell Shading
						
						
						
						
						
						
						
						Disabled on some objects 
						
						
					 | 
					
						2023-04-28 02:40:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							825e2a7631
							
						
					 | 
					
						
						
							
							Added Movement Animation to Goats
						
						
						
						
						
						
					 | 
					
						2023-04-28 02:40:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9199db00df
							
						
					 | 
					
						
						
							
							Bugfix Merchant Unable to Interact
						
						
						
						
						
						
					 | 
					
						2023-04-28 01:40:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							bc171eba80
							
						
					 | 
					
						
						
							
							Added Idle Merchant Animations
						
						
						
						
						
						
					 | 
					
						2023-04-28 01:23:18 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							003edc4e0a
							
						
					 | 
					
						
						
							
							Reimported Goat Walking Animation & Imported Merchant Animation
						
						
						
						
						
						
					 | 
					
						2023-04-28 00:37:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7d87e3d94f
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into Combat
						
						
						
						
						
						
					 | 
					
						2023-04-27 23:59:39 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3a672fb52e
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into houes-modles
						
						
						
						
						
						
					 | 
					
						2023-04-27 23:52:54 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Phoebe Harris-Wilson
							
						 
					 | 
					
						
						
						
						
							
						
						
							e666ed28fb
							
						
					 | 
					
						
						
							
							Rope and talisman and textures
						
						
						
						
						
						
					 | 
					
						2023-04-27 18:00:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Blue Probert
							
						 
					 | 
					
						
						
						
						
							
						
						
							0f0618ed0a
							
						
					 | 
					
						
						
							
							Bugfix Heal Over Time Exposed Heal Amount
						
						
						
						
						
						
					 | 
					
						2023-04-27 17:59:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							c61d8ed9e3
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into Collisions
						
						
						
						
						
						
						
						# Conflicts:
#	Content/Assets/Objects/Updated_level_map/Level_1_Blockout_improvement_textured_Cube_004.uasset
#	Content/Levels/Build.umap 
						
						
					 | 
					
						2023-04-27 17:51:21 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Blue Probert
							
						 
					 | 
					
						
						
						
						
							
						
						
							fc8c6bae19
							
						
					 | 
					
						
						
							
							Bugfix Crash On Damage Over Time Kill
						
						
						
						
						
						
					 | 
					
						2023-04-27 17:50:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Blue Probert
							
						 
					 | 
					
						
						
						
						
							
						
						
							82ce8b2074
							
						
					 | 
					
						
						
							
							Bugfix Crash on No Post Processing Component
						
						
						
						
						
						
					 | 
					
						2023-04-27 17:40:40 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							6865b506b8
							
						
					 | 
					
						
						
							
							Added quest giver
						
						
						
						
						
						
						
						Quest giver is now placed to the side of the cave entrance 
						
						
					 | 
					
						2023-04-27 17:35:46 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							b4a8af9d43
							
						
					 | 
					
						
						
							
							Added platform for quest giver
						
						
						
						
						
						
						
						Copied temporary platform at rope bridge and placed one next to it for the guest giver 
						
						
					 | 
					
						2023-04-27 17:28:49 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Rowland Rowland
							
						 
					 | 
					
						
						
						
						
							
						
						
							4579c73929
							
						
					 | 
					
						
						
							
							Fixed collision issues
						
						
						
						
						
						
						
						Had an issue on Monday, seems to be fixed and pushed now 
						
						
					 | 
					
						2023-04-27 17:20:07 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							b0615eafdd
							
						
					 | 
					
						
						
							
							Added Volumetric fog and fine tuned
						
						
						
						
						
						
					 | 
					
						2023-04-27 17:19:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							38caa46e58
							
						
					 | 
					
						
						
							
							Updated Interaction.cpp to fix certain crashes
						
						
						
						
						
						
					 | 
					
						2023-04-27 17:19:01 +01:00 | 
					
					
						
						
							
							
							
						
					 |