Commit Graph

Select branches

Hide Pull Requests

feat/design-asset

feat/design-ui

feat/house-panel

feat/integration-collab

feat/integration-v1

feat/ms-solar-energy

feat/poc-integration-backend

main

#1

#10

#11

#12

#13

#14

#15

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• d003abf6c9 fixing image on readme file main ernestoagc 2025-06-12 17:19:54 -05:00
• be0c6580c8 Merge branch 'main' of github.com:ernestoagc/su-dcdc-2025-group-2 ernestoagc 2025-06-12 17:18:37 -05:00
• 509dec0d4f adding images on readme ernestoagc 2025-06-12 17:18:18 -05:00
• 38ae2b9c37
  Add files via upload Evgeniia (Zhenya) Dolgikh 2025-06-13 00:17:21 +02:00
• 7245ca00e4 adding digital twien concept on readme file ernestoagc 2025-06-12 13:18:49 -05:00
• 39a7469d4e adding feature section ernestoagc 2025-06-12 09:57:44 -05:00
• 02ed23afd6 updating image architecture ernestoagc 2025-06-12 09:32:57 -05:00
• aab3983c9a adding architecture diagram ernestoagc 2025-06-12 09:31:42 -05:00
• 679c3c373a
  Update README.md Evgeniia (Zhenya) Dolgikh 2025-06-11 21:01:22 +02:00
• 3530136fd8
  Update README.md Evgeniia (Zhenya) Dolgikh 2025-06-11 10:54:55 +02:00
• 22b0344e52
  Merge pull request #15 from ernestoagc/feat/integration-v1 ernestoagc 2025-06-09 11:30:46 +02:00
• ab3da5cfc5 adding backend microservice feat/integration-v1 ernestoagc 2025-06-09 04:24:21 -05:00
• 1edb1df8bc
  Merge pull request #14 from ernestoagc/feat/integration-v1 ernestoagc 2025-06-08 05:26:01 +02:00
• fed07af5ef fixed bug with panels FlorianU 2025-06-04 03:11:30 +02:00
• 86091bfa5b Implemented networked objects FlorianU 2025-06-04 02:54:06 +02:00
• 2f1c863557 Control UI is networked FlorianU 2025-06-04 01:20:35 +02:00
• 15e41e78e8 networked city data FlorianU 2025-06-03 23:47:13 +02:00
• 3c041d840e Multiplayer works with nametags FlorianU 2025-06-03 20:57:30 +02:00
• eda1eb2811 Implemented fusion sdk and configured FlorianU 2025-06-03 20:05:11 +02:00
• 52344a5de7 panel updaes information, works Faterehh 2025-06-03 14:30:58 +02:00
• dc10d5c030 basic functions work no error Faterehh 2025-06-03 14:15:09 +02:00
• e1ea71ca8d updating setting panel ernestoagc 2025-06-03 05:55:52 -05:00
• 32bd6d6ff8 testcommit Faterehh 2025-06-03 11:58:42 +02:00
• ef34479188 no errors version Faterehh 2025-06-03 10:22:09 +02:00
• 483f90b1ed changes Evgeniia (Zhenya) Dolgikh 2025-06-03 10:03:32 +02:00
• 3fbae3f722 updated textures feat/integration-collab zhenyadolgikh 2025-05-30 16:45:32 +02:00
• a5929ac5e4 integrating map to principal scene ernestoagc 2025-05-28 11:33:17 +02:00
• ec4fb40e7e adding map interaction ernestoagc 2025-05-28 11:14:45 +02:00
• cdff76fd25 adding roof with 45 60 and 75 angle ernestoagc 2025-05-28 05:32:12 +02:00
• 926ff8ea10 tablet integrated into principal scene Faterehh 2025-05-27 14:40:37 +02:00
• 3b7e360978 submitting new roof angle ernestoagc 2025-05-27 14:25:31 +02:00
• e294dcf628 fixed bin scene and tablet scene Faterehh 2025-05-27 14:03:47 +02:00
• a4b098d21f tablet scene fixed, tablet no longer falls through Faterehh 2025-05-27 13:50:58 +02:00
• 0e8ad86f4f fixing gravity zhenyadolgikh 2025-05-27 13:24:23 +02:00
• fb17024f86 Merge branch 'feat/design-asset' into feat/integration-v1 zhenyadolgikh 2025-05-27 12:18:01 +02:00
• b80b27c279 Update TheMainScAPPROACH2.unity feat/design-asset zhenyadolgikh 2025-05-27 12:11:27 +02:00
• f17920be15 fixing issues on panel setting ernestoagc 2025-05-27 03:59:37 +02:00
• 4658c2b976
  Merge pull request #13 from ernestoagc/feat/integration-v1 ernestoagc 2025-05-26 13:25:48 +02:00
• b04248cb72 adding solar panel point snap on all roof for angle 15 ernestoagc 2025-05-26 13:25:23 +02:00
• 5ca3879ad1 snapping solar panel on roof ernestoagc 2025-05-26 04:45:13 +02:00
• 15ef1587b9 adding principal scene ernestoagc 2025-05-24 18:37:05 +02:00
• 1311924e29 Merge branch 'feat/design-asset' into feat/integration-v1 zhenyadolgikh 2025-05-23 21:34:25 +02:00
• f09b383b69 snap roof and roof spawn button workiiing zhenyadolgikh 2025-05-23 21:30:56 +02:00
• c2f3e7ff5e
  Merge pull request #12 from ernestoagc/feat/integration-v1 ernestoagc 2025-05-22 18:41:51 +02:00
• 34ebb23208
  Merge pull request #11 from ernestoagc/feat/poc-integration-backend ernestoagc 2025-05-22 18:41:00 +02:00
• bf4320308d
  Merge pull request #10 from ernestoagc/feat/poc-integration-backend ernestoagc 2025-05-22 18:40:35 +02:00
• ee9df25b30 adding poke interaction on setting panel feat/poc-integration-backend ernestoagc 2025-05-22 18:39:59 +02:00
• b64cb439bc merged map, tablet and bin objects into scene with house zhenyadolgikh 2025-05-22 14:05:40 +02:00
• 42dc130c13 changes from safe mode for it to work zhenyadolgikh 2025-05-21 22:34:38 +02:00
• 167668a3d6 Merge branch 'feat/design-ui' into feat/integration-v1 zhenyadolgikh 2025-05-21 22:12:49 +02:00
• 909204002b fixed issue zhenyadolgikh 2025-05-21 16:48:01 +02:00
• 99e68e06b1 solar panel snap alternative zhenyadolgikh 2025-05-21 16:29:19 +02:00
• 40f8cf631e add bin feat/design-ui Faterehh 2025-05-21 16:25:35 +02:00
• 1e0c1ba065 new button test zhenyadolgikh 2025-05-21 14:46:44 +02:00
• e8abed4adc new push zhenyadolgikh 2025-05-21 00:18:40 +02:00
• 11ac683a82 snap roof, buttons fix zhenyadolgikh 2025-05-20 21:36:45 +02:00
• 5c8edd1c60 added package zhenyadolgikh 2025-05-20 19:38:49 +02:00
• 5c69e2fbee attached canvas to camera rig zhenyadolgikh 2025-05-20 19:15:49 +02:00
• a9baf3943f solarpanel object and scripts to test zhenyadolgikh 2025-05-20 18:51:20 +02:00
• 4b321d28d2
  Merge pull request #9 from ernestoagc/feat/poc-integration-backend ernestoagc 2025-05-19 04:04:10 +02:00
• 901ce570cf adding setting panel and calling api ernestoagc 2025-05-19 04:03:28 +02:00
• 131aa9fa97 add map/button city Faterehh 2025-05-16 16:03:43 +02:00
• f5c12b7151 tablet ui Faterehh 2025-05-15 16:05:31 +02:00
• 5bfe38f43e
  Merge pull request #8 from ernestoagc/feat/design-asset Evgeniia (Zhenya) Dolgikh 2025-05-15 13:42:31 +02:00
• 53a64096f1
  Merge branch 'main' into feat/design-asset Evgeniia (Zhenya) Dolgikh 2025-05-15 13:42:19 +02:00
• 41e3d2ed86 approach 2 ned buttons for roof zhenyadolgikh 2025-05-15 13:36:56 +02:00
• 668407328a another try Faterehh 2025-05-15 09:50:14 +02:00
• e696c242ad
  Merge pull request #7 from ernestoagc/feat/poc-integration-backend ernestoagc 2025-05-15 02:11:47 +02:00
• 44d996a374 calling api ernestoagc 2025-05-15 02:11:10 +02:00
• 200065b259
  Merge pull request #6 from ernestoagc/feat/design-asset feat/house-panel Evgeniia (Zhenya) Dolgikh 2025-05-14 22:42:01 +02:00
• 20bb89cd72 changed sdk version zhenyadolgikh 2025-05-14 22:41:38 +02:00
• 905be78a6c poke interaction(increase and decrease) Faterehh 2025-05-14 15:55:41 +02:00
• cdb1dc3ebd
  Merge pull request #5 from ernestoagc/feat/design-asset Evgeniia (Zhenya) Dolgikh 2025-05-13 21:13:59 +02:00
• 776859df7f renamed scene zhenyadolgikh 2025-05-13 21:13:41 +02:00
• 05c6c8b240
  Merge pull request #4 from ernestoagc/feat/design-asset Evgeniia (Zhenya) Dolgikh 2025-05-13 21:06:31 +02:00
• 8207902306 roof adjustment, overall scene and canvas with slider zhenyadolgikh 2025-05-13 21:06:09 +02:00
• 7ee9869a57 rigid body Faterehh 2025-05-13 17:03:03 +02:00
• b334ee8382 Depth Api Faterehh 2025-05-13 14:57:32 +02:00
• d800ffcb86 add report ui Faterehh 2025-05-12 18:08:58 +02:00
• 51ee353474
  Merge pull request #3 from ernestoagc/feat/design-asset Evgeniia (Zhenya) Dolgikh 2025-05-12 13:02:50 +02:00
• a11fa7002f Added 3d models for house etc zhenyadolgikh 2025-05-12 13:02:11 +02:00
• ce4af59750
  Merge pull request #2 from ernestoagc/feat/design-asset feat/ms-solar-energy Evgeniia (Zhenya) Dolgikh 2025-05-09 14:50:22 +02:00
• a0dbe92d22 setting up done, needs testing zhenyadolgikh 2025-05-09 14:50:05 +02:00
• 3f5fc33948
  Merge pull request #1 from ernestoagc/feat/design-asset Evgeniia (Zhenya) Dolgikh 2025-05-08 20:40:15 +02:00
• 752c76f9c0 paththrough fixed, needs check zhenyadolgikh 2025-05-08 20:33:43 +02:00
• e984e49172 Update Anton SDF.asset Faterehh 2025-05-08 15:26:46 +02:00
• b074648685 adding energy efficiency ui Faterehh 2025-05-08 15:15:00 +02:00
• 59af897205 submitting unity project ernestoagc 2025-05-04 01:08:56 +02:00