|
|
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 |
|
maka70vv
|
4ff416757f
|
getting selected inventory items
|
2025-03-02 17:16:22 +06:00 |
|
Albrut
|
37f0a6aa08
|
Merge pull request #19 from mephi1984/Albert
working code
|
2025-03-02 17:02:37 +06:00 |
|
|
|
929c5aade1
|
working code
|
2025-03-02 17:01:40 +06:00 |
|
Pavel Makarov
|
ebc63e6663
|
Merge pull request #18 from mephi1984/pavel
Pavel
|
2025-03-02 16:49:50 +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 |
|
Albrut
|
bdf721ac15
|
Merge pull request #17 from mephi1984/Albert
fixed the staying at the air
|
2025-03-02 16:31:22 +06:00 |
|
|
|
a15b74e7a9
|
fixed the staying at the air
|
2025-03-02 16:28:45 +06:00 |
|
Albrut
|
980b8133a8
|
Merge pull request #16 from mephi1984/Albert
Albert
|
2025-03-02 16:23:20 +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 |
|
Pavel Makarov
|
fa520b5df8
|
Merge pull request #15 from mephi1984/pavel
updated room mesh
|
2025-03-02 14:50:38 +06:00 |
|
maka70vv
|
8657301da0
|
updated room mesh
|
2025-03-02 14:49:26 +06:00 |
|
Pavel Makarov
|
f816b5ada8
|
Merge pull request #13 from mephi1984/pavel
Pavel
|
2025-03-02 13:47:32 +06:00 |
|
Pavel Makarov
|
6ea9276495
|
Merge branch 'salmon' into pavel
|
2025-03-02 13:47:25 +06:00 |
|
maka70vv
|
8b07b6cc3f
|
drawing hidden ui objects
|
2025-03-02 13:45:29 +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 |
|
Pavel Makarov
|
2c26c5c0b5
|
Merge pull request #12 from mephi1984/pavel
Pavel
|
2025-03-02 11:30:19 +06: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
|
d84e7904e6
|
missing file added
|
2025-03-02 08:23:47 +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 |
|
maka70vv
|
4fd09212dd
|
tested game logic
|
2025-03-02 10:01:05 +06:00 |
|
maka70vv
|
784da51a3f
|
inventory to unordered map
|
2025-03-02 09:55:56 +06:00 |
|
maka70vv
|
d46e5da520
|
added game logic class and lambda function for room
|
2025-03-02 09:41:54 +06:00 |
|
Pavel Makarov
|
b7f8a0f67a
|
Merge pull request #11 from mephi1984/pavel
Pavel
|
2025-03-02 03:10:39 +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
|
aef61e19b4
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-02 02:08:11 +06:00 |
|
maka70vv
|
a4aea4163a
|
music changing
|
2025-03-02 02:07:26 +06:00 |
|
Pavel Makarov
|
7616435e00
|
Merge pull request #10 from mephi1984/pavel
Pavel
|
2025-03-02 01:50:59 +06: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 |
|
