Commit Graph

128 Commits

Author SHA1 Message Date
NurgazievichR
60b71317ce works on browser 2025-04-08 16:19:54 +06:00
NurgazievichR
946c5d784b working with shaders 2025-04-08 12:46:25 +06:00
NurgazievichR
a4d2b732aa base works on browser and laptop 2025-04-07 17:58:33 +06:00
NurgazievichR
2f9ab72258 Добавил Cmakelist, удалил ненужные файлы, запуск без аудио 2025-03-17 21:09:52 +06:00
Vladislav Khorev
da7805ce0c Final version 2025-03-03 07:58:27 +03:00
5db648a99f Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon 2025-03-03 08:30:46 +06:00
1938d987f9 fixed problem with texture 2025-03-03 08:30:17 +06:00
maka70vv
24762e4d16 have fixed screen texture 2025-03-03 08:07:34 +06:00
Pavel Makarov
4dd60fb61e
Merge pull request #45 from mephi1984/pavel
Pavel
2025-03-03 08:04:20 +06:00
Pavel Makarov
4e1d5859e2
Merge branch 'salmon' into pavel 2025-03-03 08:04:10 +06:00
Vladislav Khorev
1632549b48 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon 2025-03-03 05:04:01 +03:00
Vladislav Khorev
b092ceaf14 Viola texture 2025-03-03 05:03:42 +03:00
maka70vv
a43b6ee04a super fucking final commit fulll nahui worked version 2025-03-03 08:03:11 +06:00
4aa7545a7f added some objects in 3 room nut teksturka ne rabotaet 2025-03-03 08:03:08 +06:00
maka70vv
4afecc431c Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel 2025-03-03 07:52:49 +06:00
maka70vv
0db76cb793 prepare final room logic 2025-03-03 07:51:10 +06:00
6784a29086 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon 2025-03-03 07:49:00 +06:00
7faccda488 added some objects in 3 room 2025-03-03 07:48:22 +06:00
Pavel Makarov
940d5d4339
Merge pull request #44 from mephi1984/pavel
switching to third room
2025-03-03 07:41:08 +06:00
maka70vv
19c2f62ba9 switching to third room 2025-03-03 07:39:12 +06:00
df9615e42a Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon 2025-03-03 07:33:34 +06:00
6298761311 added 3 room and button to move to next rom 2025-03-03 07:33:19 +06:00
Pavel Makarov
7c9e75b629
Merge pull request #43 from mephi1984/pavel
Pavel
2025-03-03 07:22:37 +06:00
maka70vv
5e7c274645 trying to make battery dialog 2025-03-03 07:22:03 +06:00
maka70vv
112be9bb0c not worked battery dialog windows 2025-03-03 07:13:31 +06:00
7951e6ab80 added 3 room and button to move to next rom 2025-03-03 06:52:20 +06:00
maka70vv
c153f2fe61 added dialog screen 2025-03-03 06:28:24 +06:00
maka70vv
07364460c3 worked version of lamp 2025-03-03 06:07:34 +06:00
maka70vv
86523fa5bb prepared to integrate dialog 2025-03-03 05:51:14 +06:00
maka70vv
5c0b7f9761 unworked logic for lamp 2025-03-03 05:34:48 +06:00
maka70vv
7fa4a74ef0 resolved conflicts 2025-03-03 05:19:44 +06:00
80d003e9b2 added lighter and scale 2025-03-03 05:12:28 +06:00
maka70vv
146644b3db adding battery to the lamp 2025-03-03 04:53:37 +06:00
15db2b3006 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert 2025-03-03 04:32:23 +06:00
836e58f634 added test object and scale car toy 2025-03-03 04:31:59 +06:00
maka70vv
d0c49843af lampe obj 2025-03-03 04:27:57 +06:00
Albrut
b9bd0648ab
Merge pull request #36 from mephi1984/Albert
Albert
2025-03-03 04:27:43 +06:00
maka70vv
cac687a2d2 lampe obj 2025-03-03 04:27:36 +06:00
5f5fe2ade5 added musics for rooms 2025-03-03 04:25:36 +06:00
Albrut
d062bf472c
Merge pull request #35 from mephi1984/Albert
added collision for second room for car toy
2025-03-03 04:08:25 +06:00
1e030e9d3a added collision for second room for car toy 2025-03-03 04:07:20 +06:00
Albrut
d6c01368d7
Merge pull request #34 from mephi1984/Albert
added collision for second room for basement entering
2025-03-03 03:57:03 +06:00
c39c9e8a35 added collision for second room for basement entering 2025-03-03 03:56:18 +06:00
Pavel Makarov
e89c70eddd
Merge pull request #33 from mephi1984/pavel
Pavel
2025-03-03 03:48:38 +06:00
0ec18bac20 added collision for second room buit not enough 2025-03-03 03:43:34 +06:00
maka70vv
6b9b670373 updated highlited position 2025-03-03 03:33:55 +06:00
Pavel Makarov
b065669583
Merge branch 'salmon' into pavel 2025-03-03 02:56:16 +06:00
maka70vv
45334c77f7 removing object if added to inventory 2025-03-03 02:53:43 +06:00
de2ffec17d added all cubes for first room 2025-03-03 02:48:39 +06:00
maka70vv
2d21324743 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel 2025-03-03 01:45:47 +06:00