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
..
Platforms	Added moving platform prefabs and sprites	2022-02-25 10:40:31 +01:00
Tilemaps	Created basic tilemap test and assets	2022-02-22 18:55:40 +01:00
UI	Merge remote-tracking branch 'origin/Syntriax' into Over	2022-02-25 10:40:58 +01:00
Platforms.meta	Added platform prefabs and sprites	2022-02-23 11:47:46 +01:00
Tilemaps.meta	Created basic tilemap test and assets	2022-02-22 18:55:40 +01:00
UI.meta	Added moving platform prefabs and sprites	2022-02-25 10:40:31 +01:00