53 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Axel Galand	f5e0118d33	e	2023-01-13 08:27:07 +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
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
Axel Galand	f1b53afbcd	e	2023-01-09 12:03:36 +01:00
Legonzaur	55cbb7c5d9	Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets	2023-01-09 12:01:06 +01:00
Axel Galand	71ab0c194d	Merge branch 'Assets' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Assets	2023-01-09 11:59:41 +01:00
Legonzaur	03a60ef089	Finish commit	2023-01-09 11:54:17 +01:00
Legonzaur	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
Legonzaur	1510cbdcf5	Add Oculus Package	2023-01-09 11:46:20 +01:00
Legonzaur	61bd331d8b	remove blenderImporter demo	2023-01-09 11:12:16 +01:00
Legonzaur	af9e96c591	remove blenderImporter demo	2023-01-09 11:11:26 +01:00
Legonzaur	125ecab769	add middle Tables	2023-01-06 16:55:49 +01:00
Legonzaur	b0f4187d9f	Add middle chairs	2023-01-06 16:50:07 +01:00
Legonzaur	032c3234eb	Scene and lighting	2023-01-06 16:42:30 +01:00
Legonzaur	92263f6b9a	Some scene changes	2023-01-06 16:41:13 +01:00
Legonzaur	62ae108b07	Remove old fablab	2023-01-06 14:44:59 +01:00
Legonzaur	0587074149	Test Hologram	2023-01-06 14:43:29 +01:00
Legonzaur	e6bef57ac3	Working on table hologram	2023-01-06 13:13:52 +01:00
Legonzaur	2abc45c44a	add jpeg to lfs	2023-01-06 09:29:00 +01:00
Legonzaur	49c41d22fe	add .obj to lfs	2023-01-06 09:28:14 +01:00
Legonzaur	1ab7e5f358	add .blend to lfs	2023-01-06 09:26:50 +01:00
Legonzaur	41065ecea5	Tri	2023-01-06 08:55:48 +01:00
Legonzaur	944ad71812	Add old fablab assets	2023-01-06 08:44:59 +01:00