MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							58243e8ccc
							
						
					 | 
					
						
						
							
							Updated BP_ShopSelector, BP_MerchantInteraction
						
						
						
						
						
						
						
						Added interactivity for the buttons to activate functions in the interaction.cpp 
						
						
					 | 
					
						2023-01-16 17:01:04 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							bea8e8c396
							
						
					 | 
					
						
						
							
							Added new tunnels
						
						
						
						
						
						
						
						Added a new tunnel asset 
						
						
					 | 
					
						2023-01-16 16:16:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							5333846266
							
						
					 | 
					
						
						
							
							Added Abyss asset
						
						
						
						
						
						
						
						Added the abyss asset to be used in level creation 
						
						
					 | 
					
						2023-01-16 13:52:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							e7fa8f4c63
							
						
					 | 
					
						
						
							
							Updated BP_ShopSelector
						
						
						
						
						
						
						
						Added a close button which re-enables all the input again by calling a function in TempChar 
						
						
					 | 
					
						2023-01-15 16:14:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							a582a05a59
							
						
					 | 
					
						
						
							
							Changed BP_Interaction name to BP_MerchantInteract
						
						
						
						
						
						
						
						Changed BP_Interaction name to BP_MerchantInteraction 
						
						
					 | 
					
						2023-01-14 20:34:38 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							c107c9a490
							
						
					 | 
					
						
						
							
							Updated Merchant
						
						
						
						
						
						
						
						Fixed crash error and merchant dialouge box pops up now, Started working on item stacking 
						
						
					 | 
					
						2023-01-12 13:05:43 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MARCEL HARA
							
						 
					 | 
					
						
						
						
						
							
						
						
							c7d1394e98
							
						
					 | 
					
						
						
							
							Updated Action Mapping from Right to Left Click
						
						
						
						
						
						
					 | 
					
						2022-11-29 17:38:39 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							be0766cf0c
							
						
					 | 
					
						
						
							
							Added EscapeToMenu Component for Escaping to Menu
						
						
						
						
						
						
					 | 
					
						2022-11-29 00:42:03 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1300c99a3f
							
						
					 | 
					
						
						
							
							Added HoldToInitCombat Actor Component for Manual Combat Init
						
						
						
						
						
						
					 | 
					
						2022-11-29 00:23:15 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							5dce4dc603
							
						
					 | 
					
						
						
							
							Updated InventoryComponent
						
						
						
						
						
						
						
						Added comment 
						
						
					 | 
					
						2022-11-24 00:13:20 +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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1751ffd163
							
						
					 | 
					
						
						
							
							Added Main Menu for Test Levels
						
						
						
						
						
						
					 | 
					
						2022-11-21 12:50:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							ba2b6b599c
							
						
					 | 
					
						
						
							
							Merge branch 'dev' into merchant-system
						
						
						
						
						
						
					 | 
					
						2022-11-18 19:20:20 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							c835567fac
							
						
					 | 
					
						
						
							
							Updated Item Assets
						
						
						
						
						
						
						
						Added the gold value for each of the item assets 
						
						
					 | 
					
						2022-11-18 14:54:30 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							220b21f2ca
							
						
					 | 
					
						
						
							
							Added BuffItem Placeholder
						
						
						
						
						
						
						
						Added the buffitem placeholder to the world. Currently the buffitem just does the same as the healing item. 
						
						
					 | 
					
						2022-11-18 13:53:47 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							900feee5a9
							
						
					 | 
					
						
						
							
							Updated InventoryComponent and Shop
						
						
						
						
						
						
						
						Fixed InventoryComponent to now work with singular items so you can purchase items from the shop! 
						
						
					 | 
					
						2022-11-18 13:07:44 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9780242271
							
						
					 | 
					
						
						
							
							Added RealTimeCombat Map, Character & GameModeBase
						
						
						
						
						
						
					 | 
					
						2022-11-17 04:51:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0b18bcc5c9
							
						
					 | 
					
						
						
							
							Updated CombatCharacter and AI for Tagging
						
						
						
						
						
						
					 | 
					
						2022-11-17 03:42:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e6fa31ef04
							
						
					 | 
					
						
						
							
							Added TurnBaseSystemV2 Test Level
						
						
						
						
						
						
					 | 
					
						2022-11-17 03:03:54 +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 | 
					
					
						
						
							
							
							
						
					 |