OverflowNarhoym 930c834a4b Merge remote-tracking branch 'origin/Syntriax' into Over ... # Conflicts: # Assets/Sprites/UI.meta # Assets/Sprites/UI/UIBase.aseprite # Assets/Sprites/UI/UIBase.png # Assets/Sprites/UI/UIButtonBase.aseprite # Assets/Sprites/UI/UIButtonBase1.png # Assets/Sprites/UI/UIButtonBase2.png # Assets/Sprites/UI/UIButtonBase3.png # Assets/Sprites/UI/UIButtonBase4.png		2022-02-25 10:40:58 +01:00
..
Layouts	Added moving platform prefabs and sprites	2022-02-25 10:40:31 +01:00
EditorUserSettings.asset	Merge remote-tracking branch 'origin/Syntriax' into Over	2022-02-25 10:40:58 +01:00
Search.settings	Added Input System package	2022-02-21 11:32:22 +01:00