Commit Graph

64 Commits

Author SHA1 Message Date
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
OverflowNarhoym 5a9bdbbea5 Updated CollapsingPlatform.cs 2022-02-25 12:12:49 +01: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 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 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 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
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
Syntriax 80842b86e1 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-22 22:03:24 +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 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
OverflowNarhoym 9160a0092a Fixed deceleration bug in BaseSpeed property 2022-02-22 19:05:14 +01:00
OverflowNarhoym 05b9d76576 Merge remote-tracking branch 'origin/Syntriax' into Over 2022-02-22 18:39:43 +01:00
OverflowNarhoym 557496897a Added Orientation enum and climbing input handling 2022-02-22 18:39:19 +01:00
Syntriax aa05954353 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-22 19:51:05 +03:00
OverflowNarhoym da4fc01a50 Added movement acceleration 2022-02-22 17:43:05 +01:00
Syntriax 1a94602ada Shooting Enemies now stops for a bit and then starts shooting 2022-02-22 18:03:09 +03: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
OverflowNarhoym 376aedc6fc Added interact input 2022-02-22 09:49:48 +01:00
Syntriax 3b89be5041 Projectlie Shooting Enemy Added 2022-02-22 11:25:25 +03: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 54a1ce62e5 Merge remote-tracking branch 'origin/Over' into Syntriax 2022-02-22 00:04:36 +03:00
Syntriax 90c0e3b431 IPausable added to BasicEnemies 2022-02-22 00:04:15 +03:00
OverflowNarhoym db47afe89d Updated PlayerController.cs 2022-02-21 21:36:08 +01:00
OverflowNarhoym aebb1f0f05 Merge remote-tracking branch 'origin/Syntriax' into Over 2022-02-21 18:44:08 +01:00
Syntriax db33696e0c Typo fix 2 2022-02-21 20:43:47 +03:00
Syntriax 9249898272 Typo fix 2022-02-21 20:43:25 +03:00