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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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
							
						 
					 | 
					
						
						
						
						
							
						
						
							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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							22c13a8c25
							
						
					 | 
					
						
						
							
							Bugfix Movement Enabled During Combat in TBCv2
						
						
						
						
						
						
					 | 
					
						2022-11-21 22:34:33 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6a041e4621
							
						
					 | 
					
						
						
							
							Updated RTCombat for Shooting Accuracy via LineTrace
						
						
						
						
						
						
					 | 
					
						2022-11-21 20:59:29 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1751ffd163
							
						
					 | 
					
						
						
							
							Added Main Menu for Test Levels
						
						
						
						
						
						
					 | 
					
						2022-11-21 12:50:59 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7184e19dce
							
						
					 | 
					
						
						
							
							Bugfix GunProtoype Handle Subject to Backface Culling
						
						
						
						
						
						
						
						Flipped Normals on Handle 
						
						
					 | 
					
						2022-11-21 00:15:37 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							49a24325ea
							
						
					 | 
					
						
						
							
							Updated TempCharacter, WBPHealth
						
						
						
						
						
						
						
						Made the health and gold variables for the character blueprintable to start implimenting them into basic UI for visual representation. 
						
						
					 | 
					
						2022-11-19 20:08:00 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							e64b4057ac
							
						
					 | 
					
						
						
							
							Created Health_Gold UI
						
						
						
						
						
						
					 | 
					
						2022-11-18 20:05:33 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							09ec1cb181
							
						
					 | 
					
						
						
							
							Added BP HUD Combat_UI_RT for RealTimeCombat
						
						
						
						
						
						
					 | 
					
						2022-11-17 04:15:50 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0b18bcc5c9
							
						
					 | 
					
						
						
							
							Updated CombatCharacter and AI for Tagging
						
						
						
						
						
						
					 | 
					
						2022-11-17 03:42:35 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							57e8b76e89
							
						
					 | 
					
						
						
							
							Added Chase Blueprint AI
						
						
						
						
						
						
					 | 
					
						2022-11-17 03:39:12 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e6fa31ef04
							
						
					 | 
					
						
						
							
							Added TurnBaseSystemV2 Test Level
						
						
						
						
						
						
					 | 
					
						2022-11-17 03:03:54 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9a2835f54c
							
						
					 | 
					
						
						
							
							Added Rock Megascan Temp Mesh
						
						
						
						
						
						
					 | 
					
						2022-11-17 03:03:32 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dab9182814
							
						
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/Level' into Turn-Base-System
						
						
						
						
						
						
					 | 
					
						2022-11-15 01:35:02 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								KACPER Szelest
							
						 
					 | 
					
						
						
						
						
							
						
						
							181fcd0103
							
						
					 | 
					
						
						
							
							Added Environment assets
						
						
						
						
						
						
						
						I added some assets that could be used for the tutorial level 
						
						
					 | 
					
						2022-11-15 01:18:26 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							9d72f60208
							
						
					 | 
					
						
						
							
							Updated TurnBaseCombat for ResourceBar Functionality
						
						
						
						
						
						
					 | 
					
						2022-11-15 01:12:45 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							189b6d25b8
							
						
					 | 
					
						
						
							
							Updated Combat UI for Resource Bars
						
						
						
						
						
						
					 | 
					
						2022-11-15 00:43:15 +00:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								MH261677
							
						 
					 | 
					
						
						
						
						
							
						
						
							91667f89b2
							
						
					 | 
					
						
						
							
							Updated MerchantGameMode
						
						
						
						
						
						
						
						Added a print string to tell the player to press TAB to open the inventory 
						
						
					 | 
					
						2022-11-15 00:16:26 +00:00 | 
					
					
						
						
							
							
							
						
					 |