Vladislav Khorev
|
b092ceaf14
|
Viola texture
|
2025-03-03 05:03:42 +03:00 |
|
maka70vv
|
c153f2fe61
|
added dialog screen
|
2025-03-03 06:28:24 +06:00 |
|
maka70vv
|
86523fa5bb
|
prepared to integrate dialog
|
2025-03-03 05:51:14 +06:00 |
|
maka70vv
|
45334c77f7
|
removing object if added to inventory
|
2025-03-03 02:53:43 +06:00 |
|
Vladislav Khorev
|
769854ac84
|
Added monster
|
2025-03-02 22:44:12 +03:00 |
|
Vladislav Khorev
|
32b2acf739
|
added second room, fix bugs
|
2025-03-02 21:51:29 +03: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
|
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
|
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
|
70f30b8b3a
|
not worked version of inventory choosing
|
2025-03-02 16:48:31 +06:00 |
|
Pavel Makarov
|
6ea9276495
|
Merge branch 'salmon' into pavel
|
2025-03-02 13:47:25 +06:00 |
|
maka70vv
|
ac31c3bbf5
|
update rendering aictive objects as unordered_map
|
2025-03-02 13:40:12 +06:00 |
|
Vladislav Khorev
|
15697ebe67
|
Adding walking animation, fixing minor bugs
|
2025-03-02 09:29:31 +03:00 |
|
Vladislav Khorev
|
dc01bdf12e
|
mege
|
2025-03-02 07:41:47 +03:00 |
|
Vladislav Khorev
|
064d446aea
|
Finally animation
|
2025-03-02 07:37:51 +03:00 |
|
Pavel Makarov
|
37e2c489a8
|
Merge branch 'salmon' into pavel
|
2025-03-02 01:50:52 +06:00 |
|
maka70vv
|
378c9c6d6d
|
objects rendering by rooms
|
2025-03-02 01:49:16 +06:00 |
|
maka70vv
|
5d31d8421f
|
getting room texture by index
|
2025-03-02 00:51:39 +06:00 |
|
maka70vv
|
06cc639bb7
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-01 23:53:54 +06:00 |
|
maka70vv
|
74a2dc78a6
|
Fixing rooms
|
2025-03-01 23:52:55 +06:00 |
|
Vladislav Khorev
|
68b31cb197
|
merge
|
2025-03-01 20:14:56 +03:00 |
|
|
|
2d0c7ec166
|
added mouse handling
|
2025-03-01 22:14:33 +06:00 |
|
|
|
b1954fd334
|
refacored some parts of main.cpp
|
2025-03-01 21:13:53 +06:00 |
|
|
|
dbffcf5f04
|
refacored some parts of main.sh
|
2025-03-01 20:53:11 +06:00 |
|
