Commit Graph

17 Commits

Author SHA1 Message Date
jelizavet 3eea75f7db stereo vision 2022-03-28 18:06:05 +03:00
jelizavet f145eff6a1 bottle implementation 2022-03-28 17:48:06 +03:00
jelizavet ec375254b7 Setup 2022-03-28 15:39:55 +03:00
Jelizaveta Kuznetsova 00e80e27ca Debug 2022-03-23 00:05:47 +02:00
jelizavet 84f4348b91 Grab fixes 2022-03-20 18:31:17 +02:00
DOMENIS\jelizavet d2f13b90d8 Merge 2022-03-07 18:48:11 +02:00
DOMENIS\jelizavet 0b15820fdd Grab dif project 2022-03-07 18:47:54 +02:00
l31tm0t1f efa77c7dbb Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment into master
# Conflicts:
#	Content/VRTemplate/Maps/VRTemplateMap.umap
#	Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
2022-03-07 17:33:55 +02:00
l31tm0t1f c936cbdc02 2.commit 2022-03-07 17:31:45 +02:00
Jelizaveta Kuznetsova 734dd5f8e0 Shaking tree asset from procedural nature pack 2022-03-06 21:55:16 +02:00
helenasokk 41ffd6339c *Helena's assets commit again 2022-03-06 16:56:56 +02:00
helenasokk 1e440bc4ab Merge branch 'master' of https://cgvrgit.ulno.net/l31tm0t1f/GalleryEnvironment
# Conflicts:
#	Content/VRTemplate/Maps/VRTemplateMap.umap
#	Content/VRTemplate/Maps/VRTemplateMap_BuiltData.uasset
2022-03-06 16:41:06 +02:00
helenasokk 4825126cd7 *trying to fix errors 2022-03-06 16:34:56 +02:00
l31tm0t1f c1d47a9a82 Siim's 1st commit 2022-03-06 15:25:51 +02:00
helenasokk b1fccc09ba *adding new assets 2022-03-05 23:04:25 +02:00
helenasokk 5d335b4856 *adding new assets 2022-03-05 23:00:15 +02:00
Jelizaveta Kuznetsova 2edd437cfe *Setup 2022-02-28 18:59:39 +02:00