Commit graph

317 commits

Author SHA1 Message Date
bmvolf
a3d9efdea7 Merge branch 'main' into livingEntities 2023-08-17 20:00:08 +03:00
bmvolf
8bf77eab60 fixed some lags 2023-08-17 19:21:51 +03:00
gravity
7ea6e46775 Merge branch 'ui' of https://github.com/progtime-net/DangerousD into ui 2023-08-17 19:18:23 +03:00
gravity
66dc9f0c7f gui 2023-08-17 19:15:39 +03:00
AnloGames
d3a0c64596 Some fixes 2023-08-17 18:46:46 +03:00
bmvolf
c1538670ba start work for hanchman 2023-08-17 18:22:43 +03:00
AnloGames
005ce1cfb8 NetworkManager Sound fix 2023-08-17 18:08:33 +03:00
Lev
c206dfe294 higjskzscc 2023-08-17 18:03:48 +03:00
Lev
6d9f0c21d5 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 17:53:43 +03:00
Lev
723632178a kskclzzzfer 2023-08-17 17:48:40 +03:00
Lev
e3879697f0 fix Bags 2023-08-17 17:39:57 +03:00
AnloGames
d77766d503 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 17:39:43 +03:00
AnloGames
e275e5cddc LobbyGui Network Fix 2023-08-17 17:38:40 +03:00
N4K
cbcffe8d48 fixbugs 2023-08-17 17:36:29 +03:00
Lev
551c2635bf player недоделанный 2023-08-17 17:32:34 +03:00
N4K
833da68a4e Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 17:29:59 +03:00
Timofey06
9b346891f2 physics fix pack 3 2023-08-17 17:28:29 +03:00
N4K
086c0a94e9 monsters-main merge 2023-08-17 17:28:23 +03:00
N4K
2ffd006f73 little changes 2023-08-17 17:14:23 +03:00
Timofey06
a327e1b480 mega slime merge 2023-08-17 17:11:49 +03:00
Timofey06
087472ddc3 ColisionTracerOn 2023-08-17 16:48:29 +03:00
N4K
a21ef22451 little changes 2023-08-17 16:41:16 +03:00
Kaktus200020
9f6b6fd16a slimeReadyMaybe 2023-08-17 16:40:33 +03:00
bmvolf
8d6e3e6ba7
Merge pull request #5 from progtime-net/livingEntitiesHunchMan
Merge Hunchman
2023-08-17 16:27:08 +03:00
bmvolf
6a76f8e22a
Merge branch 'livingEntities' into livingEntitiesHunchMan 2023-08-17 16:26:58 +03:00
Timofey06
abbcdba429 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 16:26:53 +03:00
Timofey06
0ff6c7ddea AddCamera 2023-08-17 16:26:09 +03:00
Timofey06
81dd082141 FixLowFpsBug 2023-08-17 16:17:33 +03:00
polten0
d569489cd4 fixaaa3 2023-08-17 16:13:49 +03:00
Lev
5c4e67ddb4 almostJump 2023-08-17 16:12:47 +03:00
polten0
69c5ea29b9 fixanother 2023-08-17 16:12:25 +03:00
bmvolf
06be965359 started huch animation 2023-08-17 16:10:20 +03:00
MARKPRO44
695a8fb871 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 15:47:10 +03:00
Lev
6e4eaf7915 Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 15:40:10 +03:00
MARKPRO44
c35f288fba FrankBall_2 2023-08-17 15:28:00 +03:00
bmvolf
0a2e3d6b1f player animation changed 2023-08-17 15:27:10 +03:00
591bdf24b6 Add player to map 2023-08-17 15:15:24 +03:00
bmvolf
71dc642a1d started work wirk with player 2023-08-17 15:10:08 +03:00
Lev
22db3d31eb Merge branch 'main' of https://github.com/progtime-net/DangerousD 2023-08-17 15:08:46 +03:00
Lev
37bb9fbb66 Some Изменения 2023-08-17 15:07:59 +03:00
Timofey06
b8367d3a75 Merge branch 'MapManager' 2023-08-17 15:00:58 +03:00
Timofey06
6f1d81372e Merge branch 'Boss' 2023-08-17 14:35:40 +03:00
Timofey06
ea0506beec SilasAlgorimVersion1End 2023-08-17 14:32:14 +03:00
AnloGames
7fee10dd29 Network List Of tasks Support 2023-08-17 14:31:20 +03:00
6fb9145c67 Fixes 2023-08-17 13:46:02 +03:00
polten0
7b6d750bc1 Merge branch 'main' into livingEntitiesHunchMan 2023-08-17 13:40:24 +03:00
2de1a409fb Fix Entity spawn position 2023-08-17 13:38:38 +03:00
bmvolf
9568f313fd merge commit 2023-08-17 13:24:03 +03:00
gravity
4ffae54437 gui 2023-08-17 13:21:21 +03:00
bmvolf
594da62dfa for merge to main 2023-08-17 13:21:12 +03:00