146 Commits

Author SHA1 Message Date
OverflowNarhoym
67456993ba Corrected camera script 2022-02-25 21:52:09 +01:00
OverflowNarhoym
ee58a68933 Merge remote-tracking branch 'origin/Syntriax' into Over 2022-02-25 21:41:47 +01:00
2999479822 Fix 2022-02-25 23:41:15 +03:00
OverflowNarhoym
561a622ce9 Merge remote-tracking branch 'origin/Syntriax' into Over 2022-02-25 21:38:35 +01:00
OverflowNarhoym
1ca81682f8 Created camera script 2022-02-25 21:38:09 +01:00
f338283adb Shooting Animations Added 2022-02-25 23:36:20 +03:00
OverflowNarhoym
07a542a990 fuck moving platforms 2022-02-25 21:33:29 +01:00
3b8cee973f Added Projectile Sprites 2022-02-25 23:08:58 +03:00
8d1e53d442 Simple Level Template Prefab Added 2022-02-25 22:56:10 +03:00
OverflowNarhoym
75ea014fbf Push for Syn 2022-02-25 20:14:54 +01:00
OverflowNarhoym
805aeb2d82 Updated platform scripts 2022-02-25 19:05:28 +01:00
OverflowNarhoym
b5a1f99cb8 Merge remote-tracking branch 'origin/Syntriax' into Over 2022-02-25 14:06:49 +01:00
OverflowNarhoym
5a9bdbbea5 Updated CollapsingPlatform.cs 2022-02-25 12:12:49 +01:00
a9742ff32a Forgot to Save the Scene! 2022-02-25 13:49:58 +03:00
cc479e14ba Ability to Restart Level, Player Spawning and a Test Level added + Bug Fix 2022-02-25 13:49:11 +03:00
OverflowNarhoym
1aa1ef8251 Updated collapsing platform script 2022-02-25 11:32:01 +01:00
7939328be7 Restored the UI Sprites 2022-02-25 13:14:00 +03:00
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
db3879c5ab Added ground layer to moving platforms 2022-02-25 10:42:56 +01: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
16be6c18c5 Moved UI Sprites to their own Subfolder 2022-02-25 10:28:35 +03:00
b542faf857 Updated the UI sprites to new Color Palette 2022-02-25 00:36:45 +03: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
a1e5a5ad88 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-23 12:34:17 +03:00
OverflowNarhoym
bd4ad40bd1 Fixed jumping bug 2022-02-23 10:29:46 +01:00
OverflowNarhoym
ba34a2ffb7 Removed normalized vector 2022-02-23 10:23:58 +01:00
86e4e8e9b6 TMP Added 2022-02-23 12:15:23 +03:00
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
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
eca7e130dd Removed exception on OnInteract method 2022-02-22 19:58:50 +01:00
OverflowNarhoym
6a0dd5f498 Changed jump variable 2022-02-22 19:58:15 +01:00
OverflowNarhoym
643460f392 Replaced magic numbers with constants 2022-02-22 19:07:11 +01:00