Commit graph

  • 38257457a9 StartSomething polten0 2023-08-17 11:18:22 +03:00
  • 0ad20e3638 Merge branch 'main' into livingEntitiesVlad N4K 2023-08-17 11:12:57 +03:00
  • f7ef5e835b FixErrorsInGraficDelegate Timofey06 2023-08-17 11:11:23 +03:00
  • 590540ab61 FixDelegateInGraficComponent Timofey06 2023-08-17 11:08:05 +03:00
  • 4d61e90c30 FixGraficDelegate Timofey06 2023-08-17 11:03:16 +03:00
  • 1ef6e71ab6 Merge branch 'livingEntities' bmvolf 2023-08-17 11:01:02 +03:00
  • 68b7481813 edited animations bmvolf 2023-08-17 10:56:50 +03:00
  • a2fc6a5db4 StartSilasMaster Timofey06 2023-08-17 10:53:35 +03:00
  • a70a221d49 Merge branch 'livingEntities' into livingEntitiesVlad N4K 2023-08-17 10:47:55 +03:00
  • a12a7bad36 settings manager SergoDobro 2023-08-17 10:43:49 +03:00
  • 39848a42ce Merge branch 'main' into livingEntities bmvolf 2023-08-17 10:43:22 +03:00
  • d6b4366b66 animation1 deleted(megakryto) N4K 2023-08-17 10:41:11 +03:00
  • 7cb3a13280 animation1 deleted bmvolf 2023-08-17 10:33:49 +03:00
  • ab09c174cf Merge branch 'livingEntitiesVlad' into livingEntities bmvolf 2023-08-17 10:01:46 +03:00
  • 3533e2e9ba littleChanges N4K 2023-08-17 09:58:08 +03:00
  • 5e5cc3ef74 edited core enemy bmvolf 2023-08-17 09:56:55 +03:00
  • 634a986e70 minoryrefectlring SergoDobro 2023-08-17 02:08:34 +03:00
  • ced2895873 Fix rendering Mootfrost777 2023-08-17 02:00:34 +03:00
  • dca6928daf Merge branch 'ui' SergoDobro 2023-08-17 01:16:37 +03:00
  • b2755a3e69 minor fixes SergoDobro 2023-08-17 01:06:12 +03:00
  • f276bb16db checking sounds SergoDobro 2023-08-17 00:55:45 +03:00
  • eeae43ebe0 MapManager Fixes(still not working) Mootfrost777 2023-08-17 00:43:13 +03:00
  • 7b16ad9543 createAnimFiles polten0 2023-08-17 00:02:44 +03:00
  • 403572637a add animations(not all) and monsters(not all) N4K 2023-08-16 23:32:54 +03:00
  • 87878820af 100 commit! SergoDobro 2023-08-16 23:08:18 +03:00
  • e3c9630c83 Merge remote-tracking branch 'origin/ui' SergoDobro 2023-08-16 23:07:19 +03:00
  • 368d08cb41 BIG MapManager commit Mootfrost777 2023-08-16 23:06:13 +03:00
  • f4420ea93e OptionsGUI.v.1.1 origin/ui3 MARKPRO44 2023-08-16 22:56:10 +03:00
  • 44cf28c30a Merge branch 'main' of https://github.com/progtime-net/DangerousD SergoDobro 2023-08-16 21:52:55 +03:00
  • 48106c2bdf AddDelegateOfAnimetionsEnd Timofey06 2023-08-16 19:34:11 +03:00
  • 5d1800c90e menu background gravity 2023-08-16 19:31:15 +03:00
  • e7e18468f4 Merge branch 'main' into MapManager Mootfrost777 2023-08-16 19:29:16 +03:00
  • d0b09baca0 Add MapObjects Mootfrost777 2023-08-16 19:25:39 +03:00
  • d0442c2534 Merge branch 'main' of https://github.com/progtime-net/DangerousD Timofey06 2023-08-16 19:17:52 +03:00
  • 469050e4cd NewPeregruzkaDlyDraw Timofey06 2023-08-16 19:17:10 +03:00
  • 99fe39c2c5 SilasHand Timofey06 2023-08-16 18:50:58 +03:00
  • 306305e449 cool game name SergoDobro 2023-08-16 18:48:41 +03:00
  • 913403fdcb Merge branch 'main' of https://github.com/progtime-net/DangerousD Lev 2023-08-16 18:03:18 +03:00
  • d2bbdf5a49 Merge branch 'RayCast' Lev 2023-08-16 17:59:51 +03:00
  • 6dab4794b0 RayCast с одной перегрузкой Lev 2023-08-16 17:58:27 +03:00
  • 52743c1f89 add menuGUI gravity 2023-08-16 17:31:54 +03:00
  • ff46f3694a added death animation from zombie. zombie can walk between 2 points bmvolf 2023-08-16 17:21:45 +03:00
  • f02c513c32 OptionsGUI.V.1 MARKPRO44 2023-08-16 17:20:50 +03:00
  • 50edd04b14 ui gravity 2023-08-16 17:14:37 +03:00
  • 9f8e7bcbd4 minor naming fixes with network SergoDobro 2023-08-16 17:14:21 +03:00
  • dff21f0484 CreateRayCast Kaktus200020 2023-08-16 17:10:50 +03:00
  • 42ea9cffbb optionsGui merge MARKPRO44 2023-08-16 16:51:50 +03:00
  • c875c50407 NetworkManagerJsonMerge AnloGames 2023-08-16 16:50:26 +03:00
  • d147223eeb Merge branch 'NetworkJsonSupport' AnloGames 2023-08-16 16:49:40 +03:00
  • 75e40c2c23 Merge remote-tracking branch 'origin/ui' into ui3 MARKPRO44 2023-08-16 16:35:37 +03:00
  • de62568872 ui gravity 2023-08-16 16:19:07 +03:00
  • 48f89a72fd started options gui MARKPRO44 2023-08-16 16:01:34 +03:00
  • 82e4dcc1c4 added GameObject to OnCollision SergoDobro 2023-08-16 15:49:48 +03:00
  • 9e3c0f09ad fixed physics SergoDobro 2023-08-16 15:46:12 +03:00
  • e1c2565f34 Added MasterVolume origin/soundManager linuxfight 2023-08-16 15:33:56 +03:00
  • 3b79ff9baf Merge branch 'livingEntities' into livingEntitiesVlad N4K 2023-08-16 15:21:14 +03:00
  • 8713898e49 HappyNarezkaAnimations N4K 2023-08-16 15:14:37 +03:00
  • 5a5a24dffd minor changes and fixes, waiting for physics fix SergoDobro 2023-08-16 15:08:55 +03:00
  • ef5483a917 NetworkTask First Result AnloGames 2023-08-16 14:54:03 +03:00
  • a3b2fb2b81 minor changes during day SergoDobro 2023-08-16 14:48:44 +03:00
  • 5aa906a66b Merge remote-tracking branch 'origin/livingEntities' SergoDobro 2023-08-16 14:42:41 +03:00
  • 4fd28308f2 NetworkTask init AnloGames 2023-08-16 13:56:25 +03:00
  • 4925b11ab3 try to move enemy bmvolf 2023-08-16 13:36:57 +03:00
  • 8815d65e85 Merge branch 'livingEntitiesVlad' into livingEntities bmvolf 2023-08-16 13:24:33 +03:00
  • dd17d0148f monstersClasses N4K 2023-08-16 13:21:38 +03:00
  • 13a6f05475 merge fixes, minor monster fixes, physics to be remade very soon SergoDobro 2023-08-16 13:09:35 +03:00
  • 18d8ff814d Merge remote-tracking branch 'origin/livingEntitiesVlad' SergoDobro 2023-08-16 12:21:18 +03:00
  • e944a972d6 Merge remote-tracking branch 'origin/livingEntities' SergoDobro 2023-08-16 09:58:18 +03:00
  • 15f0571790 fixed errors zombie bmvolf 2023-08-16 09:54:15 +03:00
  • 7bdde33394 added PhysicsManager to gamemanager SergoDobro 2023-08-16 00:42:57 +03:00
  • fc4ce31703 Merge branch 'main' of https://github.com/progtime-net/DangerousD Lev 2023-08-15 19:32:58 +03:00
  • 39d7549255 Merge branch 'physics' Lev 2023-08-15 19:32:22 +03:00
  • 4a09635ff7 недоделанный RayCast с 1 перегрузкой Lev 2023-08-15 19:27:32 +03:00
  • e2f40e86ad added music functionality linuxfight 2023-08-15 18:52:35 +03:00
  • 4d8adebf69 wip N4K 2023-08-15 18:47:27 +03:00
  • ac1b3b6373 ended work on zombie bmvolf 2023-08-15 18:44:41 +03:00
  • 52fc0b31fa OptionsGUI_2 MARKPRO44 2023-08-15 18:39:00 +03:00
  • d65320f21b added zombie walk and attack animation bmvolf 2023-08-15 18:17:26 +03:00
  • 540f75734e OptionsGUI MARKPRO44 2023-08-15 18:15:37 +03:00
  • 01e60f9da4 Merge branch 'ui' of https://github.com/progtime-net/DangerousD into ui gravity 2023-08-15 17:47:46 +03:00
  • bb24f6d7e6 ui gravity 2023-08-15 17:47:33 +03:00
  • 980a377be3
    Merge pull request #3 from progtime-net/Lobby gravitymm 2023-08-15 17:46:05 +03:00
  • 81c5cf281b CreateLoginGUI polten0 2023-08-15 17:37:32 +03:00
  • 14a5b445a1 ui gravity 2023-08-15 17:31:55 +03:00
  • fb30b8628e JsonTaskInit AnloGames 2023-08-15 17:22:37 +03:00
  • 03e6f7b75d WIP bmvolf 2023-08-15 17:17:56 +03:00
  • f2a6cdbd8d wip bmvolf 2023-08-15 15:22:52 +03:00
  • cb9b3664a4 TestWorkingVersionOfAnimator Timofey06 2023-08-15 17:15:14 +03:00
  • 2d33e13283 LastOldWorkVersionOfAnimator Timofey06 2023-08-15 16:46:41 +03:00
  • 5f6be8e23c FixScaling Timofey06 2023-08-15 16:15:37 +03:00
  • 246e90c933 Methdos Add CheckCollision And OnCollision Kaktus200020 2023-08-15 15:54:29 +03:00
  • 463db1b00a Merge branch 'ui' gravity 2023-08-15 15:09:32 +03:00
  • 6938507926 ui gravity 2023-08-15 14:45:49 +03:00
  • ce23fb4793
    Merge pull request #2 from progtime-net/ui2 gravitymm 2023-08-15 14:38:14 +03:00
  • b423ac2b49 prepared for origin but no refactoring SergoDobro 2023-08-15 14:38:01 +03:00
  • f7cbebc457
    Merge branch 'ui' into ui2 gravitymm 2023-08-15 14:37:55 +03:00
  • e9547d04e0 ui gravity 2023-08-15 14:30:46 +03:00
  • 0ca55875c7 finishedFirstIterationOfLoginGUI polten0 2023-08-15 14:23:44 +03:00
  • 3e5e5192b8 day commit refactoring SergoDobro 2023-08-15 13:40:45 +03:00
  • 8b8ba7cacc AddLoginGUI2 polten0 2023-08-15 12:13:48 +03:00