 albrut
|
5db648a99f
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-03 08:30:46 +06:00 |
|
|
albrut
|
1938d987f9
|
fixed problem with texture
|
2025-03-03 08:30:17 +06:00 |
|
|
albrut
|
4aa7545a7f
|
added some objects in 3 room nut teksturka ne rabotaet
|
2025-03-03 08:03:08 +06:00 |
|
|
albrut
|
6784a29086
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-03 07:49:00 +06:00 |
|
|
albrut
|
7faccda488
|
added some objects in 3 room
|
2025-03-03 07:48:22 +06:00 |
|
|
albrut
|
df9615e42a
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into salmon
|
2025-03-03 07:33:34 +06:00 |
|
|
albrut
|
6298761311
|
added 3 room and button to move to next rom
|
2025-03-03 07:33:19 +06:00 |
|
|
albrut
|
7951e6ab80
|
added 3 room and button to move to next rom
|
2025-03-03 06:52:20 +06:00 |
|
|
albrut
|
80d003e9b2
|
added lighter and scale
|
2025-03-03 05:12:28 +06:00 |
|
|
albrut
|
15db2b3006
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-03 04:32:23 +06:00 |
|
|
albrut
|
836e58f634
|
added test object and scale car toy
|
2025-03-03 04:31:59 +06:00 |
|
|
albrut
|
928b87cb6e
|
deleted music that is not useful
|
2025-03-03 04:27:03 +06:00 |
|
|
albrut
|
5f5fe2ade5
|
added musics for rooms
|
2025-03-03 04:25:36 +06:00 |
|
|
albrut
|
1e030e9d3a
|
added collision for second room for car toy
|
2025-03-03 04:07:20 +06:00 |
|
|
albrut
|
c39c9e8a35
|
added collision for second room for basement entering
|
2025-03-03 03:56:18 +06:00 |
|
|
albrut
|
0ec18bac20
|
added collision for second room buit not enough
|
2025-03-03 03:43:34 +06:00 |
|
|
albrut
|
de2ffec17d
|
added all cubes for first room
|
2025-03-03 02:48:39 +06:00 |
|
|
albrut
|
73eee0525c
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-03 01:45:47 +06:00 |
|
|
albrut
|
82307f56e4
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-03 01:41:52 +06:00 |
|
|
albrut
|
f972b840a6
|
added one cube in first room
|
2025-03-03 01:41:36 +06:00 |
|
|
albrut
|
f7de370212
|
added collision for first room
|
2025-03-02 23:54:04 +06:00 |
|
|
albrut
|
5c571578dd
|
da
|
2025-03-02 22:09:25 +06:00 |
|
|
albrut
|
0aff255379
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-02 21:56:44 +06:00 |
|
|
albrut
|
a580afb8b9
|
trying to resolve conflicts
|
2025-03-02 21:54:32 +06:00 |
|
|
albrut
|
60b610d111
|
kolliziya dobavlena 2 krovat
|
2025-03-02 21:46:38 +06:00 |
|
|
albrut
|
c31139fdec
|
kolliziya dobavlena
|
2025-03-02 19:19:15 +06:00 |
|
|
albrut
|
2ae62fbc07
|
Merge branch 'Albert' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-02 18:23:23 +06:00 |
|
|
albrut
|
f8b25e581b
|
linux shadres
|
2025-03-02 18:21:50 +06:00 |
|
|
albrut
|
1ac4c51a5d
|
hotkesy for items
|
2025-03-02 17:33:30 +06:00 |
|
|
albrut
|
929c5aade1
|
working code
|
2025-03-02 17:01:40 +06:00 |
|
|
albrut
|
a15b74e7a9
|
fixed the staying at the air
|
2025-03-02 16:28:45 +06:00 |
|
|
albrut
|
527315e976
|
now she stays on the ground i think
|
2025-03-02 16:21:42 +06:00 |
|
|
albrut
|
6fd0fc5868
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-02 15:34:00 +06:00 |
|
|
albrut
|
fe88d27632
|
added first room
|
2025-03-02 15:33:45 +06:00 |
|
|
albrut
|
2d0c7ec166
|
added mouse handling
|
2025-03-01 22:14:33 +06:00 |
|
|
albrut
|
4271ef556d
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-01 21:43:54 +06:00 |
|
|
albrut
|
55133bbd87
|
fully refactored main.cpp
|
2025-03-01 21:43:31 +06:00 |
|
|
albrut
|
51a1cc742c
|
refacored some parts of main.cpp
|
2025-03-01 21:33:34 +06:00 |
|
|
albrut
|
b1954fd334
|
refacored some parts of main.cpp
|
2025-03-01 21:13:53 +06:00 |
|
|
albrut
|
641efaf582
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-01 20:54:15 +06:00 |
|
|
albrut
|
dbffcf5f04
|
refacored some parts of main.sh
|
2025-03-01 20:53:11 +06:00 |
|
|
albrut
|
b6684f7929
|
refactored
|
2025-03-01 19:22:19 +06:00 |
|
|
albrut
|
0c431f9c08
|
Merge branch 'Albert' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-01 19:19:09 +06:00 |
|
|
albrut
|
e2af375aa0
|
starting refactoring main.cpp
|
2025-03-01 19:18:42 +06:00 |
|
|
albrut
|
666bfc1b37
|
added sh file for start in linux
|
2025-03-01 19:16:26 +06:00 |
|
|
albrut
|
b27b4adab3
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Albert
|
2025-03-01 19:07:06 +06:00 |
|
|
albrut
|
613d809b43
|
deleted buttons for testing
|
2025-03-01 19:06:42 +06:00 |
|
|
albrut
|
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
|
a8ab5015b9
|
Merge branch 'salmon' of github.com:mephi1984/ZeptoLabTest1 into Abert
|
2025-03-01 18:34:36 +06:00 |
|
|
albrut
|
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
|
bed5ae7a40
|
added sounds by clicking on button and changed script to compile
|
2025-03-01 18:01:24 +06:00 |
|
|
albrut
|
d9038fee44
|
added sounds library
|
2025-03-01 17:26:04 +06:00 |
|
|
albrut
|
098f2b4005
|
added sounds library
|
2025-03-01 17:19:38 +06:00 |
|
|
albrut
|
8d8843cb11
|
linuc
|
2025-03-01 11:44:31 +06:00 |
|
|
albrut
|
0fd42529c7
|
Linux version
|
2025-03-01 11:22:32 +06:00 |
|
|
albrut
|
0a37ba49c3
|
fixing conflict
|
2025-03-01 11:16:52 +06:00 |
|
|
albrut
|
b9e88547e6
|
linux part
|
2025-03-01 11:12:22 +06:00 |
|