salmon-engine-projects/shadow-over-bishkek001
14
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
211 Commits 27 Branches 0 Tags
0db76cb793d8dc68011d26d726ec423fcff8e743
Commit Graph
66 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
maka70vv 0db76cb793 prepare final room logic 2025-03-03 07:51:10 +06:00
maka70vv 19c2f62ba9 switching to third room 2025-03-03 07:39:12 +06:00
maka70vv 5e7c274645 trying to make battery dialog 2025-03-03 07:22:03 +06:00
maka70vv 112be9bb0c not worked battery dialog windows 2025-03-03 07:13:31 +06:00
maka70vv 0e862e7a61 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel 2025-03-03 06:49:24 +06:00
maka70vv 644983408e dialogs 2025-03-03 06:49:02 +06:00
maka70vv c153f2fe61 added dialog screen 2025-03-03 06:28:24 +06:00
maka70vv 07364460c3 worked version of lamp 2025-03-03 06:07:34 +06:00
maka70vv 86523fa5bb prepared to integrate dialog 2025-03-03 05:51:14 +06:00
maka70vv 5c0b7f9761 unworked logic for lamp 2025-03-03 05:34:48 +06:00
maka70vv 7fa4a74ef0 resolved conflicts 2025-03-03 05:19:44 +06:00
maka70vv 146644b3db adding battery to the lamp 2025-03-03 04:53:37 +06:00
maka70vv d0c49843af lampe obj 2025-03-03 04:27:57 +06:00
maka70vv cac687a2d2 lampe obj 2025-03-03 04:27:36 +06:00
maka70vv 7c5ef50f9b script if name uncorrect 2025-03-03 03:47:59 +06:00
maka70vv 6b9b670373 updated highlited position 2025-03-03 03:33:55 +06:00
maka70vv 45334c77f7 removing object if added to inventory 2025-03-03 02:53:43 +06:00
maka70vv 2d21324743 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel 2025-03-03 01:45:47 +06:00
maka70vv 8d61db9558 second room object 2025-03-03 01:45:38 +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
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
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
maka70vv c39eac4241 adding cubes in inventory map ifuncorrect name 2025-03-02 22:43:07 +06: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
maka70vv 91e9a3a3a8 resolvig conflicts 2025-03-02 21:57:30 +06:00
maka70vv ebf292d993 started first level logic 2025-03-02 21:55:27 +06:00
maka70vv cc5401201d Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel 2025-03-02 21:52:59 +06:00
maka70vv daf0991f0b Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel 2025-03-02 21:38:34 +06:00
maka70vv 1229e61702 scaling inventory obj 2025-03-02 19:42:03 +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
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
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
maka70vv 70f30b8b3a not worked version of inventory choosing 2025-03-02 16:48:31 +06:00
maka70vv d79a684868 Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into pavel 2025-03-02 15:41:05 +06: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
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
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
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
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
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
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
maka70vv f5cf579115 added inventory logic 2025-03-01 17:08:49 +06:00