Commit Graph

79 Commits

Author SHA1 Message Date
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
79b46cbfcb
WIP laser cutter model 2023-01-11 18:43:40 +01:00
dda122badd Remove rigidbodies 2023-01-11 16:51:37 +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
9f21be7bbc
Merge remote-tracking branch 'origin/Scripting' into Assets
# Conflicts:
#	Assets/Scenes/FabLab/FabLab.unity
2023-01-11 16:16:01 +01:00
6c93237640 Fixing MovableFurniture 2023-01-11 15:35:48 +01:00
8e129d8f6c Grab working 2023-01-10 17:09:03 +01:00
beef5509bd
added missing collider to network bay 2023-01-10 16:28:07 +01:00
470a112766
added network bay asset + put in scene 2023-01-10 16:26:20 +01:00
150ba3f8e8 Add Steamvr Package 2023-01-10 13:17:49 +01:00
4377deb95d
added shelves in scene 2023-01-10 12:22:53 +01:00
bf8e8c1b4b
added glass shelf 2023-01-10 11:41:06 +01:00
b971773016 Add Colliders to table and TV 2023-01-10 11:08:45 +01:00
ebcc4077d9 Disabling scripts to chair 2023-01-10 11:02:53 +01:00
d20d3e32ed Setup Neon Lighting 2023-01-10 10:41:31 +01:00
c7549e453e Added Lamp correctly 2023-01-10 09:27:40 +01:00
f8df52dfd6 Adding Lamp 2023-01-09 16:54:09 +01:00
99ceb83739 Placing assets in scene 2023-01-09 15:42:52 +01:00
Axel Galand
9e7dba6578 added missing blender files 2023-01-09 12:07:23 +01:00
55cbb7c5d9 Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets 2023-01-09 12:01:06 +01:00
68b4cd0497 Fix chair scale 2023-01-09 11:52:28 +01:00
Axel Galand
43577d2817 added few assets + placed TV 2023-01-09 11:49:51 +01:00
92263f6b9a Some scene changes 2023-01-06 16:41:13 +01:00
62ae108b07 Remove old fablab 2023-01-06 14:44:59 +01:00
e6bef57ac3 Working on table hologram 2023-01-06 13:13:52 +01:00
41065ecea5 Tri 2023-01-06 08:55:48 +01:00
944ad71812 Add old fablab assets 2023-01-06 08:44:59 +01:00