| 
						
					 | 
					
						
						
						
						
							
						
						
							1627d08314
							
						
					 | 
					
						
						
							
							Fix this file encoding bullshit hopefully once and for all and get a commit where the state machine asset can be opened without crashing the editor
						
						
						
						
						
					 | 
					
						2022-04-02 23:13:12 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							965322a4ae
							
						
					 | 
					
						
						
							
							Remove old character classes and any related objects/assets
						
						
						
						
						
					 | 
					
						2022-04-02 17:44:34 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b71b54537c
							
						
					 | 
					
						
						
							
							Implement asset editor interface so SNGStateMachine object can be created and edited
						
						
						
						
						
					 | 
					
						2022-04-02 16:44:49 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0eaaa562be
							
						
					 | 
					
						
						
							
							Setup SwordNGun editor module
						
						
						
						
						
					 | 
					
						2022-03-30 22:32:14 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1501e35ad7
							
						
					 | 
					
						
						
							
							Start creating custom state machine asset type
						
						
						
						
						
					 | 
					
						2022-03-30 21:49:09 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ec0735ceca
							
						
					 | 
					
						
						
							
							Merge branch 'feature/Better_Movement' into develop
						
						
						
						
						
						
						
						# Conflicts:
#	SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp
#	SwordNGun/Source/SwordNGun/Private/Components/SNGCharacterMovementComponent.cpp
#	SwordNGun/Source/SwordNGun/Private/Controllers/SNGPlayerController.cpp
#	SwordNGun/Source/SwordNGun/Private/Weapons/SNGMeleeWeaponBase.cpp
#	SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h
#	SwordNGun/Source/SwordNGun/Public/Characters/SNGEnemyBase.h
#	SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h
#	SwordNGun/Source/SwordNGun/Public/Components/SNGCharacterMovementComponent.h
#	SwordNGun/Source/SwordNGun/Public/Controllers/SNGPlayerController.h
#	SwordNGun/Source/SwordNGun/SNGTypes.h 
						
					 | 
					
						2022-03-29 20:20:44 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							6c9b327fae
							
						
					 | 
					
						
						
							
							Merge Better_Movement into develop
						
						
						
						
						
					 | 
					
						2022-03-29 20:18:08 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3e17e36844
							
						
					 | 
					
						
						
							
							Fix broken hair asset reference on NewProtag
						
						
						
						
						
					 | 
					
						2022-03-29 20:11:44 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							88cbe5910c
							
						
					 | 
					
						
						
							
							Scale current lateral velocity by input direction when jumping (not working)
						
						
						
						
						
					 | 
					
						2022-03-26 22:20:41 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c9fb74b90d
							
						
					 | 
					
						
						
							
							Jump in direction of player input
						
						
						
						
						
					 | 
					
						2022-03-26 21:49:52 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							32531fbcf4
							
						
					 | 
					
						
						
							
							Add more options to launch parameters and update jump so it uses our own launch function
						
						
						
						
						
					 | 
					
						2022-03-26 15:43:53 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							811d3329cb
							
						
					 | 
					
						
						
							
							Implement our own Launch function so we have control over whether the movement mode changes
						
						
						
						
						
					 | 
					
						2022-03-25 21:00:02 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							01df25063c
							
						
					 | 
					
						
						
							
							Tweak dash parameters
						
						
						
						
						
					 | 
					
						2022-03-24 22:08:09 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3957886ff8
							
						
					 | 
					
						
						
							
							Beginnings of a better dash
						
						
						
						
						
					 | 
					
						2022-03-23 22:30:47 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0ab46a246c
							
						
					 | 
					
						
						
							
							Change protag mesh to ghost lady
						
						
						
						
						
					 | 
					
						2022-03-23 19:59:19 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							057c929e5f
							
						
					 | 
					
						
						
							
							Derive gravity and jump velocity from time in air and max height
						
						
						
						
						
					 | 
					
						2022-03-15 22:05:50 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							493cca3fee
							
						
					 | 
					
						
						
							
							Tweaking movement and parameters for controller
						
						
						
						
						
					 | 
					
						2022-03-15 16:04:27 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							e235de93f2
							
						
					 | 
					
						
						
							
							Tweak sprint speed
						
						
						
						
						
					 | 
					
						2022-03-13 22:32:37 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							292989f26b
							
						
					 | 
					
						
						
							
							Sprinting and movement debug visuals
						
						
						
						
						
					 | 
					
						2022-03-13 22:07:13 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0a8720f706
							
						
					 | 
					
						
						
							
							Jump anims and a bit more tweaking
						
						
						
						
						
					 | 
					
						2022-03-13 00:08:51 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2c7bf0fb53
							
						
					 | 
					
						
						
							
							Create new character class
						
						
						
						
						
					 | 
					
						2022-03-11 20:45:14 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							dba265ac03
							
						
					 | 
					
						
						
							
							Convert all source files to UTF-8 with current Better_Movement changes
						
						
						
						
						
					 | 
					
						2022-03-10 22:10:17 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8d224a1a23
							
						
					 | 
					
						
						
							
							Convert all source files to UTF-8
						
						
						
						
						
					 | 
					
						2022-03-10 21:24:42 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							43e6c4a4ff
							
						
					 | 
					
						
						
							
							Try and improve jump
						
						
						
						
						
					 | 
					
						2022-03-10 20:40:49 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8396a5765a
							
						
					 | 
					
						
						
							
							Finish movement test level
						
						
						
						
						
					 | 
					
						2022-03-06 14:24:45 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							649a2aeb2c
							
						
					 | 
					
						
						
							
							Fix bounds on movement test level
						
						
						
						
						
					 | 
					
						2022-03-05 22:41:37 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							22ac08c064
							
						
					 | 
					
						
						
							
							Add more geometry to movement test map
						
						
						
						
						
					 | 
					
						2022-03-05 22:36:15 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							488c375c2d
							
						
					 | 
					
						
						
							
							Movement test level with ruler and slopes
						
						
						
						
						
					 | 
					
						2022-03-05 17:11:58 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							05b75a2085
							
						
					 | 
					
						
						
							
							Fix .gitignore
						
						
						
						
						
					 | 
					
						2022-03-04 22:12:30 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							30bc0f6b3a
							
						
					 | 
					
						
						
							
							Ignore third party directory in content folder
						
						
						
						
						
					 | 
					
						2022-02-05 22:41:12 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							3c9db81218
							
						
					 | 
					
						
						
							
							Add UnrealImGui submodule
						
						
						
						
						
					 | 
					
						2022-02-01 22:17:33 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							2279ee10b0
							
						
					 | 
					
						
						
							
							Added gitignore
						
						
						
						
						
					 | 
					
						2022-02-01 22:08:12 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							13ccc6c247
							
						
					 | 
					
						
						
							
							Once more with feeling
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 175] 
						
					 | 
					
						2022-02-01 21:53:58 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							91360dd59b
							
						
					 | 
					
						
						
							
							Asset reference stuff pt. 2
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 174] 
						
					 | 
					
						2022-02-01 21:51:19 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1bf05146fd
							
						
					 | 
					
						
						
							
							Asset reference stuff
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 173] 
						
					 | 
					
						2022-02-01 21:48:53 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b4f2410429
							
						
					 | 
					
						
						
							
							Try to fix up asset references again...
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 172] 
						
					 | 
					
						2022-02-01 20:51:20 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							b96f6571b2
							
						
					 | 
					
						
						
							
							Fix up untracked asset references
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 171] 
						
					 | 
					
						2022-02-01 20:36:05 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							ddecba2e2e
							
						
					 | 
					
						
						
							
							Implement better jump part 1
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 170] 
						
					 | 
					
						2021-12-21 20:53:57 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							8e0b0866cd
							
						
					 | 
					
						
						
							
							Create custom character movment class
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 169] 
						
					 | 
					
						2021-12-06 20:21:36 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							5e2b5ad658
							
						
					 | 
					
						
						
							
							Reimport insane air combo animations
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 168] 
						
					 | 
					
						2021-11-29 16:44:56 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							fb8f45022d
							
						
					 | 
					
						
						
							
							Add invincibility to dashes
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 167] 
						
					 | 
					
						2021-11-21 00:48:13 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							7f2d51317f
							
						
					 | 
					
						
						
							
							Implement air dash
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 166] 
						
					 | 
					
						2021-11-21 00:48:10 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							d6372ae782
							
						
					 | 
					
						
						
							
							Fix directional dashes
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 163] 
						
					 | 
					
						2021-11-18 20:09:24 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							324a2bcdd0
							
						
					 | 
					
						
						
							
							Prototype better air attacks
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 161] 
						
					 | 
					
						2021-11-14 22:51:13 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							c8c06d523c
							
						
					 | 
					
						
						
							
							Fix name of ground attack 3 state
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 160] 
						
					 | 
					
						2021-11-14 22:06:27 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							766dfd05e1
							
						
					 | 
					
						
						
							
							Fixing unintended deletion of ground attack 3 state
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 159] 
						
					 | 
					
						2021-11-14 22:04:53 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0107b89414
							
						
					 | 
					
						
						
							
							Trying out some new sword animations
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 158] 
						
					 | 
					
						2021-11-14 22:04:23 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							1745515fd4
							
						
					 | 
					
						
						
							
							Fix problem where hitting ground with sword causes hit pause missing files (hopefully for real this time)
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 157] 
						
					 | 
					
						2021-11-14 20:51:09 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							88eb3e4fd2
							
						
					 | 
					
						
						
							
							Document interfaces
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 154] 
						
					 | 
					
						2021-11-13 21:50:17 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
						
						
							
						
						
							0481defbbf
							
						
					 | 
					
						
						
							
							Add some sounds from ShooterGame
						
						
						
						
						
						
						
						[git-p4: depot-paths = "//depot/main/": change = 153] 
						
					 | 
					
						2021-11-13 20:07:48 -05:00 | 
					
					
						
						
							
							
							
						
					 |