Commit Graph

Select branches

Hide Pull Requests

main

Mono Color

• 2d21324743 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-03 01:45:47 +06:00
• 73eee0525c Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert albrut 2025-03-03 01:45:47 +06:00
• 8d61db9558 second room object maka70vv 2025-03-03 01:45:38 +06:00
• 6a4fb6390a Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-02 22:44:30 +03:00
• 769854ac84 Added monster Vladislav Khorev 2025-03-02 22:44:12 +03:00
• 82307f56e4 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert albrut 2025-03-03 01:41:52 +06:00
• f972b840a6 added one cube in first room albrut 2025-03-03 01:41:36 +06:00
• 24eecbec3b added inventory icon to objects maka70vv 2025-03-03 01:27:09 +06:00
• 2e73c41519 added inventory icon to objects maka70vv 2025-03-03 01:25:41 +06:00
• 29f4a43f09 Merge pull request #29 from mephi1984/pavel Pavel Makarov 2025-03-03 01:10:05 +06:00
• 6c576510b7 added timer maka70vv 2025-03-03 01:08:59 +06:00
• 32b2acf739 added second room, fix bugs Vladislav Khorev 2025-03-02 21:51:29 +03:00
• e91bf4b35f Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-02 21:29:45 +03:00
• 1bb131ecd2 fffff Vladislav Khorev 2025-03-02 21:29:33 +03:00
• 87caae43cc Merge pull request #28 from mephi1984/pavel Pavel Makarov 2025-03-03 00:22:48 +06:00
• 650927498c fixed cubs sorting maka70vv 2025-03-03 00:22:14 +06:00
• b51ef1f983 Merge pull request #27 from mephi1984/pavel Pavel Makarov 2025-03-03 00:01:27 +06:00
• 6d38a9e914 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-03 00:01:09 +06:00
• 5ebc68043e finished level 1 without timer maka70vv 2025-03-03 00:00:26 +06:00
• 2a9149c746 Merge pull request #25 from mephi1984/Albert Albrut 2025-03-02 23:55:36 +06:00
• f7de370212 added collision for first room albrut 2025-03-02 23:54:04 +06:00
• cc38d52f6c resolved conflicts maka70vv 2025-03-02 23:38:07 +06:00
• 526efb217e cubes positioning maka70vv 2025-03-02 23:32:39 +06:00
• e8e4dc9b28 draw cubes maka70vv 2025-03-02 23:19:15 +06:00
• a3075433f0 Move collision box and model to the room itself Vladislav Khorev 2025-03-02 19:58:38 +03:00
• c39eac4241 adding cubes in inventory map ifuncorrect name maka70vv 2025-03-02 22:43:07 +06:00
• fe5d8c2f47 working with collisions Vladislav Khorev 2025-03-02 19:32:10 +03:00
• 4f2741765b finished cubes logic maka70vv 2025-03-02 22:30:13 +06:00
• ede7597acb finished cubes logic maka70vv 2025-03-02 22:28:52 +06:00
• 5c571578dd da albrut 2025-03-02 22:09:25 +06:00
• 91e9a3a3a8 resolvig conflicts maka70vv 2025-03-02 21:57:30 +06:00
• 0aff255379 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert albrut 2025-03-02 21:56:44 +06:00
• ebf292d993 started first level logic maka70vv 2025-03-02 21:55:27 +06:00
• a580afb8b9 trying to resolve conflicts albrut 2025-03-02 21:54:32 +06:00
• 9012986f9d Added loading Vladislav Khorev 2025-03-02 18:53:27 +03:00
• cc5401201d Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-02 21:52:59 +06:00
• ed11b23d24 added file texture Vladislav Khorev 2025-03-02 18:52:29 +03:00
• 60b610d111 kolliziya dobavlena 2 krovat albrut 2025-03-02 21:46:38 +06:00
• daf0991f0b Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-02 21:38:34 +06:00
• 01e6b0e355 Working with music Vladislav Khorev 2025-03-02 18:11:29 +03:00
• b3efd62229 Merge Vladislav Khorev 2025-03-02 17:00:32 +03:00
• c281070ff6 Music to separated thread Vladislav Khorev 2025-03-02 16:54:20 +03:00
• 1229e61702 scaling inventory obj maka70vv 2025-03-02 19:42:03 +06:00
• 568384658e Merge pull request #24 from mephi1984/Albert Albrut 2025-03-02 19:20:42 +06:00
• c31139fdec kolliziya dobavlena albrut 2025-03-02 19:19:15 +06:00
• 54d0af8afb fff Vladislav Khorev 2025-03-02 15:46:53 +03:00
• 322d83de9d Shader Vladislav Khorev 2025-03-02 15:46:20 +03:00
• 4e070d3d04 Merge pull request #23 from mephi1984/pavel Pavel Makarov 2025-03-02 18:43:31 +06:00
• 383b34f5d6 fixed freezing in second scene maka70vv 2025-03-02 18:42:31 +06:00
• a568d3d0da Merge pull request #22 from mephi1984/pavel Pavel Makarov 2025-03-02 18:38:08 +06:00
• cfc96f645e fixed inventory choosing maka70vv 2025-03-02 18:37:37 +06:00
• 512e912471 resolved conflicts maka70vv 2025-03-02 18:25:55 +06:00
• 7e448812e2 Merge pull request #21 from mephi1984/Albert Albrut 2025-03-02 18:24:00 +06:00
• 2ae62fbc07 Merge branch 'Albert' of github.com:mephi1984/ZeptoLabTest1 into Albert albrut 2025-03-02 18:23:23 +06:00
• f8b25e581b linux shadres albrut 2025-03-02 18:21:50 +06:00
• 103c43eba1 select inventory 1-9 maka70vv 2025-03-02 18:19:25 +06:00
• aa84fa0823 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-02 18:12:59 +06:00
• 9f75e3ad60 fixing hole bugs, merge Vladislav Khorev 2025-03-02 14:51:24 +03:00
• 0fc6b483d1 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-02 14:34:11 +03:00
• d414505d15 Make hole Vladislav Khorev 2025-03-02 14:33:54 +03:00
• 1ac4c51a5d hotkesy for items albrut 2025-03-02 17:33:30 +06:00
• a6a275a934 moving active inventory object maka70vv 2025-03-02 17:30:55 +06:00
• 4ff416757f getting selected inventory items maka70vv 2025-03-02 17:16:22 +06:00
• 37f0a6aa08 Merge pull request #19 from mephi1984/Albert Albrut 2025-03-02 17:02:37 +06:00
• 929c5aade1 working code albrut 2025-03-02 17:01:40 +06:00
• ebc63e6663 Merge pull request #18 from mephi1984/pavel Pavel Makarov 2025-03-02 16:49:50 +06:00
• d35547560e Merge branch 'salmon' into pavel Pavel Makarov 2025-03-02 16:49:35 +06:00
• 70f30b8b3a not worked version of inventory choosing maka70vv 2025-03-02 16:48:31 +06:00
• bdf721ac15 Merge pull request #17 from mephi1984/Albert Albrut 2025-03-02 16:31:22 +06:00
• a15b74e7a9 fixed the staying at the air albrut 2025-03-02 16:28:45 +06:00
• 980b8133a8 Merge pull request #16 from mephi1984/Albert Albrut 2025-03-02 16:23:20 +06:00
• 527315e976 now she stays on the ground i think albrut 2025-03-02 16:21:42 +06:00
• d79a684868 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-02 15:41:05 +06:00
• 6fd0fc5868 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert albrut 2025-03-02 15:34:00 +06:00
• fe88d27632 added first room albrut 2025-03-02 15:33:45 +06:00
• 87032466ac Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-02 12:17:56 +03:00
• aac2e84ad6 Change mouse logic Vladislav Khorev 2025-03-02 12:13:04 +03:00
• b94bebdf0d updated inventory scale maka70vv 2025-03-02 15:11:45 +06:00
• fa520b5df8 Merge pull request #15 from mephi1984/pavel Pavel Makarov 2025-03-02 14:50:38 +06:00
• 8657301da0 updated room mesh maka70vv 2025-03-02 14:49:26 +06:00
• f816b5ada8 Merge pull request #13 from mephi1984/pavel Pavel Makarov 2025-03-02 13:47:32 +06:00
• 6ea9276495 Merge branch 'salmon' into pavel Pavel Makarov 2025-03-02 13:47:25 +06:00
• 8b07b6cc3f drawing hidden ui objects maka70vv 2025-03-02 13:45:29 +06:00
• ac31c3bbf5 update rendering aictive objects as unordered_map maka70vv 2025-03-02 13:40:12 +06:00
• a8a3b04b09 merge Vladislav Khorev 2025-03-02 09:37:49 +03:00
• 15697ebe67 Adding walking animation, fixing minor bugs Vladislav Khorev 2025-03-02 09:29:31 +03:00
• 2c26c5c0b5 Merge pull request #12 from mephi1984/pavel Pavel Makarov 2025-03-02 11:30:19 +06:00
• 8e5e96e3ee resolving conflicts by merge maka70vv 2025-03-02 11:28:16 +06:00
• 6c25d1f06b active objects to unordered map maka70vv 2025-03-02 11:25:42 +06:00
• d84e7904e6 missing file added Vladislav Khorev 2025-03-02 08:23:47 +03:00
• dc01bdf12e mege Vladislav Khorev 2025-03-02 07:41:47 +03:00
• 064d446aea Finally animation Vladislav Khorev 2025-03-02 07:37:51 +03:00
• 4fd09212dd tested game logic maka70vv 2025-03-02 10:01:05 +06:00
• 784da51a3f inventory to unordered map maka70vv 2025-03-02 09:55:56 +06:00
• d46e5da520 added game logic class and lambda function for room maka70vv 2025-03-02 09:41:54 +06:00
• b7f8a0f67a Merge pull request #11 from mephi1984/pavel Pavel Makarov 2025-03-02 03:10:39 +06:00
• 1e3be66495 removing object from map after adding to inventory maka70vv 2025-03-02 03:10:01 +06:00
• eb0bae44aa adding inventory maka70vv 2025-03-02 03:00:50 +06:00
• aef61e19b4 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon maka70vv 2025-03-02 02:08:11 +06:00
• a4aea4163a music changing maka70vv 2025-03-02 02:07:26 +06:00