Commit Graph

56 Commits

Author SHA1 Message Date
OverflowNarhoym 877a6b74a4 Audio and level 2022-02-27 11:05:41 +01:00
OverflowNarhoym 945d95433c Added music and builtscene 2022-02-27 10:26:56 +01:00
OverflowNarhoym 9fa665243b Modified first level 2022-02-26 16:55:49 +01:00
OverflowNarhoym 737eb55d78 Added platform sprites 2022-02-26 12:10:48 +01:00
OverflowNarhoym 574b00ca60 Improved sprites and tilemap 2022-02-26 11:33:42 +01:00
OverflowNarhoym 7023b18379 Created tilemap 2022-02-26 10:18:12 +01:00
OverflowNarhoym 106e23cbb4 Unity scene save 2022-02-26 09:24:19 +01:00
OverflowNarhoym 67456993ba Corrected camera script 2022-02-25 21:52:09 +01:00
OverflowNarhoym 1ca81682f8 Created camera script 2022-02-25 21:38:09 +01:00
OverflowNarhoym 07a542a990 fuck moving platforms 2022-02-25 21:33:29 +01: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
Syntriax a9742ff32a Forgot to Save the Scene! 2022-02-25 13:49:58 +03:00
Syntriax 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
OverflowNarhoym 9d748e44fc Merge remote-tracking branch 'origin/Syntriax' into Over 2022-02-25 10:46:44 +01:00
Syntriax 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
Syntriax ab6dd176e3 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-24 00:23:26 +03:00
Syntriax 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
Syntriax 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
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 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 80842b86e1 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-22 22:03:24 +03:00
Syntriax 231c93d189 Physics Collision Matrix Updated for Interactables 2022-02-22 22:03:11 +03:00
Syntriax 25d021a1b2 Interactable Triggers Added 2022-02-22 21:59:55 +03:00
Syntriax b9a7996f44 Interactables Added 2022-02-22 21:59:55 +03:00
OverflowNarhoym 6a0dd5f498 Changed jump variable 2022-02-22 19:58:15 +01:00
Syntriax aabca12fd0 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-22 21:00:55 +03:00
Syntriax 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
Syntriax 860847e11a Scene Update 2022-02-22 00:48:10 +03:00