SergoDobro
|
3b63d63087
|
Merge branch 'черешня' into sounds
|
2023-08-18 20:28:51 +03:00 |
|
SergoDobro
|
9a044746d8
|
sounds
|
2023-08-18 20:25:42 +03:00 |
|
AnloGames
|
0756023c5a
|
d
|
2023-08-18 20:25:22 +03:00 |
|
AnloGames
|
e70cae920c
|
time
|
2023-08-18 20:22:28 +03:00 |
|
N4K
|
ec8e0a8cd5
|
Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня
|
2023-08-18 20:21:43 +03:00 |
|
N4K
|
868990579a
|
merge?
|
2023-08-18 20:21:21 +03:00 |
|
gravity
|
665ba7353a
|
Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня
|
2023-08-18 20:16:24 +03:00 |
|
N4K
|
2dad49fc95
|
Merge branch 'черешня' into livingEntitiesVlad
|
2023-08-18 20:15:59 +03:00 |
|
Ivan Filipenkov
|
90018ac034
|
fix smoke
|
2023-08-18 20:13:54 +03:00 |
|
N4K
|
3d00ba57b7
|
Merge branch 'черешня' into livingEntitiesVlad
|
2023-08-18 20:13:42 +03:00 |
|
gravity
|
eaefd89eb4
|
Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня
|
2023-08-18 20:12:09 +03:00 |
|
AnloGames
|
b304a0db88
|
pla
|
2023-08-18 20:11:55 +03:00 |
|
gravity
|
38f4e0a81f
|
Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня
|
2023-08-18 20:09:24 +03:00 |
|
AnloGames
|
ce40ddab57
|
Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня
|
2023-08-18 20:08:22 +03:00 |
|
AnloGames
|
0a6e6573c5
|
d
|
2023-08-18 20:08:16 +03:00 |
|
gravity
|
81ac0b854f
|
Merge branch 'ui_new1' into черешня
|
2023-08-18 20:06:51 +03:00 |
|
SergoDobro
|
9d2ff11d50
|
Merge branch 'черешня' into reserv
# Conflicts:
# DangerousD/Content/Content.mgcb
|
2023-08-18 20:02:56 +03:00 |
|
Ivan Filipenkov
|
87c3a168af
|
fix
|
2023-08-18 19:59:32 +03:00 |
|
SergoDobro
|
a4d47379d6
|
working game and diamonds
|
2023-08-18 19:59:22 +03:00 |
|
N4K
|
585499b7bc
|
delete babka
|
2023-08-18 19:57:52 +03:00 |
|
Ivan Filipenkov
|
69f96286ef
|
Merge remote-tracking branch 'origin/FrankBalls' into черешня
# Conflicts:
# DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
|
2023-08-18 19:57:50 +03:00 |
|
AnloGames
|
c05a6e4eef
|
fsd
|
2023-08-18 19:53:19 +03:00 |
|
AnloGames
|
d176dfedf3
|
debufgdsf kspdnisa
|
2023-08-18 19:52:48 +03:00 |
|
N4K
|
da4768d920
|
Merge branch 'черешня' into livingEntitiesVlad
|
2023-08-18 19:46:49 +03:00 |
|
AnloGames
|
b5224f10aa
|
sascsacas
|
2023-08-18 19:41:52 +03:00 |
|
Ivan Filipenkov
|
0a9f39dbb1
|
отмена
|
2023-08-18 19:40:06 +03:00 |
|
Ivan Filipenkov
|
5e804df2b5
|
Merge branch 'networkFixes' into черешня
# Conflicts:
# DangerousD/Content/Content.mgcb
# DangerousD/GameCore/GameObjects/LivingEntities/Player/Player.cs
|
2023-08-18 19:39:08 +03:00 |
|
AnloGames
|
8c258f9e5b
|
BulletNetworkSupport
|
2023-08-18 19:32:20 +03:00 |
|
|
|
7783f1dc82
|
Level 1
|
2023-08-18 19:30:14 +03:00 |
|
|
|
d834423b7e
|
ДВЕРИ СПАВНЯТСЯ(+ белы квадраты)
|
2023-08-18 19:18:50 +03:00 |
|
|
|
447b8f0b10
|
Lvl slime fix
|
2023-08-18 19:06:44 +03:00 |
|
Ivan Filipenkov
|
fa399951a8
|
fix network
|
2023-08-18 18:48:19 +03:00 |
|
bmvolf
|
12e3101988
|
added up shooting
|
2023-08-18 18:48:17 +03:00 |
|
Ivan Filipenkov
|
665cb6b38b
|
fix texture names
|
2023-08-18 18:46:05 +03:00 |
|
polten0
|
dd71483358
|
AddDeathAnimations
|
2023-08-18 18:46:05 +03:00 |
|
gravity
|
75e184274a
|
ui
|
2023-08-18 18:41:44 +03:00 |
|
N4K
|
0921ecc24c
|
flameskull move fix
|
2023-08-18 18:26:08 +03:00 |
|
Ivan Filipenkov
|
b0a384972f
|
aaaaaaaaaa
|
2023-08-18 18:25:04 +03:00 |
|
Ivan Filipenkov
|
5e4c576a79
|
fix
|
2023-08-18 18:23:12 +03:00 |
|
Ivan Filipenkov
|
b2ed0bc14c
|
fox
|
2023-08-18 18:19:31 +03:00 |
|
Kaktus200020
|
7c526a8e11
|
Merge branch 'main' into FrankBalls
|
2023-08-18 18:17:10 +03:00 |
|
Ivan Filipenkov
|
c108c1899b
|
fix
|
2023-08-18 18:16:19 +03:00 |
|
AnloGames
|
d1719763ff
|
Merge branch 'networkFixes' of https://github.com/progtime-net/DangerousD into networkFixes
|
2023-08-18 18:11:33 +03:00 |
|
AnloGames
|
77aacb86f0
|
nf
|
2023-08-18 18:11:17 +03:00 |
|
Ivan Filipenkov
|
92f10d4cd0
|
test
|
2023-08-18 17:57:26 +03:00 |
|
AnloGames
|
dcb7eaa960
|
Merge branch 'networkFixes' of https://github.com/progtime-net/DangerousD into networkFixes
|
2023-08-18 17:54:51 +03:00 |
|
AnloGames
|
3399cc8f59
|
lobbyFix
|
2023-08-18 17:54:30 +03:00 |
|
Ivan Filipenkov
|
6550f1273d
|
test
|
2023-08-18 17:54:00 +03:00 |
|
Ivan Filipenkov
|
8c1ab9b12e
|
fix bind ip
|
2023-08-18 17:49:49 +03:00 |
|
Timofey06
|
4386e9db8b
|
RestartAdded
|
2023-08-18 17:48:08 +03:00 |
|
