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

74 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Legonzaur
901e79970a Remove chair scripts 2023-01-12 08:46:56 +01:00
Legonzaur
acc6ea1ea0 Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Scripting 2023-01-12 08:30:43 +01:00
K0RB4K
79b46cbfcb
WIP laser cutter model 2023-01-11 18:43:40 +01:00
Legonzaur
dda122badd Remove rigidbodies 2023-01-11 16:51:37 +01:00
Axel Galand
fa97d2f2ca add models 2023-01-11 16:50:43 +01:00
Legonzaur
c4bb5e1e39 Merge pull request 'Assets' (#2) from Assets into Scripting 
Reviewed-on: #2
 2023-01-11 16:46:24 +01:00
Axel Galand
777b30dbed valve index station prefab 2023-01-11 16:43:50 +01:00
Axel Galand
1871b24529 e 2023-01-11 16:31:49 +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
6c93237640 Fixing MovableFurniture 2023-01-11 15:35:48 +01:00
Legonzaur
e3858311d7 Add Collider to Roof 2023-01-11 09:13:33 +01:00
Legonzaur
8e129d8f6c Grab working 2023-01-10 17:09:03 +01:00
K0RB4K
beef5509bd
added missing collider to network bay 2023-01-10 16:28:07 +01:00
K0RB4K
470a112766
added network bay asset + put in scene 2023-01-10 16:26:20 +01:00
Legonzaur
150ba3f8e8 Add Steamvr Package 2023-01-10 13:17:49 +01:00
K0RB4K
4377deb95d
added shelves in scene 2023-01-10 12:22:53 +01:00
K0RB4K
bf8e8c1b4b
added glass shelf 2023-01-10 11:41:06 +01:00
Legonzaur
b971773016 Add Colliders to table and TV 2023-01-10 11:08:45 +01:00
Legonzaur
ebcc4077d9 Disabling scripts to chair 2023-01-10 11:02:53 +01:00
Legonzaur
ff6225096a Fix nomenclature 2023-01-10 10:48:34 +01:00
Legonzaur
d20d3e32ed Setup Neon Lighting 2023-01-10 10:41:31 +01:00
Legonzaur
c7549e453e Added Lamp correctly 2023-01-10 09:27:40 +01:00
Legonzaur
1ccc61d157 Reimport Oculus Asset 2023-01-10 08:24:03 +01:00
Legonzaur
f8df52dfd6 Adding Lamp 2023-01-09 16:54:09 +01:00
Legonzaur
99ceb83739 Placing assets in scene 2023-01-09 15:42:52 +01:00
Legonzaur
7852573190 Fix Oculus 2023-01-09 13:09:13 +01:00
Axel Galand
9e7dba6578 added missing blender files 2023-01-09 12:07:23 +01:00
Axel Galand
d7475bfe7d Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-09 12:04:57 +01:00