Commit Graph

77 Commits

Author SHA1 Message Date
c816fde9c1 Merge yesterday catalog with todays work 2023-01-18 17:40:15 +01:00
7df05aedf9 add Prisesfix normals of some models 2023-01-18 16:58:20 +01:00
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
b3ff0426f6 fix prises 2023-01-18 16:17:50 +01:00
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
482129636f Advancing in Catalog 2023-01-17 16:11:12 +01:00
7c200b5865 Change default knuckle binding 2023-01-17 12:11:57 +01:00
25473c4936 Remove oculus 2023-01-17 11:15:30 +01:00
cc4b569ab3 Advancing on Catalog 2023-01-17 10:42:17 +01:00
30bb7cc3f2 fix props placement and specularité 2023-01-17 09:32:55 +01:00
8d0633a14e Fix illegal shadows 2023-01-17 09:17:18 +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
78a54dc612 More hands added 2023-01-16 14:19:41 +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
Axel Galand
dff6caef6f Merge branch 'Scripting' into Assets 2023-01-16 09:05:05 +01:00
de91eacae1 Change quality settings for Android 2023-01-13 22:43:47 +01:00
fd3e30e0c0 Fix and enhance some models 2023-01-13 22:21:46 +01:00
9a535fcbfc Fix keyboard and some assets 2023-01-13 18:34:09 +01:00
f89e261c93 Remove script component from chair 2023-01-13 17:42:22 +01:00
ec64073c87 Starting prototyping catalog 2023-01-13 17:01:02 +01:00
Axel Galand
280a273ecb Merge remote-tracking branch 'origin/Scripting' into Assets 2023-01-13 15:01:56 +01:00
b0e2943097 fix lighting and lamps 2023-01-13 15:00:09 +01:00
Axel Galand
53046b8d06 fix merge 2023-01-13 14:47:02 +01:00
Axel Galand
171a64d061 merge + hand for screwdriver 2023-01-13 14:43:08 +01:00
671dabc673 add interactable scripts to objects 2023-01-13 14:39:26 +01:00
68cc58324e Fix hammer grab 2023-01-13 14:28:27 +01:00
b3e00194ab Merge remote-tracking branch 'origin/Assets' into Scripting 2023-01-13 13:56:16 +01:00
Axel Galand
fd08d722e1 Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-13 13:54:57 +01:00
Axel Galand
6f291667d6 hammer grab pose 2023-01-13 13:54:46 +01:00
7a12ae025a Fix shelf 2023-01-13 13:52:28 +01:00
b4a2f07196 Merge branch 'Assets' into Scripting 2023-01-13 13:48:27 +01:00
556ca2259f rgb keyboard 2023-01-13 11:44:29 +01:00
d8094c6b34 add first hand poses 2023-01-13 08:58:12 +01:00
dadb97e2c6
Merge remote-tracking branch 'origin/Assets' into Assets
# Conflicts:
#	Assets/Models/Blender/Indoor_plant_02.blend
#	Assets/Models/Blender/Indoor_plant_02.blend.meta
#	Assets/Models/Blender/laser_cutter.blend.meta
#	Assets/Texture/LaserCutter.meta
#	Assets/Texture/LaserCutter/Body.png.meta
2023-01-12 12:09:52 +01:00
9314ac85b8
indoor plants 2023-01-12 12:07:26 +01:00
3f690ef763 Fix blender 2023-01-12 12:06:12 +01:00
2e0349514b laser cutter mat 2023-01-12 11:58:19 +01:00
dd8b106a8c Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-12 11:58:02 +01:00
507e62fceb fix blender imports 2023-01-12 11:56:39 +01:00
Axel Galand
8cf0adbafa added 3 3D printers 2023-01-12 11:54:40 +01:00
Axel Galand
fb5baf5506 added some colliders 2023-01-12 11:33:05 +01:00
Axel Galand
44ae3deb3e Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-12 10:49:42 +01:00
Axel Galand
659860829a added some colliders and models to scene 2023-01-12 10:48:37 +01:00
901e79970a Remove chair scripts 2023-01-12 08:46:56 +01:00
acc6ea1ea0 Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Scripting 2023-01-12 08:30:43 +01:00