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

47 Commits

Author SHA1 Message Date
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
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
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
Legonzaur
b3ff0426f6 fix prises 2023-01-18 16:17:50 +01:00
Legonzaur
effd267fbc add prises 2023-01-18 16:12:19 +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
30bb7cc3f2 fix props placement and specularité 2023-01-17 09:32:55 +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
0b8e2f6f47 "Push tout ce que t'as" 2023-01-16 11:51:31 +01:00
Legonzaur
de91eacae1 Change quality settings for Android 2023-01-13 22:43:47 +01:00
Legonzaur
fd3e30e0c0 Fix and enhance some models 2023-01-13 22:21:46 +01:00
Legonzaur
9a535fcbfc Fix keyboard and some assets 2023-01-13 18:34:09 +01:00
Legonzaur
ec64073c87 Starting prototyping catalog 2023-01-13 17:01:02 +01:00
Legonzaur
556ca2259f rgb keyboard 2023-01-13 11:44:29 +01:00
K0RB4K
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
K0RB4K
9314ac85b8
indoor plants 2023-01-12 12:07:26 +01:00
Legonzaur
2e0349514b laser cutter mat 2023-01-12 11:58:19 +01:00
Legonzaur
dd8b106a8c Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-12 11:58:02 +01:00
Legonzaur
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
K0RB4K
79b46cbfcb
WIP laser cutter model 2023-01-11 18:43:40 +01:00
Axel Galand
fa97d2f2ca add models 2023-01-11 16:50:43 +01:00
Axel Galand
777b30dbed valve index station prefab 2023-01-11 16:43:50 +01:00
K0RB4K
9f21be7bbc
Merge remote-tracking branch 'origin/Scripting' into Assets 
# Conflicts:
#	Assets/Scenes/FabLab/FabLab.unity
 2023-01-11 16:16:01 +01:00
Legonzaur
8e129d8f6c Grab working 2023-01-10 17:09:03 +01:00
K0RB4K
470a112766
added network bay asset + put in scene 2023-01-10 16:26:20 +01:00
K0RB4K
bf8e8c1b4b
added glass shelf 2023-01-10 11:41:06 +01:00
Legonzaur
f8df52dfd6 Adding Lamp 2023-01-09 16:54:09 +01:00
Axel Galand
9e7dba6578 added missing blender files 2023-01-09 12:07:23 +01:00
Axel Galand
43577d2817 added few assets + placed TV 2023-01-09 11:49:51 +01:00
Legonzaur
e6bef57ac3 Working on table hologram 2023-01-06 13:13:52 +01:00
Legonzaur
41065ecea5 Tri 2023-01-06 08:55:48 +01:00