|
|
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 |
|
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
|
4ff416757f
|
getting selected inventory items
|
2025-03-02 17:16:22 +06:00 |
|
|
|
929c5aade1
|
working code
|
2025-03-02 17:01:40 +06:00 |
|
Pavel Makarov
|
d35547560e
|
Merge branch 'salmon' into pavel
|
2025-03-02 16:49:35 +06:00 |
|
maka70vv
|
70f30b8b3a
|
not worked version of inventory choosing
|
2025-03-02 16:48:31 +06:00 |
|
|
|
a15b74e7a9
|
fixed the staying at the air
|
2025-03-02 16:28:45 +06:00 |
|
|
|
527315e976
|
now she stays on the ground i think
|
2025-03-02 16:21:42 +06:00 |
|
maka70vv
|
d79a684868
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel
|
2025-03-02 15:41:05 +06:00 |
|
|
|
6fd0fc5868
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-02 15:34:00 +06:00 |
|
|
|
fe88d27632
|
added first room
|
2025-03-02 15:33:45 +06:00 |
|
Vladislav Khorev
|
87032466ac
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-02 12:17:56 +03:00 |
|
Vladislav Khorev
|
aac2e84ad6
|
Change mouse logic
|
2025-03-02 12:13:04 +03:00 |
|
maka70vv
|
b94bebdf0d
|
updated inventory scale
|
2025-03-02 15:11:45 +06:00 |
|
maka70vv
|
8657301da0
|
updated room mesh
|
2025-03-02 14:49:26 +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
|
a8a3b04b09
|
merge
|
2025-03-02 09:37:49 +03:00 |
|
Vladislav Khorev
|
15697ebe67
|
Adding walking animation, fixing minor bugs
|
2025-03-02 09:29:31 +03:00 |
|
maka70vv
|
8e5e96e3ee
|
resolving conflicts by merge
|
2025-03-02 11:28:16 +06:00 |
|
maka70vv
|
6c25d1f06b
|
active objects to unordered map
|
2025-03-02 11:25:42 +06: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 |
|
maka70vv
|
d46e5da520
|
added game logic class and lambda function for room
|
2025-03-02 09:41:54 +06:00 |
|
maka70vv
|
1e3be66495
|
removing object from map after adding to inventory
|
2025-03-02 03:10:01 +06:00 |
|
maka70vv
|
eb0bae44aa
|
adding inventory
|
2025-03-02 03:00:50 +06:00 |
|
maka70vv
|
a4aea4163a
|
music changing
|
2025-03-02 02:07:26 +06:00 |
|
maka70vv
|
378c9c6d6d
|
objects rendering by rooms
|
2025-03-02 01:49:16 +06:00 |
|
maka70vv
|
22ad0ebf98
|
tested room switching
|
2025-03-02 01:01:10 +06:00 |
|
maka70vv
|
5d31d8421f
|
getting room texture by index
|
2025-03-02 00:51:39 +06:00 |
|
maka70vv
|
74a2dc78a6
|
Fixing rooms
|
2025-03-01 23:52:55 +06: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 |
|
