 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
|
eb0accb0ec
|
Commit to merge
|
2022-02-23 12:05:11 +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 |
|
Syntriax
|
add52b096f
|
EditorUserSettings ignored
|
2022-02-23 12:32:25 +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
|
0b8fecd7ff
|
Removed Editor Layout File from Source Control
|
2022-02-23 11:51:43 +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 |