202 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Masoomeh	b5df207bf7	Merge branch 'Mukheem:main' into main	2024-05-13 19:21:46 +02:00
Masoomeh	589f643858	TeamLogo	2024-05-13 19:18:00 +02:00
ZeinabBF	bd9e3454c3	Update README.md	2024-05-13 19:07:49 +02:00
Abdul Mukheem Shaik	0463d9f8c3	Merge branch 'main' of https://github.com/Mukheem/TwinTurbine	2024-05-13 19:05:59 +02:00
Abdul Mukheem Shaik	e569ea91c7	child anchors fetching in progress	2024-05-13 19:05:52 +02:00
Masoomeh	91edbd87ae	Update README.md	2024-05-13 19:03:37 +02:00
Masoomeh	0b58d6dc01	Merge pull request #1 from dalarna2022/main ... Draft Poster	2024-05-13 18:55:27 +02:00
Masoomeh	2dc1ba737b	Draft Poster	2024-05-13 18:44:46 +02:00
Abdul Mukheem Shaik	89b069c7fc	Merge branch 'main' of https://github.com/Mukheem/TwinTurbine	2024-05-13 18:31:20 +02:00
Abdul Mukheem Shaik	2a186d71ca	Added count to anchors to see how many are present	2024-05-13 18:31:14 +02:00
Masoomeh	897df08143	Update README.md	2024-05-13 18:27:38 +02:00
Abdul Mukheem Shaik	9b2e3c850c	Calling the Anchors from the room-SceneModel	2024-05-13 18:16:45 +02:00
Abdul Mukheem Shaik	baee144df2	Merge branch 'main' of https://github.com/Mukheem/TwinTurbine	2024-05-13 17:54:16 +02:00
Abdul Mukheem Shaik	6b20c5fb69	changed start to async to read scene details	2024-05-13 17:54:14 +02:00
ZeinabBF	1337bb72de	Images	2024-05-13 17:10:30 +02:00
ZeinabBF	f49363e0f6	Wireframes and Prototypes	2024-05-13 16:38:07 +02:00
Abdul Mukheem Shaik	e7a0d13511	disabled spawnner object and script	2024-05-13 16:20:47 +02:00
Abdul Mukheem Shaik	d45d752908	Merge branch 'main' of https://github.com/Mukheem/TwinTurbine	2024-05-13 16:03:33 +02:00
Abdul Mukheem Shaik	aadd1f9d06	disabling the spawnner script after instantiating	2024-05-13 16:03:26 +02:00
ZeinabBF	85989e98de	User Journey	2024-05-13 16:03:15 +02:00
Abdul Mukheem Shaik	680ce710ab	changing prefab preview for spawning	2024-05-13 15:54:18 +02:00
Abdul Mukheem Shaik	3b78745b70	added photon components to Map on the ground object	2024-05-13 15:47:32 +02:00
Abdul Mukheem Shaik	76fbdd22ba	turned off Spawnner scripts	2024-05-13 15:32:43 +02:00
Abdul Mukheem Shaik	e1e848362e	Merge branch 'main' of https://github.com/Mukheem/TwinTurbine	2024-05-13 15:10:14 +02:00
Abdul Mukheem Shaik	6420088101	removed spanner script to avoid collision	2024-05-13 15:10:12 +02:00
ZeinabBF	8616168156	Persona	2024-05-12 18:12:29 +02:00
ZeinabBF	d9fff12b5d	Update README.md	2024-05-12 18:10:54 +02:00
Abdul Mukheem Shaik	91c90aecf5	changes in PrefabSpawnner	2024-05-12 17:34:30 +02:00
Abdul Mukheem Shaik	5c42002091	added Prefab Spawnner	2024-05-12 17:20:19 +02:00
Abdul Mukheem Shaik	5b18efd5ad	Merge branch 'main' of https://github.com/Mukheem/TwinTurbine	2024-05-12 16:35:02 +02:00
Abdul Mukheem Shaik	00f216990f	map added to assets and materials changed	2024-05-12 16:34:56 +02:00
ZeinabBF	a3b37f5157	Update README.md	2024-05-12 16:27:03 +02:00
ZeinabBF	f49fd9e431	Brainstorming Images	2024-05-12 16:19:38 +02:00
ZeinabBF	46f9df3f7e	Update README.md	2024-05-12 16:10:53 +02:00
Abdul Mukheem Shaik	a7678b0782	enhancing position and scaling	2024-05-12 15:32:47 +02:00
Abdul Mukheem Shaik	bb5924ba53	Merge branch 'main' of https://github.com/Mukheem/TwinTurbine	2024-05-12 15:15:53 +02:00
Abdul Mukheem Shaik	b18a0d1eae	changed mass, gravity and collision detection type	2024-05-12 15:15:46 +02:00
ZeinabBF	20ad93d9cd	Update README.md	2024-05-12 15:10:05 +02:00
ZeinabBF	d07f35d8a4	Update README.md	2024-05-12 15:07:35 +02:00
Abdul Mukheem Shaik	f4b198abf3	Merge branch 'main' of https://github.com/Mukheem/TwinTurbine	2024-05-12 14:57:33 +02:00
Abdul Mukheem Shaik	811c8e96b2	removed gravity	2024-05-12 14:57:26 +02:00
MinaMaddahi	dcd986ce36	Merge branch 'main' of https://github.com/Mukheem/TwinTurbine	2024-05-12 14:48:22 +02:00
MinaMaddahi	b36660b82d	TangibleSkeche ... Connect the Arduino to the ESP32	2024-05-12 14:48:00 +02:00
Abdul Mukheem Shaik	2701eba759	WT scale updated and also spawnning	2024-05-12 14:46:54 +02:00
ZeinabBF	923a400b36	Update README.md	2024-05-12 14:13:27 +02:00
ZeinabBF	00dfadc2c5	Update README.md ... Testing the pic	2024-05-12 14:04:15 +02:00
ZeinabBF	742d71216c	Update README.md	2024-05-12 14:01:35 +02:00
ZeinabBF	745301ca89	reverting the location for docs images	2024-05-12 13:49:43 +02:00
ZeinabBF	2725df46ed	Chnges to images location	2024-05-12 13:47:21 +02:00
ZeinabBF	408ff40170	Update README.md	2024-05-12 13:30:58 +02:00