Commit graph

355 commits

Author SHA1 Message Date
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
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
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
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
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
AnloGames
41d616d7f5 map to lvl 2023-08-18 14:36:57 +03:00
AnloGames
221f5f15a2 Merge branch 'NetworkLivingEntitiesSupport' 2023-08-18 14:26:07 +03:00
bmvolf
93e948ac42 fixed hud 2023-08-18 14:00:22 +03:00
bmvolf
4a24a75399 Merge branch 'particlesBranch' 2023-08-18 13:57:41 +03:00
SergoDobro
0f0c553758 Merge branch 'main' into ui_new 2023-08-18 13:57:24 +03:00
bmvolf
5bd2b7d93b started vertical shoot 2023-08-18 13:53:18 +03:00
SergoDobro
f19b02f3bc GUI fixes and merges 2023-08-18 13:37:52 +03:00
AnloGames
c0997c903c LivingEntitySendPositionSupport(ЗОМБИ ХОДЯТ!!!) 2023-08-18 13:35:16 +03:00
Kaktus200020
9a6b2a0856 SlimeMerge 2023-08-18 13:31:15 +03:00
Kaktus200020
ab0947ed69 SlimeJumper 2023-08-18 13:11:49 +03:00
Kaktus200020
8e71a3c732 SlimeJumper 2023-08-18 13:09:34 +03:00
Timofey06
77c6ec9bca AddBossArena 2023-08-18 12:53:44 +03:00
42fdefab1c Merge branch 'main' of github.com:progtime-net/DangerousD 2023-08-18 12:52:18 +03:00
f624c873ff Merge branch 'main' of github.com:progtime-net/DangerousD 2023-08-18 12:51:54 +03:00
338fd044a1 Level 1 fixes 2023-08-18 12:47:53 +03:00
gravity
488a0074f4 HUD 2023-08-18 12:39:06 +03:00
AnloGames
39b9fa9242 Merge branch 'NetworkchangeStateAndMonstersSupport' 2023-08-18 12:34:46 +03:00
SergoDobro
15cc070446 merged menu controls 2023-08-18 12:31:43 +03:00
AnloGames
bed41c5bf0 NetworkAnimationSupport(ChangeState) 2023-08-18 12:30:44 +03:00
SergoDobro
8338f7910c merged sd last fixes 2023-08-18 12:06:07 +03:00
SergoDobro
2d76a9bc14 gunshot fixes 2023-08-18 11:53:23 +03:00
502a7f44c8 Merge branch 'Doors' 2023-08-18 11:52:52 +03:00
bmvolf
dcc845a517 merge commit. Added fix player and monsters 2023-08-18 11:50:24 +03:00
bmvolf
c05d13a68b Merge branch 'particlesBranch' 2023-08-18 11:49:29 +03:00
e2352d7db4 Merge branch 'Doors' of github.com:progtime-net/DangerousD into Doors 2023-08-18 11:47:38 +03:00
bf04d373b9 Door fix 2023-08-18 11:47:24 +03:00
Kaktus200020
333ca5c372 stupidSlime 2023-08-18 11:40:18 +03:00
bmvolf
5db6cee0fa fixed some bags 2023-08-18 11:39:54 +03:00
Timofey06
a0de50ba70 Fix 2023-08-18 11:39:01 +03:00