Commit Graph

28 Commits

Author SHA1 Message Date
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
OverflowNarhoym c848107cdc Added moving platform prefabs and sprites 2022-02-25 10:40:31 +01:00
Syntriax b542faf857 Updated the UI sprites to new Color Palette 2022-02-25 00:36:45 +03:00
Syntriax 8d1bacaf31 Level Selection related stuff added 2022-02-24 00:21:59 +03:00
Syntriax ed15d8b75b Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-23 15:07:41 +03:00
Syntriax b73372fe3f UI Sprites, Buttons, Canvases, Prefabs and a new Font Added 2022-02-23 14:53:01 +03:00
OverflowNarhoym 2ab3a57899 Merge remote-tracking branch 'origin/Syntriax' into Over
# Conflicts:
#	UserSettings/EditorUserSettings.asset
#	UserSettings/Layouts/default-2021.dwlt
2022-02-23 12:05:27 +01:00
OverflowNarhoym a51ee25bcc Added platform prefabs and sprites 2022-02-23 11:47:46 +01:00
Syntriax a030894ff3 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-23 11:43:30 +03:00
OverflowNarhoym 9d0f9e620c Improved jumping and moving 2022-02-22 21:49:06 +01:00
OverflowNarhoym cb09cfa4a7 Modified camera and player prefabs 2022-02-22 20:58:53 +01:00
Syntriax 438663eeab Added Key Press Interactable Prefab 2022-02-22 22:06:42 +03:00
Syntriax 25d021a1b2 Interactable Triggers Added 2022-02-22 21:59:55 +03:00
OverflowNarhoym bc517038e8 Modified camera prefab 2022-02-22 18:56:31 +01:00
OverflowNarhoym 4758ff68a7 Created camera prefab 2022-02-22 18:39:29 +01:00
OverflowNarhoym 51f44fc153 Improved jumping and added TODOs 2022-02-22 12:17:45 +01:00
OverflowNarhoym 9d911b058a Merge remote-tracking branch 'origin/Syntriax' into Over 2022-02-22 09:49:53 +01:00
Syntriax 3b89be5041 Projectlie Shooting Enemy Added 2022-02-22 11:25:25 +03:00
OverflowNarhoym 696340a434 Corrected Jump bug 2022-02-21 22:55:52 +01:00
OverflowNarhoym 296ec11d7a Merge remote-tracking branch 'origin/Syntriax' into Over
# Conflicts:
#	Assets/Scripts/Player/PlayerController.cs
2022-02-21 22:49:52 +01:00
OverflowNarhoym 961c8cf865 Modified scene 2022-02-21 22:48:53 +01:00
Syntriax 6e7a90fd86 Merged Wall and Ground Enemies into One 2022-02-22 00:47:26 +03:00
Syntriax 34d6cdb205 Moved Enemies to Subfolder 2022-02-22 00:07:04 +03:00
OverflowNarhoym f642c12d56 Created platform and player prefabs 2022-02-21 21:36:34 +01:00
Syntriax d4ebf87eb7 Added Enemy Variants for Wall and Ground Enemies
Added Todo to CollisionChecker
2022-02-21 20:36:00 +03:00
Syntriax 8c5bd12294 Typo fixes 2022-02-21 19:09:59 +03:00
Syntriax cd2f667f56 Collission Checker has been Added and Basic Patrolling Enemy Updated to use the Checkers 2022-02-21 16:27:23 +03:00
Syntriax 87f0652ce1 Prefabs Folder Added and BasicPatrollingEnemy Prefab Added 2022-02-21 15:41:19 +03:00