Commit Graph

Select branches

Hide Pull Requests

Min

cesium

florian

main

marker

merge

minhui

pathfinding

ui

#1

#10

#11

#12

#13

#14

#15

#16

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 02c7500bfd
  Merge pull request #7 from AndreasFranke5/florian FlorianU 2025-05-30 15:35:21 +02:00
• db1bc700bd cleaned up markers, animated water, fixed marker size and rotation FlorianU 2025-05-30 15:35:07 +02:00
• c55bff7523 changed color and implemented labels for buttons FlorianU 2025-05-30 14:44:37 +02:00
• 2a00bd2add [minhui] marker creating and interacting minhuizhong 2025-05-30 13:29:03 +02:00
• 4813a3b38c implemented markers in main scene FlorianU 2025-05-28 02:13:23 +02:00
• 734f653e6a
  Merge pull request #6 from AndreasFranke5/marker FlorianU 2025-05-28 00:33:30 +02:00
• 1467d57210
  Merge branch 'main' into marker marker FlorianU 2025-05-28 00:33:23 +02:00
• 790e16210b
  Merge pull request #5 from AndreasFranke5/florian FlorianU 2025-05-28 00:31:47 +02:00
• 9cda4a8fb1 changed map location FlorianU 2025-05-28 00:27:28 +02:00
• 20d6c28a97 removed linerenderer FlorianU 2025-05-27 22:37:26 +02:00
• c311de04cd Merge branch 'main' into florian FlorianU 2025-05-27 13:47:09 +02:00
• d4a9d3d680 yellow button Minhui Zhong 2025-05-27 13:42:02 +02:00
• 48e13f6922 yellow pointer minhuizhong 2025-05-27 11:22:18 +02:00
• b664277082 added UI flow: welcome screen with start button → instructions UI EmanMhesin 2025-05-24 17:22:11 +02:00
• cfae995b34 Changed position of Canvas (Welcome) EmanMhesin 2025-05-24 10:49:58 +02:00
• dec0fc83d5 XR UI Input Module Created EmanMhesin 2025-05-24 10:40:26 +02:00
• 1b8872a76b Changed Overlay/Added Colliders in MainUI EmanMhesin 2025-05-24 10:38:13 +02:00
• 6fe99f8cd0 Merge branch 'main' into ui EmanMhesin 2025-05-24 10:20:23 +02:00
• cd8da6dcef added SDKs EmanMhesin 2025-05-24 10:14:30 +02:00
• 5ba5eec8dd changed ray color to yellow FlorianU 2025-05-23 17:54:44 +02:00
• 8fe55ff620 implemented ray from marker FlorianU 2025-05-23 17:53:00 +02:00
• 43c8e365b1 deleted the old point version Minhui Zhong 2025-05-23 17:36:52 +02:00
• bc7a77e40b removed old prefabs FlorianU 2025-05-23 17:26:03 +02:00
• ec490d34cd
  Merge pull request #4 from AndreasFranke5/florian FlorianU 2025-05-23 17:24:43 +02:00
• 727f7601fe implemented better wrist menu FlorianU 2025-05-23 17:23:55 +02:00
• 9021f8d49d deleted unnecessary old objects FlorianU 2025-05-23 16:38:41 +02:00
• 47d1117d01 moved HandUI FlorianU 2025-05-23 16:24:52 +02:00
• 58009c1582 Merge remote-tracking branch 'origin/florian' into marker Minhui Zhong 2025-05-23 15:18:16 +02:00
• df3a2ec138 xr passthrough added Minhui Zhong 2025-05-23 15:17:18 +02:00
• f52217ef10 movable marker added with spawn Minhui Zhong 2025-05-23 15:13:58 +02:00
• ef32f20580 resolving conflicts EmanMhesin 2025-05-23 14:26:38 +02:00
• 49c220dbf4 Merge branch 'main' into ui EmanMhesin 2025-05-23 14:25:50 +02:00
• eed72cc164 minor changes FlorianU 2025-05-23 01:14:18 +02:00
• d4f0a3c879 improved waterlevel and map rotation and moved water ui to hand FlorianU 2025-05-23 01:01:32 +02:00
• 3f92d471f4 implemented pipe shape instead of cylinder FlorianU 2025-05-22 22:32:33 +02:00
• c29160e169 map is turnable and usable in AR FlorianU 2025-05-22 20:38:30 +02:00
• b18336a723 Update MRMultiplayerTestSceneAF.unity Andreas Franke 2025-05-22 18:54:31 +02:00
• dd58d9055b Used manual knots in CesiumCartographicPolygon Andreas Franke 2025-05-22 18:53:54 +02:00
• 527073a2f8 Added script for dynamic circle cropping Andreas Franke 2025-05-22 16:04:25 +02:00
• 8947d4587e Combining pedestal with Cesium 3D map in new scene MRMultiplayerTestSceneAF Andreas Franke 2025-05-22 15:21:18 +02:00
• 97bc95646f Update for button Minhui Zhong 2025-05-22 14:57:51 +02:00
• 93c8ed4588 added two buttons to MainUI panel: 'Mark' and 'Draw' EmanMhesin 2025-05-22 14:43:40 +02:00
• cc113e0072 added instructional panel and description text inside MainUI EmanMhesin 2025-05-22 14:36:12 +02:00
• 7c15bd1e6c added MainUI canvas with proper settings (hidden by default) EmanMhesin 2025-05-22 14:29:53 +02:00
• 2404de92f8 Changed camera position and position of the button EmanMhesin 2025-05-22 14:21:43 +02:00
• fb12dddc46 Merge branch 'main' into ui EmanMhesin 2025-05-22 13:29:19 +02:00
• 3ba9c6c660 Update for button minhuizhong 2025-05-22 10:46:41 +02:00
• 0dc9636d6b Update Minhui Zhong 2025-05-21 12:01:26 +02:00
• 2b81c635bb new version button minhuizhong 2025-05-20 11:42:27 +02:00
• ca92eed417
  Merge pull request #1 from AndreasFranke5/marker Andreas Franke 2025-05-19 14:54:00 +02:00
• d4512474d8
  Merge pull request #3 from AndreasFranke5/florian FlorianU 2025-05-19 02:29:22 +02:00
• 940d84aa94 implemented changing of waterlevel correctly FlorianU 2025-05-19 02:28:52 +02:00
• 7ad4209969 implemented circular map on cylinder FlorianU 2025-05-19 00:38:19 +02:00
• 442ef8ff07
  Merge pull request #2 from AndreasFranke5/cesium Andreas Franke 2025-05-17 23:20:50 +02:00
• ab56f2a05d Merge main into cesium, resolved Photon conflicts cesium Andreas Franke 2025-05-17 23:15:28 +02:00
• 5ab164ad86 Added basic 3d world map in MRMultiplayerCesiumTestScene Andreas Franke 2025-05-17 22:54:48 +02:00
• 220a2babff Added WaterLevelControlUI FlorianU 2025-05-17 22:36:44 +02:00
• 6bece3cab5 created a buttom and spawnmanager Minhui Zhong 2025-05-16 16:11:36 +02:00
• 63feaf9e0c update Minhui Zhong 2025-05-16 12:36:11 +02:00
• 8482f74bfc Merge branch 'main' into marker minhuizhong 2025-05-16 11:30:59 +02:00
• 358b257341 implemented networked map rotation manager FlorianU 2025-05-15 18:43:48 +02:00
• 9056ceef0d added VR UI Package FlorianU 2025-05-15 16:25:40 +02:00
• 805f14a66f Raygrab interaction on marker1 Minhui Zhong 2025-05-15 16:13:37 +02:00
• fe13295400 added occluded rotating sphere FlorianU 2025-05-15 16:04:38 +02:00
• 1c28a6cba7 Position canvas 2m in front of camera at eye level EmanMhesin 2025-05-13 13:43:04 +02:00
• cc7b17ed38 Connect Start button to hide welcome screen EmanMhesin 2025-05-13 13:39:10 +02:00
• f1ad5c3504 Added WelcomeUI script to UIManager and linked canvas EmanMhesin 2025-05-13 13:24:39 +02:00
• df30eaf470 Created WelcomeUI script EmanMhesin 2025-05-13 13:17:05 +02:00
• b16c5d42f2 Added Start button below welcome title EmanMhesin 2025-05-13 12:58:07 +02:00
• e96e5e35e8 Added TMP title text to welcome screen EmanMhesin 2025-05-13 12:54:00 +02:00
• 359f251ee2 Created world space canvas for MR UI EmanMhesin 2025-05-13 12:44:56 +02:00
• 45fee57960 Ray Interaction example Minhui Zhong 2025-05-12 15:56:20 +02:00
• 5a1bf72a6b
  Update README.md Minhui Zhong 2025-05-12 14:41:54 +02:00
• 1d6c3dec03 Update Eman.unity Andreas Franke 2025-05-12 13:09:48 +02:00
• 412b561736 AF Andreas Franke 2025-05-12 13:08:17 +02:00
• dd3c851b56 Created new scene EmanMhesin 2025-05-12 12:22:18 +02:00
• ff825e3a1f Remove hardcoded API key from ApiKeyConfig.asset Andreas Franke 2025-05-09 17:24:52 +02:00
• d491b30b87 implemented multiplayer with photon fusion FlorianU 2025-05-08 19:02:46 +02:00
• 49d0fea503 implemented scene understanding and occlusion FlorianU 2025-05-08 17:04:09 +02:00
• 9dc9eb9696 implemented occlusion FlorianU 2025-05-08 16:01:51 +02:00
• cca4a91272 implemented pass-through FlorianU 2025-05-08 15:25:56 +02:00
• 4aecefd088 implemented MR TestScene FlorianU 2025-05-08 15:21:20 +02:00
• 261a6b4de8 fixed initial setup with correct sdk version FlorianU 2025-05-08 15:06:23 +02:00
• 9e5f4a6f0c added meta xr plugins and packages FlorianU 2025-05-07 15:31:00 +02:00
• fc48cafaa5 Setup Cesium and Google APIs. Ignore API key file in gitignore Andreas Franke 2025-05-07 07:57:05 +02:00
• c8916a11b1 Initial Unity project setup Andreas Franke 2025-05-07 06:04:18 +02:00