Phillipes_Fablab/Assets/Models/Blender
K0RB4K 9f21be7bbc
Merge remote-tracking branch 'origin/Scripting' into Assets
# Conflicts:
#	Assets/Scenes/FabLab/FabLab.unity
2023-01-11 16:16:01 +01:00
..
chair.blend Working on table hologram 2023-01-06 13:13:52 +01:00
chair.blend.meta Grab working 2023-01-10 17:09:03 +01:00
circuitboard.blend added missing blender files 2023-01-09 12:07:23 +01:00
circuitboard.blend.meta Grab working 2023-01-10 17:09:03 +01:00
hammer.blend added missing blender files 2023-01-09 12:07:23 +01:00
hammer.blend.meta Grab working 2023-01-10 17:09:03 +01:00
Lamp.blend Adding Lamp 2023-01-09 16:54:09 +01:00
Lamp.blend.meta Grab working 2023-01-10 17:09:03 +01:00
LED_2.blend added missing blender files 2023-01-09 12:07:23 +01:00
LED_2.blend.meta Grab working 2023-01-10 17:09:03 +01:00
NetworkBox.blend added network bay asset + put in scene 2023-01-10 16:26:20 +01:00
NetworkBox.blend.meta added network bay asset + put in scene 2023-01-10 16:26:20 +01:00
pliers.blend added missing blender files 2023-01-09 12:07:23 +01:00
pliers.blend.meta Grab working 2023-01-10 17:09:03 +01:00
screwdriver.blend added missing blender files 2023-01-09 12:07:23 +01:00
screwdriver.blend.meta Grab working 2023-01-10 17:09:03 +01:00
shelf.blend added glass shelf 2023-01-10 11:41:06 +01:00
shelf.blend.meta added glass shelf 2023-01-10 11:41:06 +01:00
Simple table.obj Working on table hologram 2023-01-06 13:13:52 +01:00
Simple table.obj.meta Grab working 2023-01-10 17:09:03 +01:00
smarttv 1.blend added missing blender files 2023-01-09 12:07:23 +01:00
smarttv 1.blend.meta Grab working 2023-01-10 17:09:03 +01:00
smarttv.blend added few assets + placed TV 2023-01-09 11:49:51 +01:00
smarttv.blend.meta Grab working 2023-01-10 17:09:03 +01:00
smarttv.prefab Grab working 2023-01-10 17:09:03 +01:00
smarttv.prefab.meta Grab working 2023-01-10 17:09:03 +01:00
table double.obj Working on table hologram 2023-01-06 13:13:52 +01:00
table double.obj.meta Grab working 2023-01-10 17:09:03 +01:00
table side.obj Working on table hologram 2023-01-06 13:13:52 +01:00
table side.obj.meta Grab working 2023-01-10 17:09:03 +01:00
ultimaker.obj Working on table hologram 2023-01-06 13:13:52 +01:00
ultimaker.obj.meta Grab working 2023-01-10 17:09:03 +01:00