FlorianU
|
5ba5eec8dd
|
changed ray color to yellow
|
2025-05-23 17:54:44 +02:00 |
|
FlorianU
|
8fe55ff620
|
implemented ray from marker
|
2025-05-23 17:53:00 +02:00 |
|
|
|
43c8e365b1
|
deleted the old point version
|
2025-05-23 17:36:52 +02:00 |
|
FlorianU
|
bc7a77e40b
|
removed old prefabs
|
2025-05-23 17:26:03 +02:00 |
|
FlorianU
|
ec490d34cd
|
Merge pull request #4 from AndreasFranke5/florian
implemented better wrist menu
|
2025-05-23 17:24:43 +02:00 |
|
FlorianU
|
727f7601fe
|
implemented better wrist menu
|
2025-05-23 17:23:55 +02:00 |
|
FlorianU
|
9021f8d49d
|
deleted unnecessary old objects
|
2025-05-23 16:38:41 +02:00 |
|
FlorianU
|
47d1117d01
|
moved HandUI
|
2025-05-23 16:24:52 +02:00 |
|
|
|
58009c1582
|
Merge remote-tracking branch 'origin/florian' into marker
|
2025-05-23 15:18:16 +02:00 |
|
|
|
df3a2ec138
|
xr passthrough added
|
2025-05-23 15:17:18 +02:00 |
|
|
|
f52217ef10
|
movable marker added with spawn
|
2025-05-23 15:13:58 +02:00 |
|
EmanMhesin
|
ef32f20580
|
resolving conflicts
resolving conflicts
|
2025-05-23 14:26:38 +02:00 |
|
EmanMhesin
|
49c220dbf4
|
Merge branch 'main' into ui
|
2025-05-23 14:25:50 +02:00 |
|
FlorianU
|
eed72cc164
|
minor changes
|
2025-05-23 01:14:18 +02:00 |
|
FlorianU
|
d4f0a3c879
|
improved waterlevel and map rotation and moved water ui to hand
|
2025-05-23 01:01:32 +02:00 |
|
FlorianU
|
3f92d471f4
|
implemented pipe shape instead of cylinder
|
2025-05-22 22:32:33 +02:00 |
|
FlorianU
|
c29160e169
|
map is turnable and usable in AR
|
2025-05-22 20:38:30 +02:00 |
|
Andreas Franke
|
b18336a723
|
Update MRMultiplayerTestSceneAF.unity
|
2025-05-22 18:54:31 +02:00 |
|
Andreas Franke
|
dd58d9055b
|
Used manual knots in CesiumCartographicPolygon
|
2025-05-22 18:53:54 +02:00 |
|
Andreas Franke
|
527073a2f8
|
Added script for dynamic circle cropping
|
2025-05-22 16:04:25 +02:00 |
|
Andreas Franke
|
8947d4587e
|
Combining pedestal with Cesium 3D map in new scene MRMultiplayerTestSceneAF
|
2025-05-22 15:21:18 +02:00 |
|
|
|
97bc95646f
|
Update for button
Button
|
2025-05-22 14:57:51 +02:00 |
|
EmanMhesin
|
93c8ed4588
|
added two buttons to MainUI panel: 'Mark' and 'Draw'
added two buttons to MainUI panel: 'Mark' and 'Draw Path'
|
2025-05-22 14:43:40 +02:00 |
|
EmanMhesin
|
cc113e0072
|
added instructional panel and description text inside MainUI
added instructional panel and description text inside MainUI
|
2025-05-22 14:36:12 +02:00 |
|
EmanMhesin
|
7c15bd1e6c
|
added MainUI canvas with proper settings (hidden by default)
added MainUI canvas with proper settings (hidden by default)
|
2025-05-22 14:29:53 +02:00 |
|
EmanMhesin
|
2404de92f8
|
Changed camera position and position of the button
|
2025-05-22 14:21:43 +02:00 |
|
EmanMhesin
|
fb12dddc46
|
Merge branch 'main' into ui
|
2025-05-22 13:29:19 +02:00 |
|
minhuizhong
|
3ba9c6c660
|
Update for button
Test
|
2025-05-22 10:46:41 +02:00 |
|
|
|
0dc9636d6b
|
Update
Update marker1
|
2025-05-21 12:01:26 +02:00 |
|
minhuizhong
|
2b81c635bb
|
new version button
New version button
|
2025-05-20 11:42:27 +02:00 |
|
Andreas Franke
|
ca92eed417
|
Merge pull request #1 from AndreasFranke5/marker
Marker
|
2025-05-19 14:54:00 +02:00 |
|
FlorianU
|
d4512474d8
|
Merge pull request #3 from AndreasFranke5/florian
Implemented test map with rotation and changing of waterlevel
|
2025-05-19 02:29:22 +02:00 |
|
FlorianU
|
940d84aa94
|
implemented changing of waterlevel correctly
|
2025-05-19 02:28:52 +02:00 |
|
FlorianU
|
7ad4209969
|
implemented circular map on cylinder
|
2025-05-19 00:38:19 +02:00 |
|
Andreas Franke
|
442ef8ff07
|
Merge pull request #2 from AndreasFranke5/cesium
Cesium
|
2025-05-17 23:20:50 +02:00 |
|
Andreas Franke
|
ab56f2a05d
|
Merge main into cesium, resolved Photon conflicts
|
2025-05-17 23:15:28 +02:00 |
|
Andreas Franke
|
5ab164ad86
|
Added basic 3d world map in MRMultiplayerCesiumTestScene
|
2025-05-17 22:54:48 +02:00 |
|
FlorianU
|
220a2babff
|
Added WaterLevelControlUI
|
2025-05-17 22:36:44 +02:00 |
|
|
|
6bece3cab5
|
created a buttom and spawnmanager
buttom have some problem and need to fix it
|
2025-05-16 16:11:36 +02:00 |
|
|
|
63feaf9e0c
|
update
|
2025-05-16 12:36:11 +02:00 |
|
minhuizhong
|
8482f74bfc
|
Merge branch 'main' into marker
|
2025-05-16 11:30:59 +02:00 |
|
FlorianU
|
358b257341
|
implemented networked map rotation manager
|
2025-05-15 18:43:48 +02:00 |
|
FlorianU
|
9056ceef0d
|
added VR UI Package
|
2025-05-15 16:25:40 +02:00 |
|
|
|
805f14a66f
|
Raygrab interaction on marker1
Ray interaction
|
2025-05-15 16:13:37 +02:00 |
|
FlorianU
|
fe13295400
|
added occluded rotating sphere
|
2025-05-15 16:04:38 +02:00 |
|
EmanMhesin
|
1c28a6cba7
|
Position canvas 2m in front of camera at eye level
Position: 0, 1.5, 2
|
2025-05-13 13:43:04 +02:00 |
|
EmanMhesin
|
cc7b17ed38
|
Connect Start button to hide welcome screen
Selected Start Button
In Inspector, in OnClick() section:
Clicked +
Dragged UIManager in..
Selected WelcomeUI → StartExperience()
|
2025-05-13 13:39:10 +02:00 |
|
EmanMhesin
|
f1ad5c3504
|
Added WelcomeUI script to UIManager and linked canvas
Added WelcomeUI script to UIManager and linked canvas (dragged canvas to UI panel field in the script that is attached to UI manager)
|
2025-05-13 13:24:39 +02:00 |
|
EmanMhesin
|
df30eaf470
|
Created WelcomeUI script
Created WelcomeUI MonoBehaviour script
|
2025-05-13 13:17:05 +02:00 |
|
EmanMhesin
|
b16c5d42f2
|
Added Start button below welcome title
|
2025-05-13 12:58:07 +02:00 |
|
