Commit Graph

Select branches

Hide Pull Requests

ShipSpawn

android

camera

camera2

develop2

emscription

escape001

fix/bullet-box-collision

linux

main

mephi1984

music-bar

network

new_cmake

planet-deep

sergey

spark

witcher001

witcher001-cutscene

witcher001-path

withcher001-items

Mono Color

• 7c9e75b629
  Merge pull request #43 from mephi1984/pavel Pavel Makarov 2025-03-03 07:22:37 +0600
• 5e7c274645 trying to make battery dialog maka70vv 2025-03-03 07:22:03 +0600
• 112be9bb0c not worked battery dialog windows maka70vv 2025-03-03 07:13:31 +0600
• 7951e6ab80 added 3 room and button to move to next rom Альберт Гадиев 2025-03-03 06:52:20 +0600
• 3453c9780e
  Merge pull request #42 from mephi1984/pavel Pavel Makarov 2025-03-03 06:50:53 +0600
• 0e862e7a61 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-03 06:49:24 +0600
• 644983408e dialogs maka70vv 2025-03-03 06:49:02 +0600
• f7c9c0c31f Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-03 03:45:36 +0300
• 2e257e8abe Windows Release settings Vladislav Khorev 2025-03-03 03:45:07 +0300
• f93a8586ae
  Merge pull request #41 from mephi1984/pavel Pavel Makarov 2025-03-03 06:29:18 +0600
• c153f2fe61 added dialog screen maka70vv 2025-03-03 06:28:24 +0600
• 07364460c3 worked version of lamp maka70vv 2025-03-03 06:07:34 +0600
• 86523fa5bb prepared to integrate dialog maka70vv 2025-03-03 05:51:14 +0600
• 5c0b7f9761 unworked logic for lamp maka70vv 2025-03-03 05:34:48 +0600
• 7fa4a74ef0 resolved conflicts maka70vv 2025-03-03 05:19:44 +0600
• 31353179e5
  Merge pull request #38 from mephi1984/Albert Albrut 2025-03-03 05:14:25 +0600
• 80d003e9b2 added lighter and scale Альберт Гадиев 2025-03-03 05:12:28 +0600
• 146644b3db adding battery to the lamp maka70vv 2025-03-03 04:53:37 +0600
• 271ceadd66
  Merge pull request #37 from mephi1984/Albert Albrut 2025-03-03 04:33:10 +0600
• 15db2b3006 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-03 04:32:23 +0600
• 836e58f634 added test object and scale car toy Альберт Гадиев 2025-03-03 04:31:59 +0600
• d0c49843af lampe obj maka70vv 2025-03-03 04:27:57 +0600
• b9bd0648ab
  Merge pull request #36 from mephi1984/Albert Albrut 2025-03-03 04:27:43 +0600
• cac687a2d2 lampe obj maka70vv 2025-03-03 04:27:36 +0600
• 928b87cb6e deleted music that is not useful Альберт Гадиев 2025-03-03 04:27:03 +0600
• 5f5fe2ade5 added musics for rooms Альберт Гадиев 2025-03-03 04:25:36 +0600
• d062bf472c
  Merge pull request #35 from mephi1984/Albert Albrut 2025-03-03 04:08:25 +0600
• 1e030e9d3a added collision for second room for car toy Альберт Гадиев 2025-03-03 04:07:20 +0600
• d6c01368d7
  Merge pull request #34 from mephi1984/Albert Albrut 2025-03-03 03:57:03 +0600
• c39c9e8a35 added collision for second room for basement entering Альберт Гадиев 2025-03-03 03:56:18 +0600
• e89c70eddd
  Merge pull request #33 from mephi1984/pavel Pavel Makarov 2025-03-03 03:48:38 +0600
• 7c5ef50f9b script if name uncorrect maka70vv 2025-03-03 03:47:59 +0600
• bbd29ea310
  Merge pull request #32 from mephi1984/Albert Albrut 2025-03-03 03:44:27 +0600
• 0ec18bac20 added collision for second room buit not enough Альберт Гадиев 2025-03-03 03:43:34 +0600
• 6b9b670373 updated highlited position maka70vv 2025-03-03 03:33:55 +0600
• ebe58e5488
  Merge pull request #31 from mephi1984/pavel Pavel Makarov 2025-03-03 02:56:41 +0600
• b065669583
  Merge branch 'salmon' into pavel Pavel Makarov 2025-03-03 02:56:16 +0600
• 45334c77f7 removing object if added to inventory maka70vv 2025-03-03 02:53:43 +0600
• 895a947a60
  Merge pull request #30 from mephi1984/Albert Albrut 2025-03-03 02:49:38 +0600
• de2ffec17d added all cubes for first room Альберт Гадиев 2025-03-03 02:48:39 +0600
• 2d21324743 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-03 01:45:47 +0600
• 73eee0525c Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-03 01:45:47 +0600
• 8d61db9558 second room object maka70vv 2025-03-03 01:45:38 +0600
• 6a4fb6390a Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-02 22:44:30 +0300
• 769854ac84 Added monster Vladislav Khorev 2025-03-02 22:44:12 +0300
• 82307f56e4 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-03 01:41:52 +0600
• f972b840a6 added one cube in first room Альберт Гадиев 2025-03-03 01:41:36 +0600
• 24eecbec3b added inventory icon to objects maka70vv 2025-03-03 01:27:09 +0600
• 2e73c41519 added inventory icon to objects maka70vv 2025-03-03 01:25:41 +0600
• 29f4a43f09
  Merge pull request #29 from mephi1984/pavel Pavel Makarov 2025-03-03 01:10:05 +0600
• 6c576510b7 added timer maka70vv 2025-03-03 01:08:59 +0600
• 32b2acf739 added second room, fix bugs Vladislav Khorev 2025-03-02 21:51:29 +0300
• e91bf4b35f Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-02 21:29:45 +0300
• 1bb131ecd2 fffff Vladislav Khorev 2025-03-02 21:29:33 +0300
• 87caae43cc
  Merge pull request #28 from mephi1984/pavel Pavel Makarov 2025-03-03 00:22:48 +0600
• 650927498c fixed cubs sorting maka70vv 2025-03-03 00:22:14 +0600
• b51ef1f983
  Merge pull request #27 from mephi1984/pavel Pavel Makarov 2025-03-03 00:01:27 +0600
• 6d38a9e914 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-03 00:01:09 +0600
• 5ebc68043e finished level 1 without timer maka70vv 2025-03-03 00:00:26 +0600
• 2a9149c746
  Merge pull request #25 from mephi1984/Albert Albrut 2025-03-02 23:55:36 +0600
• f7de370212 added collision for first room Альберт Гадиев 2025-03-02 23:54:04 +0600
• cc38d52f6c resolved conflicts maka70vv 2025-03-02 23:38:07 +0600
• 526efb217e cubes positioning maka70vv 2025-03-02 23:32:39 +0600
• e8e4dc9b28 draw cubes maka70vv 2025-03-02 23:19:15 +0600
• a3075433f0 Move collision box and model to the room itself Vladislav Khorev 2025-03-02 19:58:38 +0300
• c39eac4241 adding cubes in inventory map ifuncorrect name maka70vv 2025-03-02 22:43:07 +0600
• fe5d8c2f47 working with collisions Vladislav Khorev 2025-03-02 19:32:10 +0300
• 4f2741765b finished cubes logic maka70vv 2025-03-02 22:30:13 +0600
• ede7597acb finished cubes logic maka70vv 2025-03-02 22:28:52 +0600
• 5c571578dd da Альберт Гадиев 2025-03-02 22:09:25 +0600
• 91e9a3a3a8 resolvig conflicts maka70vv 2025-03-02 21:57:30 +0600
• 0aff255379 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-02 21:56:44 +0600
• ebf292d993 started first level logic maka70vv 2025-03-02 21:55:27 +0600
• a580afb8b9 trying to resolve conflicts Альберт Гадиев 2025-03-02 21:54:32 +0600
• 9012986f9d Added loading Vladislav Khorev 2025-03-02 18:53:27 +0300
• cc5401201d Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-02 21:52:59 +0600
• ed11b23d24 added file texture Vladislav Khorev 2025-03-02 18:52:29 +0300
• 60b610d111 kolliziya dobavlena 2 krovat Альберт Гадиев 2025-03-02 21:46:38 +0600
• daf0991f0b Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-02 21:38:34 +0600
• 01e6b0e355 Working with music Vladislav Khorev 2025-03-02 18:11:29 +0300
• b3efd62229 Merge Vladislav Khorev 2025-03-02 17:00:32 +0300
• c281070ff6 Music to separated thread Vladislav Khorev 2025-03-02 16:54:20 +0300
• 1229e61702 scaling inventory obj maka70vv 2025-03-02 19:42:03 +0600
• 568384658e
  Merge pull request #24 from mephi1984/Albert Albrut 2025-03-02 19:20:42 +0600
• c31139fdec kolliziya dobavlena Альберт Гадиев 2025-03-02 19:19:15 +0600
• 54d0af8afb fff Vladislav Khorev 2025-03-02 15:46:53 +0300
• 322d83de9d Shader Vladislav Khorev 2025-03-02 15:46:20 +0300
• 4e070d3d04
  Merge pull request #23 from mephi1984/pavel Pavel Makarov 2025-03-02 18:43:31 +0600
• 383b34f5d6 fixed freezing in second scene maka70vv 2025-03-02 18:42:31 +0600
• a568d3d0da
  Merge pull request #22 from mephi1984/pavel Pavel Makarov 2025-03-02 18:38:08 +0600
• cfc96f645e fixed inventory choosing maka70vv 2025-03-02 18:37:37 +0600
• 512e912471 resolved conflicts maka70vv 2025-03-02 18:25:55 +0600
• 7e448812e2
  Merge pull request #21 from mephi1984/Albert Albrut 2025-03-02 18:24:00 +0600
• 2ae62fbc07 Merge branch 'Albert' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-02 18:23:23 +0600
• f8b25e581b linux shadres Альберт Гадиев 2025-03-02 18:21:50 +0600
• 103c43eba1 select inventory 1-9 maka70vv 2025-03-02 18:19:25 +0600
• aa84fa0823 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-02 18:12:59 +0600
• 9f75e3ad60 fixing hole bugs, merge Vladislav Khorev 2025-03-02 14:51:24 +0300
• 0fc6b483d1 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-02 14:34:11 +0300
• d414505d15 Make hole Vladislav Khorev 2025-03-02 14:33:54 +0300