Commit graph

Select branches

Hide pull requests

черешня

Mono Color

• 3b63d63087 Merge branch 'черешня' into sounds черешня origin/черешня origin/HEAD SergoDobro 2023-08-18 20:28:51 +03:00
• 9a044746d8 sounds SergoDobro 2023-08-18 20:25:42 +03:00
• 0756023c5a d AnloGames 2023-08-18 20:25:22 +03:00
• e70cae920c time AnloGames 2023-08-18 20:22:28 +03:00
• ec8e0a8cd5 Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня N4K 2023-08-18 20:21:43 +03:00
• 868990579a merge? N4K 2023-08-18 20:21:21 +03:00
• 665ba7353a Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня gravity 2023-08-18 20:16:24 +03:00
• 2dad49fc95 Merge branch 'черешня' into livingEntitiesVlad N4K 2023-08-18 20:15:59 +03:00
• 90018ac034 fix smoke Ivan Filipenkov 2023-08-18 20:13:54 +03:00
• 3d00ba57b7 Merge branch 'черешня' into livingEntitiesVlad origin/livingEntitiesVlad N4K 2023-08-18 20:13:42 +03:00
• eaefd89eb4 Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня gravity 2023-08-18 20:12:09 +03:00
• b304a0db88 pla AnloGames 2023-08-18 20:11:55 +03:00
• 38f4e0a81f Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня gravity 2023-08-18 20:09:24 +03:00
• ce40ddab57 Merge branch 'черешня' of https://github.com/progtime-net/DangerousD into черешня AnloGames 2023-08-18 20:08:22 +03:00
• 0a6e6573c5 d AnloGames 2023-08-18 20:08:16 +03:00
• 81ac0b854f Merge branch 'ui_new1' into черешня gravity 2023-08-18 20:06:51 +03:00
• 9d2ff11d50 Merge branch 'черешня' into reserv SergoDobro 2023-08-18 20:02:56 +03:00
• 87c3a168af fix Ivan Filipenkov 2023-08-18 19:59:32 +03:00
• a4d47379d6 working game and diamonds SergoDobro 2023-08-18 19:59:22 +03:00
• 585499b7bc delete babka N4K 2023-08-18 19:57:52 +03:00
• 69f96286ef Merge remote-tracking branch 'origin/FrankBalls' into черешня Ivan Filipenkov 2023-08-18 19:57:50 +03:00
• c05a6e4eef fsd AnloGames 2023-08-18 19:53:19 +03:00
• d176dfedf3 debufgdsf kspdnisa AnloGames 2023-08-18 19:52:48 +03:00
• ccc6d8d93e gg origin/FrankBalls Kaktus200020 2023-08-18 19:52:24 +03:00
• da4768d920 Merge branch 'черешня' into livingEntitiesVlad N4K 2023-08-18 19:46:49 +03:00
• b5224f10aa sascsacas AnloGames 2023-08-18 19:41:52 +03:00
• 0a9f39dbb1 отмена Ivan Filipenkov 2023-08-18 19:40:06 +03:00
• 12be8971ad LevCommit origin/LevCommit Lev 2023-08-18 19:39:09 +03:00
• 5e804df2b5 Merge branch 'networkFixes' into черешня Ivan Filipenkov 2023-08-18 19:39:08 +03:00
• 8c258f9e5b BulletNetworkSupport origin/networkFixes AnloGames 2023-08-18 19:32:20 +03:00
• 7783f1dc82 Level 1 Mootfrost777 2023-08-18 19:30:14 +03:00
• d834423b7e ДВЕРИ СПАВНЯТСЯ(+ белы квадраты) Mootfrost777 2023-08-18 18:31:45 +03:00
• 447b8f0b10 Lvl slime fix Mootfrost777 2023-08-18 19:06:44 +03:00
• fa399951a8 fix network origin/мясо Ivan Filipenkov 2023-08-18 17:45:17 +03:00
• 12e3101988 added up shooting bmvolf 2023-08-18 16:52:38 +03:00
• 665cb6b38b fix texture names Ivan Filipenkov 2023-08-18 17:38:59 +03:00
• dd71483358 AddDeathAnimations polten0 2023-08-18 17:37:48 +03:00
• 75e184274a ui gravity 2023-08-18 18:41:44 +03:00
• a4e5998e9b Merge branch 'main' of https://github.com/progtime-net/DangerousD origin/livingEntities N4K 2023-08-18 18:31:45 +03:00
• af5251ad4d Merge branch 'networkFixes' origin/main Ivan Filipenkov 2023-08-18 18:27:17 +03:00
• e08f879318 fix network Ivan Filipenkov 2023-08-18 17:45:17 +03:00
• 0921ecc24c flameskull move fix N4K 2023-08-18 18:26:08 +03:00
• f415b47fc4 Main Hunch MARKPRO44 2023-08-18 18:25:58 +03:00
• b0a384972f aaaaaaaaaa Ivan Filipenkov 2023-08-18 18:25:04 +03:00
• 5e4c576a79 fix Ivan Filipenkov 2023-08-18 18:23:12 +03:00
• 38f1064ec4 Maiu Merge Hunchman MARKPRO44 2023-08-18 18:20:45 +03:00
• b2ed0bc14c fox Ivan Filipenkov 2023-08-18 18:19:31 +03:00
• 7c526a8e11 Merge branch 'main' into FrankBalls Kaktus200020 2023-08-18 18:17:10 +03:00
• c108c1899b fix Ivan Filipenkov 2023-08-18 18:16:19 +03:00
• 33331e83ee Hunchman MARKPRO44 2023-08-18 18:14:01 +03:00
• d1719763ff Merge branch 'networkFixes' of https://github.com/progtime-net/DangerousD into networkFixes AnloGames 2023-08-18 18:11:33 +03:00
• 77aacb86f0 nf AnloGames 2023-08-18 18:11:17 +03:00
• 92f10d4cd0 test Ivan Filipenkov 2023-08-18 17:57:07 +03:00
• dcb7eaa960 Merge branch 'networkFixes' of https://github.com/progtime-net/DangerousD into networkFixes AnloGames 2023-08-18 17:54:51 +03:00
• 3399cc8f59 lobbyFix AnloGames 2023-08-18 17:54:30 +03:00
• 6550f1273d test Ivan Filipenkov 2023-08-18 17:54:00 +03:00
• 8c1ab9b12e fix bind ip Ivan Filipenkov 2023-08-18 17:49:49 +03:00
• 3b0b3d9b15 test Ivan Filipenkov 2023-08-18 17:48:08 +03:00
• f72cc03c66 remove try catch in network Ivan Filipenkov 2023-08-18 17:45:17 +03:00
• 1ed1dd635f GhostAdding Kaktus200020 2023-08-18 17:42:26 +03:00
• 6714513814 Merge branch 'main' into livingEntitiesVlad N4K 2023-08-18 17:32:03 +03:00
• fa655de331 Merge branch 'main' of https://github.com/progtime-net/DangerousD N4K 2023-08-18 17:30:33 +03:00
• a8d30ca8be main n MARKPRO44 2023-08-18 17:29:44 +03:00
• 1dfb23266b flameskull move add N4K 2023-08-18 17:29:16 +03:00
• b85d0744ec
  Merge pull request #8 from progtime-net/uiAddon2 origin/ui_new polten0 2023-08-18 17:20:20 +03:00
• d87770f9ec WereWolfAdding Kaktus200020 2023-08-18 17:19:44 +03:00
• bc10a6d7b3 fix1 polten0 2023-08-18 17:18:36 +03:00
• 61ea7a5644 tried to fix host error origin/particlesBranch bmvolf 2023-08-18 17:09:37 +03:00
• d478d1afdc Merge branch 'main' of https://github.com/progtime-net/DangerousD Timofey06 2023-08-18 17:48:44 +03:00
• 4386e9db8b RestartAdded Timofey06 2023-08-18 17:48:08 +03:00
• ba0135bf29 Merge branch 'main' of https://github.com/progtime-net/DangerousD polten0 2023-08-18 17:40:35 +03:00
• a47f73d523 fix texture names Ivan Filipenkov 2023-08-18 17:38:59 +03:00
• 91db8f92d0 AddDeathAnimations polten0 2023-08-18 17:37:48 +03:00
• 211eac278c Merge branch 'main' of https://github.com/progtime-net/DangerousD Timofey06 2023-08-18 17:27:11 +03:00
• d9d56d54e0 StartreStart Timofey06 2023-08-18 17:27:06 +03:00
• 1f37dc56ce Merge branch 'main' of github.com:progtime-net/DangerousD Mootfrost777 2023-08-18 17:09:05 +03:00
• 7e300eb46d Lvel1 mobs Mootfrost777 2023-08-18 17:08:35 +03:00
• 393818d0b8 Merge branch 'main' of https://github.com/progtime-net/DangerousD Timofey06 2023-08-18 17:08:14 +03:00
• d25af5a0ca RepairMain Timofey06 2023-08-18 17:07:28 +03:00
• 49fc159683 merge commit AnloGames 2023-08-18 17:00:13 +03:00
• b43c3a457d added up shooting bmvolf 2023-08-18 16:52:38 +03:00
• eb89ae4de9 GameOver NetworkSupport origin/NetworkLivingEntitiesSupport AnloGames 2023-08-18 16:50:18 +03:00
• e6c976f230 fix Content.mgcb origin/Doors Lev 2023-08-18 16:42:01 +03:00
• e587ee34ef StartRestart Timofey06 2023-08-18 16:37:59 +03:00
• 0640be52da fix conflicts Lev 2023-08-18 16:20:39 +03:00
• 38b07b87a9 Diamond_Version 1.0 origin/Diamond Lev 2023-08-18 15:55:53 +03:00
• c4de6406c3 AddedTeleportingDoors Timofey06 2023-08-18 15:38:04 +03:00
• 0bedfaf39d переписал костыльную программу тимофея по мак Lev 2023-08-18 15:31:22 +03:00
• 19685a26d9 Merge branch 'main' into FrankBalls Kaktus200020 2023-08-18 15:11:17 +03:00
• 9b2a57cd85 Merge branch 'main' into livingEntitiesVlad N4K 2023-08-18 15:10:36 +03:00
• 2cb30ab0f3 NiceBalls Kaktus200020 2023-08-18 14:54:00 +03:00
• 1c56378003 abstract Target add N4K 2023-08-18 14:49:32 +03:00
• 93e948ac42 fixed hud bmvolf 2023-08-18 14:00:22 +03:00
• 4a24a75399 Merge branch 'particlesBranch' bmvolf 2023-08-18 13:57:41 +03:00
• de705f7fb6 Merge branch 'main' of https://github.com/progtime-net/DangerousD AnloGames 2023-08-18 14:37:04 +03:00
• 41d616d7f5 map to lvl AnloGames 2023-08-18 14:36:57 +03:00
• 221f5f15a2 Merge branch 'NetworkLivingEntitiesSupport' AnloGames 2023-08-18 14:26:07 +03:00
• 0f0c553758 Merge branch 'main' into ui_new SergoDobro 2023-08-18 13:57:24 +03:00
• 323932e945 Prepare for Merge MARKPRO44 2023-08-18 13:54:31 +03:00
• 5bd2b7d93b started vertical shoot bmvolf 2023-08-18 13:53:18 +03:00