FlorianU
f80e75c676
Merge branch 'main' into ui
2025-06-04 17:09:46 +02:00
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
efe9cf04ba
Added logic in spawn_pointer to handle line drawing (using a green line and marker). Made control panel wider and added a button, need to map it to function
2025-06-03 15:28:20 +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
922ced8dca
Merge branch 'pathfinding' of https://github.com/AndreasFranke5/TwinCity into pathfinding
2025-06-02 19:54:29 +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
7e8f55b075
Merge branch 'main' into pathfinding
2025-06-02 18:52:04 +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
Andreas Franke
1cd5aecba7
No errors but yet to be tested on Quest
2025-06-02 18:08:04 +02:00
Andreas Franke
3988efff94
Added shortest path calc logic but not done
2025-06-01 23:48:45 +02:00
Andreas Franke
c200a7d787
Drawing a path between two markers. WIP
2025-06-01 21:59:58 +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
EmanMhesin
b664277082
added UI flow: welcome screen with start button → instructions UI
...
added UI flow: welcome screen with start button → instructions UI
2025-05-24 17:22:11 +02:00
EmanMhesin
cfae995b34
Changed position of Canvas (Welcome)
...
Position: X = 0, Y = 1.5, Z = 2
Scale: X = 0.002, Y = 0.002, Z = 0.002
2025-05-24 10:49:58 +02:00
EmanMhesin
dec0fc83d5
XR UI Input Module Created
...
added components XR Interaction Manager and XR UI Input Module
2025-05-24 10:40:26 +02:00
EmanMhesin
1b8872a76b
Changed Overlay/Added Colliders in MainUI
...
Changed Overlay to World space of the MainUI and added colliders to buttons. Changed position of the Main UI/Rotation and Scale
2025-05-24 10:38:13 +02:00
EmanMhesin
6fe99f8cd0
Merge branch 'main' into ui
2025-05-24 10:20:23 +02:00
EmanMhesin
cd8da6dcef
added SDKs
2025-05-24 10:14:30 +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
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
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
