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 |
|
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 |
|
Albrut
|
2a9149c746
|
Merge pull request #25 from mephi1984/Albert
added collision for first room
|
2025-03-02 23:55:36 +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
|
526efb217e
|
cubes positioning
|
2025-03-02 23:32:39 +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 |
|
maka70vv
|
cc5401201d
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel
|
2025-03-02 21:52:59 +06:00 |
|
Vladislav Khorev
|
ed11b23d24
|
added file texture
|
2025-03-02 18:52:29 +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 |
|
Albrut
|
568384658e
|
Merge pull request #24 from mephi1984/Albert
kolliziya dobavlena
|
2025-03-02 19:20:42 +06:00 |
|
|
|
c31139fdec
|
kolliziya dobavlena
|
2025-03-02 19:19:15 +06:00 |
|
Vladislav Khorev
|
54d0af8afb
|
fff
|
2025-03-02 15:46:53 +03:00 |
|
Vladislav Khorev
|
322d83de9d
|
Shader
|
2025-03-02 15:46:20 +03:00 |
|
Pavel Makarov
|
4e070d3d04
|
Merge pull request #23 from mephi1984/pavel
fixed freezing in second scene
|
2025-03-02 18:43:31 +06:00 |
|
maka70vv
|
383b34f5d6
|
fixed freezing in second scene
|
2025-03-02 18:42:31 +06:00 |
|
Pavel Makarov
|
a568d3d0da
|
Merge pull request #22 from mephi1984/pavel
Pavel
|
2025-03-02 18:38:08 +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 |
|
Albrut
|
7e448812e2
|
Merge pull request #21 from mephi1984/Albert
Albert
|
2025-03-02 18:24:00 +06:00 |
|
|
|
2ae62fbc07
|
Merge branch 'Albert' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-02 18:23:23 +06:00 |
|
|
|
f8b25e581b
|
linux shadres
|
2025-03-02 18:21:50 +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 |
|
Vladislav Khorev
|
d414505d15
|
Make hole
|
2025-03-02 14:33:54 +03:00 |
|
|
|
1ac4c51a5d
|
hotkesy for items
|
2025-03-02 17:33:30 +06:00 |
|
maka70vv
|
a6a275a934
|
moving active inventory object
|
2025-03-02 17:30:55 +06:00 |
|
