|
|
c39c9e8a35
|
added collision for second room for basement entering
|
2025-03-03 03:56:18 +06:00 |
|
|
|
0ec18bac20
|
added collision for second room buit not enough
|
2025-03-03 03:43:34 +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 |
|
|
|
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 |
|
|
|
82307f56e4
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-03 01:41:52 +06:00 |
|
|
|
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 |
|
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 |
|
maka70vv
|
650927498c
|
fixed cubs sorting
|
2025-03-03 00:22:14 +06:00 |
|
maka70vv
|
6d38a9e914
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel
|
2025-03-03 00:01:09 +06:00 |
|
maka70vv
|
5ebc68043e
|
finished level 1 without timer
|
2025-03-03 00:00:26 +06:00 |
|
|
|
f7de370212
|
added collision for first room
|
2025-03-02 23:54:04 +06:00 |
|
maka70vv
|
cc38d52f6c
|
resolved conflicts
|
2025-03-02 23:38:07 +06:00 |
|
maka70vv
|
e8e4dc9b28
|
draw cubes
|
2025-03-02 23:19:15 +06:00 |
|
Vladislav Khorev
|
a3075433f0
|
Move collision box and model to the room itself
|
2025-03-02 19:58:38 +03:00 |
|
maka70vv
|
c39eac4241
|
adding cubes in inventory map ifuncorrect name
|
2025-03-02 22:43:07 +06:00 |
|
Vladislav Khorev
|
fe5d8c2f47
|
working with collisions
|
2025-03-02 19:32:10 +03:00 |
|
maka70vv
|
4f2741765b
|
finished cubes logic
|
2025-03-02 22:30:13 +06:00 |
|
maka70vv
|
ede7597acb
|
finished cubes logic
|
2025-03-02 22:28:52 +06:00 |
|
|
|
5c571578dd
|
da
|
2025-03-02 22:09:25 +06:00 |
|
maka70vv
|
91e9a3a3a8
|
resolvig conflicts
|
2025-03-02 21:57:30 +06:00 |
|
|
|
0aff255379
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-02 21:56:44 +06:00 |
|
maka70vv
|
ebf292d993
|
started first level logic
|
2025-03-02 21:55:27 +06:00 |
|
|
|
a580afb8b9
|
trying to resolve conflicts
|
2025-03-02 21:54:32 +06:00 |
|
Vladislav Khorev
|
9012986f9d
|
Added loading
|
2025-03-02 18:53:27 +03:00 |
|
|
|
60b610d111
|
kolliziya dobavlena 2 krovat
|
2025-03-02 21:46:38 +06:00 |
|
maka70vv
|
daf0991f0b
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel
|
2025-03-02 21:38:34 +06:00 |
|
Vladislav Khorev
|
01e6b0e355
|
Working with music
|
2025-03-02 18:11:29 +03:00 |
|
Vladislav Khorev
|
b3efd62229
|
Merge
|
2025-03-02 17:00:32 +03:00 |
|
Vladislav Khorev
|
c281070ff6
|
Music to separated thread
|
2025-03-02 16:54:20 +03:00 |
|
maka70vv
|
1229e61702
|
scaling inventory obj
|
2025-03-02 19:42:03 +06:00 |
|
|
|
c31139fdec
|
kolliziya dobavlena
|
2025-03-02 19:19:15 +06:00 |
|
maka70vv
|
383b34f5d6
|
fixed freezing in second scene
|
2025-03-02 18:42:31 +06:00 |
|
maka70vv
|
cfc96f645e
|
fixed inventory choosing
|
2025-03-02 18:37:37 +06:00 |
|
maka70vv
|
512e912471
|
resolved conflicts
|
2025-03-02 18:25:55 +06:00 |
|
|
|
2ae62fbc07
|
Merge branch 'Albert' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-02 18:23:23 +06:00 |
|
maka70vv
|
103c43eba1
|
select inventory 1-9
|
2025-03-02 18:19:25 +06:00 |
|
maka70vv
|
aa84fa0823
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel
|
2025-03-02 18:12:59 +06:00 |
|
Vladislav Khorev
|
9f75e3ad60
|
fixing hole bugs, merge
|
2025-03-02 14:51:24 +03:00 |
|
Vladislav Khorev
|
0fc6b483d1
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-02 14:34:11 +03:00 |
|
