OverflowNarhoym
|
b8b5a90bbb
|
Merge remote-tracking branch 'origin/Syntriax' into Over
|
2022-02-26 11:33:57 +01:00 |
OverflowNarhoym
|
574b00ca60
|
Improved sprites and tilemap
|
2022-02-26 11:33:42 +01:00 |
Syntriax
|
3821ee1821
|
Enemy Sizes Increased
|
2022-02-26 13:31:43 +03:00 |
Syntriax
|
a8998ddd69
|
Forgotten Debug Line
|
2022-02-26 13:03:26 +03:00 |
Syntriax
|
e69e771c5b
|
Merge remote-tracking branch 'origin/Over' into Syntriax
|
2022-02-26 13:02:00 +03:00 |
Syntriax
|
7ff2d07c5b
|
Level Manager Improvement
|
2022-02-26 12:59:30 +03:00 |
Syntriax
|
05f2cdb62b
|
Unlockable Levels and Added empty 7 levels
|
2022-02-26 12:56:49 +03:00 |
OverflowNarhoym
|
e707cf3f4d
|
Merge remote-tracking branch 'origin/Syntriax' into Over
|
2022-02-26 10:18:49 +01:00 |
OverflowNarhoym
|
7023b18379
|
Created tilemap
|
2022-02-26 10:18:12 +01:00 |
Syntriax
|
b7ab8e2a27
|
Level Template Updated
|
2022-02-26 12:13:57 +03:00 |
Syntriax
|
96dc8bbb28
|
Merge remote-tracking branch 'origin/Over' into Syntriax
|
2022-02-26 11:55:57 +03:00 |
Syntriax
|
011e658336
|
Player Jitter Fix
|
2022-02-26 11:55:48 +03:00 |
OverflowNarhoym
|
7865936d25
|
Merge remote-tracking branch 'origin/Syntriax' into Over
# Conflicts:
# UserSettings/Layouts/default-2021.dwlt
|
2022-02-26 09:24:30 +01:00 |
OverflowNarhoym
|
106e23cbb4
|
Unity scene save
|
2022-02-26 09:24:19 +01:00 |
Syntriax
|
bee004a425
|
Moving Platforms Improvement
|
2022-02-26 11:10:26 +03:00 |
OverflowNarhoym
|
ce27730733
|
Created collapsing platform sprites and prefabs
|
2022-02-26 00:03:35 +01:00 |
Syntriax
|
ea9da84b2e
|
Merge remote-tracking branch 'origin/Over' into Syntriax
|
2022-02-26 00:02:12 +03:00 |
Syntriax
|
622c1e373c
|
Shooting Enemy Improvements
|
2022-02-26 00:01:18 +03:00 |
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 |
Syntriax
|
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 |
Syntriax
|
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 |
Syntriax
|
3b8cee973f
|
Added Projectile Sprites
|
2022-02-25 23:08:58 +03:00 |
Syntriax
|
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 |
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 |
Syntriax
|
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 |
Syntriax
|
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 |
Syntriax
|
16be6c18c5
|
Moved UI Sprites to their own Subfolder
|
2022-02-25 10:28:35 +03:00 |
Syntriax
|
b542faf857
|
Updated the UI sprites to new Color Palette
|
2022-02-25 00:36:45 +03: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
|
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
|
86e4e8e9b6
|
TMP Added
|
2022-02-23 12:15:23 +03: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
|
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
|
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 |
Syntriax
|
f9639c4c8f
|
Merge remote-tracking branch 'origin/Over' into Syntriax
|
2022-02-22 21:06:51 +03:00 |
OverflowNarhoym
|
9160a0092a
|
Fixed deceleration bug in BaseSpeed property
|
2022-02-22 19:05:14 +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
|
05b9d76576
|
Merge remote-tracking branch 'origin/Syntriax' into Over
|
2022-02-22 18:39:43 +01:00 |
OverflowNarhoym
|
4758ff68a7
|
Created camera prefab
|
2022-02-22 18:39:29 +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
|
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 |
Syntriax
|
6e7a90fd86
|
Merged Wall and Ground Enemies into One
|
2022-02-22 00:47:26 +03:00 |
Syntriax
|
cbcb05b845
|
Scene Update
|
2022-02-22 00:07:56 +03:00 |
Syntriax
|
34d6cdb205
|
Moved Enemies to Subfolder
|
2022-02-22 00:07:04 +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
|
f642c12d56
|
Created platform and player prefabs
|
2022-02-21 21:36:34 +01: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 |
OverflowNarhoym
|
3565ada6cb
|
Merge remote-tracking branch 'origin/Syntriax' into Over
|
2022-02-21 18:40:35 +01:00 |
OverflowNarhoym
|
1eb0cfa3de
|
Updated PlayerController.cs
|
2022-02-21 18:40:03 +01:00 |