Commit Graph

Select branches

Hide Pull Requests

ShipSpawn

android

android2

camera

camera2

demo2026-09-30

develop2

emscription

escape001

fix/bullet-box-collision

linux

main

mephi1984

music-bar

network

networking

new_cmake

planet-deep

release002

sergey

spark

tutorial-refactor

witcher001

witcher001-cutscene

witcher001-linux

witcher001-path

withcher001-items

Mono Color

• 60b71317ce works on browser NurgazievichR 2025-04-08 16:19:54 +06:00
• 946c5d784b working with shaders NurgazievichR 2025-04-08 12:46:25 +06:00
• a4d2b732aa base works on browser and laptop NurgazievichR 2025-04-07 17:58:33 +06:00
• 17d3b0ce2c test emcription Vlad 2025-03-28 16:37:05 +06:00
• f37c0ee9e6 loadfromfile bonesystem zip NurgazievichR 2025-03-18 16:49:46 +06:00
• 2797b9fd3a shader zip NurgazievichR 2025-03-18 15:40:55 +06:00
• a8689e8b58 Чтение bmp из zip файла NurgazievichR 2025-03-18 15:06:25 +06:00
• 4e9275fa88 -DAUDIO=1 параметр добавил NurgazievichR 2025-03-18 13:48:51 +06:00
• 2f9ab72258 Добавил Cmakelist, удалил ненужные файлы, запуск без аудио NurgazievichR 2025-03-17 21:09:52 +06:00
• 8e82e716c7 Update Readme.md Vladislav Khorev 2025-03-04 09:43:32 +03:00
• da7805ce0c Final version Vladislav Khorev 2025-03-03 07:58:27 +03:00
• f77a3fa4ad Fixing bugs Vladislav Khorev 2025-03-03 06:38:47 +03:00
• 5db648a99f Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon albrut 2025-03-03 08:30:46 +06:00
• 1938d987f9 fixed problem with texture albrut 2025-03-03 08:30:17 +06:00
• 56fee07553 Merge pull request #46 from mephi1984/pavel Pavel Makarov 2025-03-03 08:08:14 +06:00
• 24762e4d16 have fixed screen texture maka70vv 2025-03-03 08:07:34 +06:00
• 4dd60fb61e Merge pull request #45 from mephi1984/pavel Pavel Makarov 2025-03-03 08:04:20 +06:00
• 4e1d5859e2 Merge branch 'salmon' into pavel Pavel Makarov 2025-03-03 08:04:10 +06:00
• 1632549b48 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-03 05:04:01 +03:00
• b092ceaf14 Viola texture Vladislav Khorev 2025-03-03 05:03:42 +03:00
• a43b6ee04a super fucking final commit fulll nahui worked version maka70vv 2025-03-03 08:03:11 +06:00
• 4aa7545a7f added some objects in 3 room nut teksturka ne rabotaet albrut 2025-03-03 08:03:08 +06:00
• 4afecc431c Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-03 07:52:49 +06:00
• 0db76cb793 prepare final room logic maka70vv 2025-03-03 07:51:10 +06:00
• 6784a29086 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon albrut 2025-03-03 07:49:00 +06:00
• 7faccda488 added some objects in 3 room albrut 2025-03-03 07:48:22 +06:00
• 940d5d4339 Merge pull request #44 from mephi1984/pavel Pavel Makarov 2025-03-03 07:41:08 +06:00
• 19c2f62ba9 switching to third room maka70vv 2025-03-03 07:39:12 +06:00
• df9615e42a Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon albrut 2025-03-03 07:33:34 +06:00
• 6298761311 added 3 room and button to move to next rom albrut 2025-03-03 07:33:19 +06:00
• 7c9e75b629 Merge pull request #43 from mephi1984/pavel Pavel Makarov 2025-03-03 07:22:37 +06:00
• 5e7c274645 trying to make battery dialog maka70vv 2025-03-03 07:22:03 +06:00
• 112be9bb0c not worked battery dialog windows maka70vv 2025-03-03 07:13:31 +06:00
• 7951e6ab80 added 3 room and button to move to next rom albrut 2025-03-03 06:52:20 +06:00
• 3453c9780e Merge pull request #42 from mephi1984/pavel Pavel Makarov 2025-03-03 06:50:53 +06:00
• 0e862e7a61 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel maka70vv 2025-03-03 06:49:24 +06:00
• 644983408e dialogs maka70vv 2025-03-03 06:49:02 +06:00
• f7c9c0c31f Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon Vladislav Khorev 2025-03-03 03:45:36 +03:00
• 2e257e8abe Windows Release settings Vladislav Khorev 2025-03-03 03:45:07 +03:00
• f93a8586ae Merge pull request #41 from mephi1984/pavel Pavel Makarov 2025-03-03 06:29:18 +06:00
• c153f2fe61 added dialog screen maka70vv 2025-03-03 06:28:24 +06:00
• 07364460c3 worked version of lamp maka70vv 2025-03-03 06:07:34 +06:00
• 86523fa5bb prepared to integrate dialog maka70vv 2025-03-03 05:51:14 +06:00
• 5c0b7f9761 unworked logic for lamp maka70vv 2025-03-03 05:34:48 +06:00
• 7fa4a74ef0 resolved conflicts maka70vv 2025-03-03 05:19:44 +06:00
• 31353179e5 Merge pull request #38 from mephi1984/Albert Albrut 2025-03-03 05:14:25 +06:00
• 80d003e9b2 added lighter and scale albrut 2025-03-03 05:12:28 +06:00
• 146644b3db adding battery to the lamp maka70vv 2025-03-03 04:53:37 +06:00
• 271ceadd66 Merge pull request #37 from mephi1984/Albert Albrut 2025-03-03 04:33:10 +06:00
• 15db2b3006 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert albrut 2025-03-03 04:32:23 +06:00
• 836e58f634 added test object and scale car toy albrut 2025-03-03 04:31:59 +06:00
• d0c49843af lampe obj maka70vv 2025-03-03 04:27:57 +06:00
• b9bd0648ab Merge pull request #36 from mephi1984/Albert Albrut 2025-03-03 04:27:43 +06:00
• cac687a2d2 lampe obj maka70vv 2025-03-03 04:27:36 +06:00
• 928b87cb6e deleted music that is not useful albrut 2025-03-03 04:27:03 +06:00
• 5f5fe2ade5 added musics for rooms albrut 2025-03-03 04:25:36 +06:00
• d062bf472c Merge pull request #35 from mephi1984/Albert Albrut 2025-03-03 04:08:25 +06:00
• 1e030e9d3a added collision for second room for car toy albrut 2025-03-03 04:07:20 +06:00
• d6c01368d7 Merge pull request #34 from mephi1984/Albert Albrut 2025-03-03 03:57:03 +06:00
• c39c9e8a35 added collision for second room for basement entering albrut 2025-03-03 03:56:18 +06:00
• e89c70eddd Merge pull request #33 from mephi1984/pavel Pavel Makarov 2025-03-03 03:48:38 +06:00
• 7c5ef50f9b script if name uncorrect maka70vv 2025-03-03 03:47:59 +06:00
• bbd29ea310 Merge pull request #32 from mephi1984/Albert Albrut 2025-03-03 03:44:27 +06:00
• 0ec18bac20 added collision for second room buit not enough albrut 2025-03-03 03:43:34 +06:00
• 6b9b670373 updated highlited position maka70vv 2025-03-03 03:33:55 +06:00
• ebe58e5488 Merge pull request #31 from mephi1984/pavel Pavel Makarov 2025-03-03 02:56:41 +06:00
• b065669583 Merge branch 'salmon' into pavel Pavel Makarov 2025-03-03 02:56:16 +06:00
• 45334c77f7 removing object if added to inventory maka70vv 2025-03-03 02:53:43 +06:00
• 895a947a60 Merge pull request #30 from mephi1984/Albert Albrut 2025-03-03 02:49:38 +06:00
• de2ffec17d added all cubes for first room albrut 2025-03-03 02:48:39 +06:00
• 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