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

..

FPWeapon

*trying to fix errors

2022-03-06 16:34:56 +02:00

Geometry/Meshes

*Setup

2022-02-28 18:59:39 +02:00

Siim_migrated

Siim's 1st commit

2022-03-06 15:25:51 +02:00

SoulCave/Environment

*adding new assets

2022-03-05 23:04:25 +02:00

VRSpectator

*Setup

2022-02-28 18:59:39 +02:00

VRTemplate

*trying to fix errors

2022-03-06 16:34:56 +02:00