48 Commits

Author SHA1 Message Date
FlorianU
0f9ad407b9 Merge branch 'main' of https://github.com/AndreasFranke5/TwinCity 2025-06-04 20:21:15 +02:00
FlorianU
74c61968d2 fixed map movement 2025-06-04 19:22:54 +02:00
FlorianU
cfb314a79a fixed sprites 2025-06-04 19:01:23 +02:00
EmanMhesin
ce8e987572 Merge branch 'main' into ui 2025-06-04 18:39:30 +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
8855b70bb6 Created WelcomeUI script
Created WelcomeUI MonoBehaviour script
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
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
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
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
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
d4a9d3d680 yellow button 2025-05-27 13:42:02 +02:00
minhuizhong
48e13f6922 yellow pointer 2025-05-27 11:22:18 +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
58009c1582 Merge remote-tracking branch 'origin/florian' into marker 2025-05-23 15:18:16 +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
c29160e169 map is turnable and usable in AR 2025-05-22 20:38:30 +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
97bc95646f Update for button
Button
2025-05-22 14:57:51 +02:00
minhuizhong
3ba9c6c660 Update for button
Test
2025-05-22 10:46:41 +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
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
FlorianU
358b257341 implemented networked map rotation manager 2025-05-15 18:43:48 +02:00
Andreas Franke
ff825e3a1f Remove hardcoded API key from ApiKeyConfig.asset 2025-05-09 17:24:52 +02:00
Andreas Franke
fc48cafaa5 Setup Cesium and Google APIs. Ignore API key file in gitignore 2025-05-07 07:57:05 +02:00