22 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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