FlorianU
0f9ad407b9
Merge branch 'main' of https://github.com/AndreasFranke5/TwinCity
2025-06-04 20:21:15 +02:00
FlorianU
1ab4db0706
fixed scenario switch
2025-06-04 19:45:28 +02:00
FlorianU
74c61968d2
fixed map movement
2025-06-04 19:22:54 +02:00
EmanMhesin
49f3c89f08
resolving conflicts
...
resolving conflicts
2025-06-04 18:39:33 +02:00
EmanMhesin
449de3305e
added two buttons to MainUI panel: 'Mark' and 'Draw'
...
added two buttons to MainUI panel: 'Mark' and 'Draw Path'
2025-06-04 18:38:57 +02:00
EmanMhesin
eb7420e956
added instructional panel and description text inside MainUI
...
added instructional panel and description text inside MainUI
2025-06-04 18:38:57 +02:00
EmanMhesin
9ce08c0d2c
added MainUI canvas with proper settings (hidden by default)
...
added MainUI canvas with proper settings (hidden by default)
2025-06-04 18:38:57 +02:00
EmanMhesin
0a56cc376d
Changed camera position and position of the button
2025-06-04 18:38:57 +02:00
EmanMhesin
d72335616b
Merge branch 'main' into ui
2025-06-04 18:38:57 +02:00
EmanMhesin
28f312a004
Position canvas 2m in front of camera at eye level
...
Position: 0, 1.5, 2
2025-06-04 18:37:33 +02:00
EmanMhesin
9086a765e7
Connect Start button to hide welcome screen
...
Selected Start Button
In Inspector, in OnClick() section:
Clicked +
Dragged UIManager in..
Selected WelcomeUI → StartExperience()
2025-06-04 18:37:32 +02:00
EmanMhesin
a4f762eadb
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-06-04 18:37:32 +02:00
EmanMhesin
9545fb0856
Added Start button below welcome title
2025-06-04 18:37:32 +02:00
EmanMhesin
10d2c6096d
Added TMP title text to welcome screen
...
Text Style: Title
Colour: 0A0E65
Position: - 23; 95; 0
2025-06-04 18:37:32 +02:00
EmanMhesin
1cf589584c
Created world space canvas for MR UI
...
Render Mode → World Space
Scale: 0.001 on X, Y, Z
2025-06-04 18:37:32 +02:00
EmanMhesin
cf03e82345
Created new scene
2025-06-04 18:37:32 +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
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
1467d57210
Merge branch 'main' into marker
2025-05-28 00:33: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
d4a9d3d680
yellow button
2025-05-27 13:42:02 +02:00
minhuizhong
48e13f6922
yellow pointer
2025-05-27 11:22:18 +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
43c8e365b1
deleted the old point version
2025-05-23 17:36:52 +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
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
