Commit Graph

228 Commits

Author SHA1 Message Date
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
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
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
Vladislav Khorev
2a16970cde Fixing animation bugs 2025-03-01 19:44:15 +03:00
maka70vv
243dd61209 fixed default room size 2025-03-01 22:30:39 +06:00
maka70vv
1bf6d3f0b1 bugged room from class 2025-03-01 22:30:39 +06:00
Albrut
5221b3a689
Merge pull request #9 from mephi1984/Albert
added mouse handling
2025-03-01 22:16:38 +06:00
2d0c7ec166 added mouse handling 2025-03-01 22:14:33 +06:00
Albrut
4c397eb3d0
Merge pull request #8 from mephi1984/Albert
Albert
2025-03-01 21:44:44 +06:00
4271ef556d Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert 2025-03-01 21:43:54 +06:00
55133bbd87 fully refactored main.cpp 2025-03-01 21:43:31 +06:00
51a1cc742c refacored some parts of main.cpp 2025-03-01 21:33:34 +06:00
Albrut
60380ee733
Merge pull request #7 from mephi1984/Albert
Albert
2025-03-01 21:19:28 +06:00
b1954fd334 refacored some parts of main.cpp 2025-03-01 21:13:53 +06:00
641efaf582 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert 2025-03-01 20:54:15 +06:00
dbffcf5f04 refacored some parts of main.sh 2025-03-01 20:53:11 +06:00
b6684f7929 refactored 2025-03-01 19:22:19 +06:00
0c431f9c08 Merge branch 'Albert' of github.com:mephi1984/ZeptoLabTest1 into Albert 2025-03-01 19:19:09 +06:00
e2af375aa0 starting refactoring main.cpp 2025-03-01 19:18:42 +06:00
666bfc1b37 added sh file for start in linux 2025-03-01 19:16:26 +06:00
Albrut
436cf015a1
Merge pull request #5 from mephi1984/Albert
Albert
2025-03-01 19:08:30 +06:00
b27b4adab3 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert 2025-03-01 19:07:06 +06:00
613d809b43 deleted buttons for testing 2025-03-01 19:06:42 +06:00
880caecd97 added inventory testing buttons I to add items O to delete last items in inventory and p to get info about inventory 2025-03-01 19:04:49 +06:00
Albrut
7dd2816409
Merge pull request #4 from mephi1984/Albert
Albert
2025-03-01 18:40:53 +06:00
a8ab5015b9 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Abert 2025-03-01 18:34:36 +06:00
27ecda3124 added sounds and music in main cpp by cliking wasd or arrow will play sound of steps and music in setup start playing 2025-03-01 18:20:50 +06:00
Albrut
43dd93a802
Merge pull request #3 from mephi1984/Abert
added sounds by clicking on button and changed script to compile
2025-03-01 18:04:30 +06:00
bed5ae7a40 added sounds by clicking on button and changed script to compile 2025-03-01 18:01:24 +06:00
Vladislav Khorev
b5877a488d Project windows 2025-03-01 14:53:47 +03:00
Vladislav Khorev
3fa844ddb9 missing textures 2025-03-01 14:39:23 +03:00
Albrut
7249f30b71
Merge pull request #2 from mephi1984/Abert
Abert
2025-03-01 17:28:17 +06:00
d9038fee44 added sounds library 2025-03-01 17:26:04 +06:00
098f2b4005 added sounds library 2025-03-01 17:19:38 +06:00
Pavel Makarov
69a03cf524
Merge pull request #1 from mephi1984/pavel
added inventory logic
2025-03-01 17:09:45 +06:00
Vladislav Khorev
c6b8a52c6d Adding active objects 2025-03-01 14:09:28 +03:00