175 Commits

Author	SHA1	Message	Date
Axel Galand	fc322562f1	Merge branch 'Scripting' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Scripting	2023-01-19 10:39:31 +01:00
Axel Galand	ab838b5fcb	added window + building assets	2023-01-19 10:35:19 +01:00
Legonzaur	fdb7d38190	Remove OpenXR	2023-01-19 08:58:14 +01:00
Legonzaur	c816fde9c1	Merge yesterday catalog with todays work	2023-01-18 17:40:15 +01:00
Legonzaur	7df05aedf9	add Prisesfix normals of some models	2023-01-18 16:58:20 +01:00
Legonzaur	e375769bd9	add occlusion maps	2023-01-18 16:52:52 +01:00
Axel Galand	a9084d3389	e	2023-01-18 16:31:04 +01:00
Axel Galand	53543caeca	Merge branch 'Scripting' of https://git.k0rb4k.net/VR-Sexe/Phillipes_Fablab into Scripting	2023-01-18 16:30:55 +01:00
Axel Galand	4b5b691e6b	+	2023-01-18 16:23:15 +01:00
Axel Galand	002e7278a1	try furniture movement but not working	2023-01-18 16:22:23 +01:00
Legonzaur	b3ff0426f6	fix prises	2023-01-18 16:17:50 +01:00
Legonzaur	effd267fbc	add prises	2023-01-18 16:12:19 +01:00
Axel Galand	518e6d2137	Merge remote-tracking branch 'origin/Scripting' into Assets	2023-01-18 16:10:23 +01:00
Axel Galand	3612d56e04	few change idk	2023-01-18 16:07:08 +01:00
dododb	d453344ba6	Furniture turn	2023-01-18 14:32:02 +01:00
dododb	7fc663894c	Disable Snapturn when grab	2023-01-18 14:20:55 +01:00
Legonzaur	482129636f	Advancing in Catalog	2023-01-17 16:11:12 +01:00
Legonzaur	7c200b5865	Change default knuckle binding	2023-01-17 12:11:57 +01:00
Legonzaur	25473c4936	Remove oculus	2023-01-17 11:15:30 +01:00
Legonzaur	deab42bad3	Remove Oculus	2023-01-17 11:14:32 +01:00
Legonzaur	cc4b569ab3	Advancing on Catalog	2023-01-17 10:42:17 +01:00
Legonzaur	30bb7cc3f2	fix props placement and specularité	2023-01-17 09:32:55 +01:00
Legonzaur	8d0633a14e	Fix illegal shadows	2023-01-17 09:17:18 +01:00
Axel Galand	60cb93ac06	textures ceiling wall floor	2023-01-16 16:36:04 +01:00
Legonzaur	162b973bc2	Add furniture class and heritage	2023-01-16 15:30:26 +01:00
Legonzaur	ac3c539569	Change file hierarchy	2023-01-16 15:16:34 +01:00
Legonzaur	26a5ca130c	Merge assets into Script	2023-01-16 15:01:50 +01:00
Legonzaur	63b569e7c9	Catalog grab	2023-01-16 14:58:43 +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	96f3ff8a08	Merge branch 'Assets' into Scripting	2023-01-16 13:33:37 +01:00
Legonzaur	b92ba002b2	Remove debug log in MovableFurniture	2023-01-16 13:33:00 +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
Legonzaur	d8094c6b34	add first hand poses	2023-01-13 08:58:12 +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
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