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

105 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Axel Galand
dff6caef6f Merge branch 'Scripting' into Assets 2023-01-16 09:05:05 +01:00
Axel Galand
de864691a3 e 2023-01-16 09:03:59 +01:00
Legonzaur
414d1eec0e Change quality settings 2023-01-13 22:46:24 +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
344e718212 Fir catalog rotation 2023-01-13 18:34:02 +01:00
Legonzaur
f89e261c93 Remove script component from chair 2023-01-13 17:42:22 +01:00
Legonzaur
ec64073c87 Starting prototyping catalog 2023-01-13 17:01:02 +01:00
Axel Galand
68ef2b02fb Merge branch 'Scripting' into Assets 2023-01-13 16:47:44 +01:00
Axel Galand
9f4120079c Merge remote-tracking branch 'origin/Scripting' into Assets 2023-01-13 16:43:06 +01:00
Legonzaur
1d936f4868 fix for skeleton poser 2023-01-13 16:40:29 +01:00
Legonzaur
10a19eb2bc fix gameobject hierarchy 2023-01-13 15:07:04 +01:00
Legonzaur
76866be949 Remove all steamvr hands in scene 2023-01-13 15:06:38 +01:00
Legonzaur
50674f952f Fix lamp reflection probe 2023-01-13 15:02:38 +01:00
Axel Galand
280a273ecb Merge remote-tracking branch 'origin/Scripting' into Assets 2023-01-13 15:01:56 +01:00
Legonzaur
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
Legonzaur
671dabc673 add interactable scripts to objects 2023-01-13 14:39:26 +01:00
Legonzaur
68cc58324e Fix hammer grab 2023-01-13 14:28:27 +01:00
Legonzaur
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
Legonzaur
5767a2caa8 add texture to keyboard 2023-01-13 13:53:47 +01:00
Legonzaur
7a12ae025a Fix shelf 2023-01-13 13:52:28 +01:00
Legonzaur
b4a2f07196 Merge branch 'Assets' into Scripting 2023-01-13 13:48:27 +01:00
Legonzaur
556ca2259f rgb keyboard 2023-01-13 11:44:29 +01:00
Axel Galand
45ea7ca995 uwu 2023-01-13 08:58:44 +01:00
Axel Galand
e31e9060b6 Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-13 08:58:29 +01:00
Legonzaur
d8094c6b34 add first hand poses 2023-01-13 08:58:12 +01:00
Axel Galand
e9711c316e Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-13 08:28:26 +01:00
Axel Galand
f5e0118d33 e 2023-01-13 08:27:07 +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
3f690ef763 Fix blender 2023-01-12 12:06:12 +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