40 Commits

Author SHA1 Message Date
OverflowNarhoym
9d748e44fc Merge remote-tracking branch 'origin/Syntriax' into Over 2022-02-25 10:46:44 +01:00
89a057060c Patrollin Enemy Sprites 2022-02-25 12:45:02 +03:00
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
OverflowNarhoym
545d0aa965 Moving platform script 2022-02-25 10:36:45 +01:00
ab6dd176e3 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-24 00:23:26 +03:00
8d1bacaf31 Level Selection related stuff added 2022-02-24 00:21:59 +03:00
OverflowNarhoym
f9776a81be Merge remote-tracking branch 'origin/Syntriax' into Over 2022-02-23 18:41:25 +01:00
OverflowNarhoym
cfdcf5d93a Modified scene 2022-02-23 18:34:17 +01:00
OverflowNarhoym
bd4f9abb9e Fixed second scene 2022-02-23 13:28:25 +01:00
ed15d8b75b Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-23 15:07:41 +03:00
OverflowNarhoym
ff14aea8b2 Updated moving platform script 2022-02-23 13:05:30 +01:00
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
a030894ff3 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-23 11:43:30 +03:00
OverflowNarhoym
cb09cfa4a7 Modified camera and player prefabs 2022-02-22 20:58:53 +01:00
438663eeab Added Key Press Interactable Prefab 2022-02-22 22:06:42 +03:00
80842b86e1 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-22 22:03:24 +03:00
231c93d189 Physics Collision Matrix Updated for Interactables 2022-02-22 22:03:11 +03:00
25d021a1b2 Interactable Triggers Added 2022-02-22 21:59:55 +03:00
b9a7996f44 Interactables Added 2022-02-22 21:59:55 +03:00
OverflowNarhoym
6a0dd5f498 Changed jump variable 2022-02-22 19:58:15 +01:00
aabca12fd0 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-22 21:00:55 +03:00
dd543351c0 Interactables Added 2022-02-22 21:00:40 +03:00
OverflowNarhoym
bc517038e8 Modified camera prefab 2022-02-22 18:56:31 +01:00
OverflowNarhoym
5d6f4f6496 Created basic tilemap test and assets 2022-02-22 18:55:40 +01:00
OverflowNarhoym
557496897a Added Orientation enum and climbing input handling 2022-02-22 18:39:19 +01:00
OverflowNarhoym
da4fc01a50 Added movement acceleration 2022-02-22 17:43:05 +01:00
OverflowNarhoym
51f44fc153 Improved jumping and added TODOs 2022-02-22 12:17:45 +01: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
860847e11a Scene Update 2022-02-22 00:48:10 +03:00
cbcb05b845 Scene Update 2022-02-22 00:07:56 +03:00
OverflowNarhoym
db47afe89d Updated PlayerController.cs 2022-02-21 21:36:08 +01:00
OverflowNarhoym
1eb0cfa3de Updated PlayerController.cs 2022-02-21 18:40:03 +01:00
8c5bd12294 Typo fixes 2022-02-21 19:09:59 +03:00
94709d996e Syntriax Dev Scene has been Added 2022-02-21 16:29:12 +03:00
OverflowNarhoym
2f2e04f1af Initial Commit 2022-02-21 10:52:14 +01:00