Commit Graph

57 Commits

Author SHA1 Message Date
FlorianU
f070441f24 implemented routes and improved performance, also removed boundary spawner 2025-06-04 16:42:20 +02:00
Andreas Franke
bba9444fcd Merge branch 'pathfinding' of https://github.com/AndreasFranke5/TwinCity into pathfinding 2025-06-03 19:01:47 +02:00
Andreas Franke
ba186feb9c Deleted a prefab from the hierarchy and also fixed a missing assign in the Marker Spawn Manager 2025-06-03 19:01:44 +02:00
FlorianU
a9ac8efc5c rearranged buttons 2025-06-03 18:30:26 +02:00
Andreas Franke
f1830af42b Made line horizontally aligned (line corners are on the same height), changed line color, added tip to make lines originate lower 2025-06-03 17:23:10 +02:00
Andreas Franke
ac0e8400c9 Made green button and marker, mapped everything.
Control panel has a green button that spawns green markers. These markers should draw a line between them. May need to modify the line spawn point on the marker
2025-06-03 15:52:27 +02:00
Andreas Franke
0bba8dec66 Merge branch 'main' into pathfinding 2025-06-03 14:13:09 +02:00
FlorianU
a71aba745d implemented scenario switching 2025-06-03 02:15:16 +02:00
FlorianU
ff0db1526b implemented grabbable handle to reposition map 2025-06-03 00:53:46 +02:00
Andreas Franke
4a5dcd05c4 Assigned some scripts to gameobjects 2025-06-02 20:53:15 +02:00
Andreas Franke
b364c293b6 Building works. Pathfinder not tested 2025-06-02 19:53:43 +02:00
FlorianU
b99a915145 fixed marker ray 2025-06-02 19:13:39 +02:00
FlorianU
b101e7a6b9 fixed multiplayer water setting and rotation 2025-06-02 18:18:28 +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
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
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
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
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
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
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
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
Andreas Franke
1d6c3dec03 Update Eman.unity 2025-05-12 13:09:48 +02:00
Andreas Franke
412b561736 AF 2025-05-12 13:08:17 +02:00
EmanMhesin
dd3c851b56 Created new scene 2025-05-12 12:22:18 +02:00
FlorianU
d491b30b87 implemented multiplayer with photon fusion 2025-05-08 19:02:46 +02:00