salmon-engine-projects/space-game001
14
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 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
  • 1ac4c51a5d hotkesy for items Альберт Гадиев 2025-03-02 17:33:30 +0600
  • a6a275a934 moving active inventory object maka70vv 2025-03-02 17:30:55 +0600
  • 4ff416757f getting selected inventory items maka70vv 2025-03-02 17:16:22 +0600
  • 37f0a6aa08
         Merge pull request #19 from mephi1984/Albert Albrut 2025-03-02 17:02:37 +0600
  • 929c5aade1 working code Альберт Гадиев 2025-03-02 17:01:40 +0600
  • ebc63e6663
         Merge pull request #18 from mephi1984/pavel Pavel Makarov 2025-03-02 16:49:50 +0600
  • d35547560e
         Merge branch 'salmon' into pavel Pavel Makarov 2025-03-02 16:49:35 +0600
  • 70f30b8b3a not worked version of inventory choosing maka70vv 2025-03-02 16:48:31 +0600
  • bdf721ac15
         Merge pull request #17 from mephi1984/Albert Albrut 2025-03-02 16:31:22 +0600
  • a15b74e7a9 fixed the staying at the air Альберт Гадиев 2025-03-02 16:28:45 +0600
  • 980b8133a8
         Merge pull request #16 from mephi1984/Albert Albrut 2025-03-02 16:23:20 +0600
  • 527315e976 now she stays on the ground i think Альберт Гадиев 2025-03-02 16:21:42 +0600
  • d79a684868 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-02 15:41:05 +0600
  • 6fd0fc5868 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert Альберт Гадиев 2025-03-02 15:34:00 +0600
  • fe88d27632 added first room Альберт Гадиев 2025-03-02 15:33:45 +0600
  • 87032466ac Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-02 12:17:56 +0300
  • aac2e84ad6 Change mouse logic Vladislav Khorev 2025-03-02 12:13:04 +0300
  • b94bebdf0d updated inventory scale maka70vv 2025-03-02 15:11:45 +0600
  • fa520b5df8
         Merge pull request #15 from mephi1984/pavel Pavel Makarov 2025-03-02 14:50:38 +0600
  • 8657301da0 updated room mesh maka70vv 2025-03-02 14:49:26 +0600
  • f816b5ada8
         Merge pull request #13 from mephi1984/pavel Pavel Makarov 2025-03-02 13:47:32 +0600
  • 6ea9276495
         Merge branch 'salmon' into pavel Pavel Makarov 2025-03-02 13:47:25 +0600
  • 8b07b6cc3f drawing hidden ui objects maka70vv 2025-03-02 13:45:29 +0600
  • ac31c3bbf5 update rendering aictive objects as unordered_map maka70vv 2025-03-02 13:40:12 +0600
  • a8a3b04b09 merge Vladislav Khorev 2025-03-02 09:37:49 +0300
  • 15697ebe67 Adding walking animation, fixing minor bugs Vladislav Khorev 2025-03-02 09:29:31 +0300
  • 2c26c5c0b5
         Merge pull request #12 from mephi1984/pavel Pavel Makarov 2025-03-02 11:30:19 +0600
  • 8e5e96e3ee resolving conflicts by merge maka70vv 2025-03-02 11:28:16 +0600
  • 6c25d1f06b active objects to unordered map maka70vv 2025-03-02 11:25:42 +0600
  • d84e7904e6 missing file added Vladislav Khorev 2025-03-02 08:23:47 +0300
  • dc01bdf12e mege Vladislav Khorev 2025-03-02 07:41:47 +0300
  • 064d446aea Finally animation Vladislav Khorev 2025-03-02 07:37:51 +0300
  • 4fd09212dd tested game logic maka70vv 2025-03-02 10:01:05 +0600
  • 784da51a3f inventory to unordered map maka70vv 2025-03-02 09:55:56 +0600
  • d46e5da520 added game logic class and lambda function for room maka70vv 2025-03-02 09:41:54 +0600
  • b7f8a0f67a
         Merge pull request #11 from mephi1984/pavel Pavel Makarov 2025-03-02 03:10:39 +0600
  • 1e3be66495 removing object from map after adding to inventory maka70vv 2025-03-02 03:10:01 +0600
  • eb0bae44aa adding inventory maka70vv 2025-03-02 03:00:50 +0600
  • aef61e19b4 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon maka70vv 2025-03-02 02:08:11 +0600
  • a4aea4163a music changing maka70vv 2025-03-02 02:07:26 +0600
  • 7616435e00
         Merge pull request #10 from mephi1984/pavel Pavel Makarov 2025-03-02 01:50:59 +0600
  • 37e2c489a8
         Merge branch 'salmon' into pavel Pavel Makarov 2025-03-02 01:50:52 +0600
  • 378c9c6d6d objects rendering by rooms maka70vv 2025-03-02 01:49:16 +0600
  • 22ad0ebf98 tested room switching maka70vv 2025-03-02 01:01:10 +0600
  • 5d31d8421f getting room texture by index maka70vv 2025-03-02 00:51:39 +0600