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
..
OverDevScene.unity	Added moving platform prefabs and sprites	2022-02-25 10:40:31 +01:00
OverDevScene.unity.meta	Updated PlayerController.cs	2022-02-21 18:40:03 +01:00
OverDevScene2.unity	Fixed second scene	2022-02-23 13:28:25 +01:00
OverDevScene2.unity.meta	Added platform prefabs and sprites	2022-02-23 11:47:46 +01:00
SampleScene.unity	Initial Commit	2022-02-21 10:52:14 +01:00
SampleScene.unity.meta	Initial Commit	2022-02-21 10:52:14 +01:00
SyntriaxDevScene.unity	Level Selection related stuff added	2022-02-24 00:21:59 +03:00
SyntriaxDevScene.unity.meta	Syntriax Dev Scene has been Added	2022-02-21 16:29:12 +03:00