 Vladislav Khorev
|
f7c9c0c31f
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-03 03:45:36 +03:00 |
|
|
Vladislav Khorev
|
2e257e8abe
|
Windows Release settings
|
2025-03-03 03:45:07 +03:00 |
|
 Pavel Makarov
|
f93a8586ae
|
Merge pull request #41 from mephi1984/pavel
Pavel
|
2025-03-03 06:29:18 +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 |
|
 Albrut
|
31353179e5
|
Merge pull request #38 from mephi1984/Albert
added lighter and scale
|
2025-03-03 05:14:25 +06:00 |
|
 albrut
|
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 |
|
|
Albrut
|
271ceadd66
|
Merge pull request #37 from mephi1984/Albert
Albert
|
2025-03-03 04:33:10 +06:00 |
|
|
albrut
|
15db2b3006
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-03 04:32:23 +06:00 |
|
|
albrut
|
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 |
|
|
albrut
|
928b87cb6e
|
deleted music that is not useful
|
2025-03-03 04:27:03 +06:00 |
|
|
albrut
|
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 |
|
|
albrut
|
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 |
|
|
albrut
|
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 |
|
|
maka70vv
|
7c5ef50f9b
|
script if name uncorrect
|
2025-03-03 03:47:59 +06:00 |
|
|
Albrut
|
bbd29ea310
|
Merge pull request #32 from mephi1984/Albert
added collision for second room buit not enough
|
2025-03-03 03:44:27 +06:00 |
|
|
albrut
|
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
|
ebe58e5488
|
Merge pull request #31 from mephi1984/pavel
Pavel
|
2025-03-03 02:56:41 +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 |
|
|
Albrut
|
895a947a60
|
Merge pull request #30 from mephi1984/Albert
Albert
|
2025-03-03 02:49:38 +06:00 |
|
|
albrut
|
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 |
|
|
albrut
|
73eee0525c
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-03 01:45:47 +06:00 |
|
|
maka70vv
|
8d61db9558
|
second room object
|
2025-03-03 01:45:38 +06:00 |
|
|
Vladislav Khorev
|
6a4fb6390a
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-02 22:44:30 +03:00 |
|
|
Vladislav Khorev
|
769854ac84
|
Added monster
|
2025-03-02 22:44:12 +03:00 |
|
|
albrut
|
82307f56e4
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-03 01:41:52 +06:00 |
|
|
albrut
|
f972b840a6
|
added one cube in first room
|
2025-03-03 01:41:36 +06:00 |
|
|
maka70vv
|
24eecbec3b
|
added inventory icon to objects
|
2025-03-03 01:27:09 +06:00 |
|
|
maka70vv
|
2e73c41519
|
added inventory icon to objects
|
2025-03-03 01:25:41 +06:00 |
|
|
Pavel Makarov
|
29f4a43f09
|
Merge pull request #29 from mephi1984/pavel
added timer
|
2025-03-03 01:10:05 +06:00 |
|
|
maka70vv
|
6c576510b7
|
added timer
|
2025-03-03 01:08:59 +06:00 |
|
|
Vladislav Khorev
|
32b2acf739
|
added second room, fix bugs
|
2025-03-02 21:51:29 +03:00 |
|
|
Vladislav Khorev
|
e91bf4b35f
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-02 21:29:45 +03:00 |
|
|
Vladislav Khorev
|
1bb131ecd2
|
fffff
|
2025-03-02 21:29:33 +03:00 |
|
|
Pavel Makarov
|
87caae43cc
|
Merge pull request #28 from mephi1984/pavel
Pavel
|
2025-03-03 00:22:48 +06:00 |
|
|
maka70vv
|
650927498c
|
fixed cubs sorting
|
2025-03-03 00:22:14 +06:00 |
|
|
Pavel Makarov
|
b51ef1f983
|
Merge pull request #27 from mephi1984/pavel
Pavel
|
2025-03-03 00:01:27 +06:00 |
|