VR-Sexe/Phillipes_Fablab
5
0
Fork 0
generated from VR-Sexe/Unity3DTemplate
Code Issues Pull Requests Packages Projects Releases Wiki Activity
145 Commits 3 Branches 0 Tags 1.5 GiB
8d43eb2ae8
Commit Graph

145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Axel Galand
8d43eb2ae8 laser 2023-01-23 11:39:06 +01:00
Axel Galand
1fd7acd26b Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-23 11:38:45 +01:00
Axel Galand
064a9a137b less grass 2023-01-23 11:38:21 +01:00
K0RB4K
32f53da1f1
some unity metadata 2023-01-23 10:51:12 +01:00
K0RB4K
cb917ad376
Merge remote-tracking branch 'origin/Assets' into Assets 
# Conflicts:
#	Assets/Materials/LaserCutter.meta
#	Assets/Materials/LaserCutter/laser_cutter-Body.mat.meta
#	Assets/Materials/LaserCutter/laser_cutter-Posts.mat.meta
#	Assets/Materials/LaserCutter/laser_cutter-Wheels.mat.meta
#	Assets/Models/Blender/laser_cutter.mtl.meta
#	Assets/Models/Blender/laser_cutter.obj.meta
#	Assets/Texture/LaserCutter/LaserCutterInteriorBack.jpg.meta
#	Assets/Texture/LaserCutter/LaserCutterInteriorLeft.jpg.meta
#	Assets/Texture/LaserCutter/LaserCutterInteriorRight.jpg.meta
 2023-01-23 10:45:24 +01:00
K0RB4K
7c2b32d452
small laser cutter fixes 2023-01-23 10:44:35 +01:00
Axel Galand
97abeca9b8 the fenetre is working 2023-01-23 10:37:26 +01:00
Axel Galand
7851343575 merge + added city 2023-01-23 09:17:24 +01:00
Axel Galand
5baed8a5e4 bit of scenery, need to fix lights + add few buildings 2023-01-20 11:31:23 +01:00
K0RB4K
400e23adc9
merge remote to laser cutter 2023-01-19 12:18:04 +01:00
K0RB4K
947ce85ffb
laser cutter done 2023-01-19 12:04:13 +01:00
Axel Galand
293cd3f04b merge 2023-01-19 10:39:40 +01:00
Axel Galand
fc322562f1 Merge branch 'Scripting' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Scripting 2023-01-19 10:39:31 +01:00
Axel Galand
ab838b5fcb added window + building assets 2023-01-19 10:35:19 +01:00
Legonzaur
fdb7d38190 Remove OpenXR 2023-01-19 08:58:14 +01:00
Legonzaur
c816fde9c1 Merge yesterday catalog with todays work 2023-01-18 17:40:15 +01:00
Legonzaur
7df05aedf9 add Prisesfix normals of some models 2023-01-18 16:58:20 +01:00
Legonzaur
e375769bd9 add occlusion maps 2023-01-18 16:52:52 +01:00
Axel Galand
a9084d3389 e 2023-01-18 16:31:04 +01:00
Axel Galand
53543caeca Merge branch 'Scripting' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Scripting 2023-01-18 16:30:55 +01:00
Axel Galand
4b5b691e6b + 2023-01-18 16:23:15 +01:00
Axel Galand
002e7278a1 try furniture movement but not working 2023-01-18 16:22:23 +01:00
Legonzaur
b3ff0426f6 fix prises 2023-01-18 16:17:50 +01:00
Legonzaur
effd267fbc add prises 2023-01-18 16:12:19 +01:00
Axel Galand
518e6d2137 Merge remote-tracking branch 'origin/Scripting' into Assets 2023-01-18 16:10:23 +01:00
Axel Galand
3612d56e04 few change idk 2023-01-18 16:07:08 +01:00
dododb
d453344ba6 Furniture turn 2023-01-18 14:32:02 +01:00
dododb
7fc663894c Disable Snapturn when grab 2023-01-18 14:20:55 +01:00
Legonzaur
482129636f Advancing in Catalog 2023-01-17 16:11:12 +01:00
Legonzaur
7c200b5865 Change default knuckle binding 2023-01-17 12:11:57 +01:00
Legonzaur
25473c4936 Remove oculus 2023-01-17 11:15:30 +01:00
Legonzaur
deab42bad3 Remove Oculus 2023-01-17 11:14:32 +01:00
Legonzaur
cc4b569ab3 Advancing on Catalog 2023-01-17 10:42:17 +01:00
Legonzaur
30bb7cc3f2 fix props placement and specularité 2023-01-17 09:32:55 +01:00
Legonzaur
8d0633a14e Fix illegal shadows 2023-01-17 09:17:18 +01:00
Axel Galand
60cb93ac06 textures ceiling wall floor 2023-01-16 16:36:04 +01:00
Legonzaur
162b973bc2 Add furniture class and heritage 2023-01-16 15:30:26 +01:00
Legonzaur
ac3c539569 Change file hierarchy 2023-01-16 15:16:34 +01:00
Legonzaur
26a5ca130c Merge assets into Script 2023-01-16 15:01:50 +01:00
Legonzaur
63b569e7c9 Catalog grab 2023-01-16 14:58:43 +01:00
Axel Galand
61f2502683 P L A N T 2023-01-16 14:48:32 +01:00
Axel Galand
7e6ea7ea5d green 2023-01-16 14:34:03 +01:00
Axel Galand
01d06f82fb Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-16 14:20:11 +01:00
Axel Galand
78a54dc612 More hands added 2023-01-16 14:19:41 +01:00
Legonzaur
96f3ff8a08 Merge branch 'Assets' into Scripting 2023-01-16 13:33:37 +01:00
Legonzaur
b92ba002b2 Remove debug log in MovableFurniture 2023-01-16 13:33:00 +01:00
Legonzaur
12a77cd53d add catalog as prefab 2023-01-16 13:15:59 +01:00
Legonzaur
8aac7c382a reimport steamvr assets 2023-01-16 13:15:25 +01:00
Axel Galand
8f25fbf95e screwdriver hands 2023-01-16 11:55:19 +01:00
Axel Galand
0b8e2f6f47 "Push tout ce que t'as" 2023-01-16 11:51:31 +01:00