Commit graph

384 commits

Author SHA1 Message Date
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
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
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
Ivan Filipenkov
3b0b3d9b15 test 2023-08-18 17:48:08 +03:00
Ivan Filipenkov
f72cc03c66 remove try catch in network 2023-08-18 17:45:42 +03:00
Kaktus200020
1ed1dd635f GhostAdding 2023-08-18 17:42:26 +03:00
Ivan Filipenkov
a47f73d523 fix texture names 2023-08-18 17:39:11 +03:00
Timofey06
211eac278c Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 17:27:11 +03:00
Timofey06
d9d56d54e0 StartreStart 2023-08-18 17:27:06 +03:00
Kaktus200020
d87770f9ec WereWolfAdding 2023-08-18 17:19:44 +03:00
bmvolf
61ea7a5644 tried to fix host error 2023-08-18 17:09:37 +03:00
Timofey06
d478d1afdc Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 17:48:44 +03:00
polten0
ba0135bf29 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 17:40:35 +03:00
polten0
91db8f92d0 AddDeathAnimations 2023-08-18 17:37:48 +03:00
1f37dc56ce Merge branch 'main' of github.com:progtime-net/DangerousD 2023-08-18 17:09:05 +03:00
7e300eb46d Lvel1 mobs 2023-08-18 17:08:35 +03:00
Timofey06
393818d0b8 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 17:08:14 +03:00
Timofey06
d25af5a0ca RepairMain 2023-08-18 17:07:28 +03:00
AnloGames
49fc159683 merge commit 2023-08-18 17:00:13 +03:00
bmvolf
b43c3a457d added up shooting 2023-08-18 16:52:38 +03:00
AnloGames
eb89ae4de9 GameOver NetworkSupport 2023-08-18 16:50:18 +03:00
Timofey06
e587ee34ef StartRestart 2023-08-18 16:37:59 +03:00
Timofey06
c4de6406c3 AddedTeleportingDoors 2023-08-18 15:38:04 +03:00
Kaktus200020
19685a26d9 Merge branch 'main' into FrankBalls 2023-08-18 15:11:17 +03:00
Kaktus200020
2cb30ab0f3 NiceBalls 2023-08-18 14:54:00 +03:00
AnloGames
de705f7fb6 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-18 14:37:04 +03:00