minhuizhong
|
ba130bdbe1
|
File to images
|
2025-06-05 16:08:21 +02:00 |
|
minhuizhong
|
9765b4b4f8
|
Merge branch 'main' into minhui
|
2025-06-03 10:56:52 +02:00 |
|
FlorianU
|
41f4c45460
|
Merge pull request #9 from AndreasFranke5/florian
Florian
|
2025-06-02 18:44:29 +02:00 |
|
FlorianU
|
5481f29f50
|
fixed networked markers
|
2025-06-02 18:44:13 +02:00 |
|
FlorianU
|
b101e7a6b9
|
fixed multiplayer water setting and rotation
|
2025-06-02 18:18:28 +02:00 |
|
minhuizhong
|
4b0992e236
|
deleted old marker1
|
2025-06-02 14:39:06 +02:00 |
|
FlorianU
|
3fb99410b6
|
Merge pull request #8 from AndreasFranke5/florian
Florian
|
2025-05-30 17:11:01 +02:00 |
|
FlorianU
|
cef7ead8fe
|
implemented networked tracking of pointers
|
2025-05-30 17:10:41 +02:00 |
|
FlorianU
|
acd9e97a95
|
fixed spawn rotation
|
2025-05-30 16:07:41 +02:00 |
|
FlorianU
|
02c7500bfd
|
Merge pull request #7 from AndreasFranke5/florian
Florian
|
2025-05-30 15:35:21 +02:00 |
|
FlorianU
|
db1bc700bd
|
cleaned up markers, animated water, fixed marker size and rotation
|
2025-05-30 15:35:07 +02:00 |
|
FlorianU
|
c55bff7523
|
changed color and implemented labels for buttons
|
2025-05-30 14:44:37 +02:00 |
|
minhuizhong
|
2a00bd2add
|
[minhui] marker creating and interacting
|
2025-05-30 13:29:03 +02:00 |
|
FlorianU
|
4813a3b38c
|
implemented markers in main scene
|
2025-05-28 02:13:23 +02:00 |
|
FlorianU
|
9cda4a8fb1
|
changed map location
|
2025-05-28 00:27:28 +02:00 |
|
FlorianU
|
20d6c28a97
|
removed linerenderer
|
2025-05-27 22:37:26 +02:00 |
|
FlorianU
|
c311de04cd
|
Merge branch 'main' into florian
|
2025-05-27 13:47:09 +02:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
|
|
45fee57960
|
Ray Interaction example
Setup
|
2025-05-12 15:56:20 +02:00 |
|
|
|
5a1bf72a6b
|
Update README.md
|
2025-05-12 14:41:54 +02:00 |
|
Andreas Franke
|
1d6c3dec03
|
Update Eman.unity
|
2025-05-12 13:09:48 +02:00 |
|
