KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							d78abda469
							
						
					 | 
					
						
						
							
							Added Sheep model
						
						
						
						
						
						
						
						I added the sheep model and saved it in the correct folder, adding it in the enemy character folder 
						
						
							
						
					 | 
					
						2023-01-10 16:02:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							320a74d4bb
							
						
					 | 
					
						
						
							
							Added Stub for OnInteract Event
						
						
						
						
						
						
							
						
					 | 
					
						2023-01-06 13:55:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6096d5a783
							
						
					 | 
					
						
						
							
							Added Interactable Environment Actor Component Class
						
						
						
						
						
						
							
						
					 | 
					
						2023-01-06 13:43:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							1061fb0f84
							
						
					 | 
					
						
						
							
							Added place holder enemy
						
						
						
						
						
						
						
						I created some new folders to organize assets, whilst also adding the enemy placeholder character 
						
						
							
						
					 | 
					
						2023-01-03 14:38:26 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							5d9b0b80e5
							
						
					 | 
					
						
						
							
							Implamented Soft wind
						
						
						
						
						
						
						
						I have implamented the soft wind sound cue to play when a player reaches a certain area 
						
						
							
						
					 | 
					
						2022-12-01 18:02:09 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							28bdc5b3f9
							
						
					 | 
					
						
						
							
							Added soft wind sound effect and cue
						
						
						
						
						
						
						
						Added a soft wind sound effect and cue into the files 
						
						
							
						
					 | 
					
						2022-12-01 17:52:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							15ad639b84
							
						
					 | 
					
						
						
							
							Added Wind and Rope sound into the level
						
						
						
						
						
						
						
						I've added the Wind and Rope sound into the prototype level and made it play based on player characters distance from the noise object. 
						
						
							
						
					 | 
					
						2022-12-01 17:38:16 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad1aa0c50b
							
						
					 | 
					
						
						
							
							Added Wind and rope sound effect
						
						
						
						
						
						
						
						I have added the wind and rope sound effect into the game files and created a sound cue for them. 
						
						
							
						
					 | 
					
						2022-12-01 17:26:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							e2cfb63ff9
							
						
					 | 
					
						
						
							
							Added background ambience
						
						
						
						
						
						
						
						I've added the background ambience into the game and made it loop. 
						
						
							
						
					 | 
					
						2022-12-01 17:23:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							ee339fc71b
							
						
					 | 
					
						
						
							
							Added cave ambience asset
						
						
						
						
						
						
						
						I have added a file that I can loop to create a sense of dread and horror. It is loopable. 
						
						
							
						
					 | 
					
						2022-12-01 17:15:02 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7d1394e98
							
						
					 | 
					
						
						
							
							Updated Action Mapping from Right to Left Click
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-29 17:38:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							87e0bb06de
							
						
					 | 
					
						
						
							
							Bugfix TimeToInit Combat to 0.1f
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-29 17:38:02 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							2512a4950e
							
						
					 | 
					
						
						
							
							Updated TempCharacter.cpp
						
						
						
						
						
						
						
						cleared unused header file 
						
						
							
 v0.2.0-alpha.2
						
					 | 
					
						2022-11-29 16:40:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e93e686dd
							
						
					 | 
					
						
						
							
							Updated Main Menu for Merchant
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-29 16:13:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							af1813fd9a
							
						
					 | 
					
						
						
							
							Merge branch 'merchant-system' into Turn-Base-System-V2
						
						
						
						
						
						
						
						# Conflicts:
#	Config/DefaultEngine.ini
#	Content/Blueprints/Combat_UI/CombatCharacter.uasset
#	Content/Merchant/BP_MerchantGameMode.uasset 
						
						
							
						
					 | 
					
						2022-11-29 15:53:39 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							7199ee76a3
							
						
					 | 
					
						
						
							
							Updated Items
						
						
						
						
						
						
						
						Started to create item stacks and fix item not dissapearing bug 
						
						
							
						
					 | 
					
						2022-11-29 15:44:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							cc9384a9c1
							
						
					 | 
					
						
						
							
							Updated BP_BuffJelly
						
						
						
						
						
						
						
						Gave BuffJelly a unique ID of 1 
						
						
							
						
					 | 
					
						2022-11-29 14:19:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							ff733f2ab0
							
						
					 | 
					
						
						
							
							Revert "Updated BaseItem.h"
						
						
						
						
						
						
						
						This reverts commit d365fa6327f7ab6353cefc31cf7ed58f9b504924. 
						
						
							
						
					 | 
					
						2022-11-29 14:18:05 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							d365fa6327
							
						
					 | 
					
						
						
							
							Updated BaseItem.h
						
						
						
						
						
						
						
						Changed it so no one can edit the original value ID of an item 
						
						
							
						
					 | 
					
						2022-11-29 14:16:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							f52ea5efb8
							
						
					 | 
					
						
						
							
							Overhauled Items
						
						
						
						
						
						
						
						Gave every single item a unique ID so no matter the item the ID will always be different 
						
						
							
						
					 | 
					
						2022-11-29 14:15:20 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							3360ea2031
							
						
					 | 
					
						
						
							
							Updated TempCharacter,TempCharacter.cpp
						
						
						
						
						
						
						
						Gave a max inventory slots of 5 for testing purposes and Refactored code in TempCharacter.cpp 
						
						
							
						
					 | 
					
						2022-11-29 12:55:46 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a590c3e33
							
						
					 | 
					
						
						
							
							Updated InventoryComponent,TempCharacter
						
						
						
						
						
						
						
						Commented InventoryComponent to understand logic easier and removed unused functions from TempCharacter 
						
						
							
						
					 | 
					
						2022-11-29 12:43:58 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							07e7f8c70f
							
						
					 | 
					
						
						
							
							Added NiagaraSystem for Gun Particle Effect
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-29 01:54:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be0766cf0c
							
						
					 | 
					
						
						
							
							Added EscapeToMenu Component for Escaping to Menu
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-29 00:42:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fdfe4a660c
							
						
					 | 
					
						
						
							
							Bugfix Movement Not being Reenabled on Combat End
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-29 00:34:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1300c99a3f
							
						
					 | 
					
						
						
							
							Added HoldToInitCombat Actor Component for Manual Combat Init
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-29 00:23:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							120da84a3e
							
						
					 | 
					
						
						
							
							Updated Interaction
						
						
						
						
						
						
						
						Hard coded the 6 second wait timer after testing in engine 
						
						
							
						
					 | 
					
						2022-11-28 23:21:36 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							26da472db8
							
						
					 | 
					
						
						
							
							Updated MerchantPrototype
						
						
						
						
						
						
						
						Added an 8 second wait timer to the dialouge in engine 
						
						
							
						
					 | 
					
						2022-11-28 23:20:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							8c69f58a97
							
						
					 | 
					
						
						
							
							Updated BP_OPENDIAL, Interaction.cpp
						
						
						
						
						
						
						
						Changed the text in the widget and gave it a little animation. Made the Wait timer in interaction changeable in the editor. 
						
						
							
						
					 | 
					
						2022-11-28 23:15:41 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							b5772a024c
							
						
					 | 
					
						
						
							
							Updated Interaction.cpp
						
						
						
						
						
						
						
						Added a wait timer to close the widget once open automatically 
						
						
							
						
					 | 
					
						2022-11-28 22:52:51 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							99f1f0c5af
							
						
					 | 
					
						
						
							
							Added C2Plane in Prototype Level
						
						
						
						
						
						
						
						Restarts level when player falls of the map 
						
						
							
						
					 | 
					
						2022-11-28 22:30:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							06492d69d5
							
						
					 | 
					
						
						
							
							Updated TurnBaseCombat for Keyboard Hotkeys
						
						
						
						
						
						
						
						Crit Feedback 
						
						
							
						
					 | 
					
						2022-11-24 02:49:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							5dce4dc603
							
						
					 | 
					
						
						
							
							Updated InventoryComponent
						
						
						
						
						
						
						
						Added comment 
						
						
							
						
					 | 
					
						2022-11-24 00:13:20 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							57b532c256
							
						
					 | 
					
						
						
							
							Updated WBP_PlayerInventory
						
						
						
						
						
						
						
						Cleaned up the inventory UI and removed unused Blueprint code 
						
						
							
						
					 | 
					
						2022-11-23 19:20:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							9357806178
							
						
					 | 
					
						
						
							
							Updated WBP_ItemDisplay
						
						
						
						
						
						
						
						Made the item display larger and cleaner, Also added a background to the item 
						
						
							
						
					 | 
					
						2022-11-23 18:16:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							26bbe083df
							
						
					 | 
					
						
						
							
							Updated WBP_ItemDisplay, WBP_PlayerInventory
						
						
						
						
						
						
						
						Changed and resized both the UIS to fit items better and make the whole inventory look a lot cleaner 
						
						
							
						
					 | 
					
						2022-11-23 18:13:13 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							09adfcad27
							
						
					 | 
					
						
						
							
							Updated WBP_PlayerInventory
						
						
						
						
						
						
						
						Started to work on Inventory UI and re-sized it to be 1920x1080 
						
						
							
						
					 | 
					
						2022-11-23 17:45:32 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							b7dd592d2c
							
						
					 | 
					
						
						
							
							Created Player folder
						
						
						
						
						
						
						
						Organized the blueprints into more folders and cleaned up unreal project 
						
						
							
						
					 | 
					
						2022-11-23 17:30:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							45369c4dc7
							
						
					 | 
					
						
						
							
							Created Inventory_UI Folder
						
						
						
						
						
						
						
						Moved all inventory UI to the folder and removed Shop UI as not used anymore 
						
						
							
						
					 | 
					
						2022-11-23 17:29:14 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							77b32edde4
							
						
					 | 
					
						
						
							
							Organized Content Browser
						
						
						
						
						
						
						
						Organized the content browser to make it easier to know where everything is 
						
						
							
						
					 | 
					
						2022-11-23 17:26:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							36bb1a2265
							
						
					 | 
					
						
						
							
							Updated PlayerInventory
						
						
						
						
						
						
						
						Made the inventory look slightly nicer, going to work on a nicer alpha version of the UI after this commit 
						
						
							
						
					 | 
					
						2022-11-23 01:56:22 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							7430029db2
							
						
					 | 
					
						
						
							
							BugFix WBP_PlayerInventory
						
						
						
						
						
						
						
						Fixed cursor still showing up when closing and re-opening the inventory. 
						
						
							
						
					 | 
					
						2022-11-23 01:45:24 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							7dc6f677d4
							
						
					 | 
					
						
						
							
							Updated WBP_PlayerInventory
						
						
						
						
						
						
						
						Added an override on keypressed so the user can press tab again to close the inventory. Also fixed the widget not being a focusable 
						
						
							
						
					 | 
					
						2022-11-23 01:38:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							7140faf22b
							
						
					 | 
					
						
						
							
							Updated EatableItems
						
						
						
						
						
						
						
						Seperated Items into functional sub-variables that do other stuff instead of just healing the player no matte the item you make 
						
						
							
						
					 | 
					
						2022-11-23 00:56:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							783e13075c
							
						
					 | 
					
						
						
							
							Updated TempCharacter
						
						
						
						
						
						
						
						Made the linetrace boolean a global in the headerfile for potential future enemy detection 
						
						
							
						
					 | 
					
						2022-11-23 00:55:55 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							168a43d751
							
						
					 | 
					
						
						
							
							Updated BaseItem and ItemBPS
						
						
						
						
						
						
						
						Gave both items booleans to make the code differentiate what the item does to the player. 
						
						
							
						
					 | 
					
						2022-11-23 00:51:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c6cba80a07
							
						
					 | 
					
						
						
							
							Bugfix Debug Lines Marked Green on Missed Traces
						
						
						
						
						
						
							
 v0.2.0-alpha.17
						
					 | 
					
						2022-11-21 22:35:04 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							22c13a8c25
							
						
					 | 
					
						
						
							
							Bugfix Movement Enabled During Combat in TBCv2
						
						
						
						
						
						
							
						
					 | 
					
						2022-11-21 22:34:33 +00:00 | 
					
					
						
						
							
							
							
						
					 |