jsy2026 e211e4f846 Merge branch 'main' of http://59.19.179.48:3300/qoralstmd6825/TigerProject ... # Conflicts: # Assets/Scripts/EntityData/TestEntity.asset # Assets/Scripts/Monster/GroundEnemyMovement.cs # Assets/Scripts/Player/Player.cs # Assets/Scripts/Player/PlayerController.cs		2026-01-27 21:17:01 +09:00
..
NoFriction.physicsMaterial2D	빠진 부분 커밋	2026-01-20 19:06:03 +09:00
NoFriction.physicsMaterial2D.meta	빠진 부분 커밋	2026-01-20 19:06:03 +09:00
Player.cs	Merge branch 'main' of http://59.19.179.48:3300/qoralstmd6825/TigerProject	2026-01-27 21:17:01 +09:00
Player.cs.meta	Edited with Error	2026-01-23 17:06:57 +09:00
PlayerController.cs	Merge branch 'main' of http://59.19.179.48:3300/qoralstmd6825/TigerProject	2026-01-27 21:17:01 +09:00
PlayerController.cs.meta	빠진 부분 커밋	2026-01-20 19:06:03 +09:00