Commit Graph

Select branches

Hide Pull Requests

Min

cesium

florian

main

marker

merge

minhui

pathfinding

ui

#1

#10

#11

#12

#13

#14

#15

#16

#2

#3

#4

#5

#6

#7

#8

#9

Mono Color

• 4274da23c4
  Update README.md main Andreas Franke 2025-06-13 00:12:49 +02:00
• 48f3389036
  Update README.md Andreas Franke 2025-06-13 00:02:14 +02:00
• 14b4f1e763
  Update README.md Andreas Franke 2025-06-12 23:47:36 +02:00
• 2d4dc02a42
  Update README.mdd Minhui Zhong 2025-06-12 23:23:20 +02:00
• 9dad43022b changes to readme FlorianU 2025-06-12 00:28:37 +02:00
• e839b284fb small change in readme FlorianU 2025-06-11 23:57:24 +02:00
• 15bf10bdf3 Merge branch 'main' of https://github.com/AndreasFranke5/TwinCity FlorianU 2025-06-11 23:53:33 +02:00
• 02a5a7f51e
  Update README.md Minhui Zhong 2025-06-11 22:27:15 +02:00
• 0f78b6af27
  Update README.md Minhui Zhong 2025-06-11 22:26:14 +02:00
• 0e62463bc6
  Update README.md Minhui Zhong 2025-06-11 22:25:20 +02:00
• 2cecc455d8
  Update README.md Minhui Zhong 2025-06-11 22:24:50 +02:00
• da3057b6c4
  Update README.md Minhui Zhong 2025-06-11 22:21:16 +02:00
• e4da4b435d
  Update README.md Minhui Zhong 2025-06-11 22:09:40 +02:00
• 0440987c28
  Update README.md Minhui Zhong 2025-06-11 22:08:28 +02:00
• 0053fc3e6f
  Update README.md Minhui Zhong 2025-06-11 22:06:19 +02:00
• 9aadd8eb7e
  Update README.md Minhui Zhong 2025-06-11 21:11:50 +02:00
• 4cc2b3a35d
  Add files via upload Minhui Zhong 2025-06-11 21:05:02 +02:00
• 3ef853ba1c
  Update README.md Minhui Zhong 2025-06-11 20:27:37 +02:00
• dab49a393f
  Update README.md Minhui Zhong 2025-06-11 19:26:35 +02:00
• eda0424531
  Update README.md Minhui Zhong 2025-06-11 19:25:23 +02:00
• 313ce0f861
  Add files via upload Minhui Zhong 2025-06-11 19:24:32 +02:00
• 6f56d26e57
  Update README.md Minhui Zhong 2025-06-05 19:35:46 +02:00
• d37c3c392e
  Update README.md Minhui Zhong 2025-06-05 19:35:10 +02:00
• 13a4944507
  Update README.md Minhui Zhong 2025-06-05 19:32:42 +02:00
• a6a216799c
  Update README.md Minhui Zhong 2025-06-05 18:27:40 +02:00
• d3110adfe3
  Update README.md Minhui Zhong 2025-06-05 18:09:34 +02:00
• 66195854d3
  Update README.md Minhui Zhong 2025-06-05 18:08:41 +02:00
• cf930a719a
  Update README.md Minhui Zhong 2025-06-05 17:59:56 +02:00
• 58458bc1dd
  Add files via upload Minhui Zhong 2025-06-05 17:58:14 +02:00
• c60640a621
  Add files via upload Minhui Zhong 2025-06-05 17:38:10 +02:00
• 261b8120d1
  Update README.md Minhui Zhong 2025-06-05 17:31:48 +02:00
• 239c83d0c8
  Update README.md Minhui Zhong 2025-06-05 17:30:10 +02:00
• 3c16ec6cb2
  Add files via upload Minhui Zhong 2025-06-05 17:29:47 +02:00
• e7703bf44e
  Update README.md Minhui Zhong 2025-06-05 17:26:18 +02:00
• abea6ea3ea
  Add files via upload Minhui Zhong 2025-06-05 17:21:08 +02:00
• 665f9b5cc0
  Update README.md Minhui Zhong 2025-06-05 17:15:15 +02:00
• ab4ec69187
  Delete Images/images Andreas Franke 2025-06-05 17:14:31 +02:00
• 027764f85e
  Add files via upload Andreas Franke 2025-06-05 17:14:18 +02:00
• 3c3b1c4704
  Create images Andreas Franke 2025-06-05 17:14:03 +02:00
• 356c7df443 pictures for readme file Min minhuizhong 2025-06-05 16:28:41 +02:00
• 6542359d69
  Merge pull request #16 from AndreasFranke5/Min Minhui Zhong 2025-06-05 16:23:44 +02:00
• a01e26c6f7 Images folder minhuizhong 2025-06-05 16:22:55 +02:00
• ba130bdbe1 File to images minhui minhuizhong 2025-06-05 16:08:21 +02:00
• b25b886817
  Update README.md Minhui Zhong 2025-06-05 16:02:45 +02:00
• da9da85246 pushed images merge FlorianU 2025-06-04 21:01:20 +02:00
• 0f9ad407b9 Merge branch 'main' of https://github.com/AndreasFranke5/TwinCity FlorianU 2025-06-04 20:21:15 +02:00
• d3de7c4048
  Merge pull request #14 from AndreasFranke5/merge FlorianU 2025-06-04 19:45:45 +02:00
• 1ab4db0706 fixed scenario switch FlorianU 2025-06-04 19:45:28 +02:00
• 74c61968d2 fixed map movement FlorianU 2025-06-04 19:22:54 +02:00
• cfb314a79a fixed sprites FlorianU 2025-06-04 19:01:23 +02:00
• 72bd8f185b Merge pull request #12 from AndreasFranke5/pathfinding FlorianU 2025-06-04 16:42:49 +02:00
• 49f3c89f08 resolving conflicts EmanMhesin 2025-05-23 14:26:38 +02:00
• ce8e987572 Merge branch 'main' into ui EmanMhesin 2025-05-23 14:25:50 +02:00
• 449de3305e added two buttons to MainUI panel: 'Mark' and 'Draw' EmanMhesin 2025-05-22 14:43:40 +02:00
• eb7420e956 added instructional panel and description text inside MainUI EmanMhesin 2025-05-22 14:36:12 +02:00
• 9ce08c0d2c added MainUI canvas with proper settings (hidden by default) EmanMhesin 2025-05-22 14:29:53 +02:00
• 0a56cc376d Changed camera position and position of the button EmanMhesin 2025-05-22 14:21:43 +02:00
• d72335616b Merge branch 'main' into ui EmanMhesin 2025-05-22 13:29:19 +02:00
• 28f312a004 Position canvas 2m in front of camera at eye level EmanMhesin 2025-05-13 13:43:04 +02:00
• 9086a765e7 Connect Start button to hide welcome screen EmanMhesin 2025-05-13 13:39:10 +02:00
• a4f762eadb Added WelcomeUI script to UIManager and linked canvas EmanMhesin 2025-05-13 13:24:39 +02:00
• 8855b70bb6 Created WelcomeUI script EmanMhesin 2025-05-13 13:17:05 +02:00
• 9545fb0856 Added Start button below welcome title EmanMhesin 2025-05-13 12:58:07 +02:00
• 10d2c6096d Added TMP title text to welcome screen EmanMhesin 2025-05-13 12:54:00 +02:00
• 1cf589584c Created world space canvas for MR UI EmanMhesin 2025-05-13 12:44:56 +02:00
• cf03e82345 Created new scene EmanMhesin 2025-05-12 12:22:18 +02:00
• ea02cd83df
  Merge pull request #13 from AndreasFranke5/ui florian FlorianU 2025-06-04 17:09:59 +02:00
• f80e75c676 Merge branch 'main' into ui ui FlorianU 2025-06-04 17:09:46 +02:00
• f9b2fef455 Merge branch 'main' into florian FlorianU 2025-06-04 17:08:29 +02:00
• d3db572132
  Merge pull request #12 from AndreasFranke5/pathfinding FlorianU 2025-06-04 16:42:49 +02:00
• f070441f24 implemented routes and improved performance, also removed boundary spawner pathfinding FlorianU 2025-06-04 16:42:20 +02:00
• 0585ae004f
  Update README.md Minhui Zhong 2025-06-04 15:51:17 +02:00
• bba9444fcd Merge branch 'pathfinding' of https://github.com/AndreasFranke5/TwinCity into pathfinding Andreas Franke 2025-06-03 19:01:47 +02:00
• ba186feb9c Deleted a prefab from the hierarchy and also fixed a missing assign in the Marker Spawn Manager Andreas Franke 2025-06-03 19:01:44 +02:00
• a9ac8efc5c rearranged buttons FlorianU 2025-06-03 18:30:26 +02:00
• f1830af42b Made line horizontally aligned (line corners are on the same height), changed line color, added tip to make lines originate lower Andreas Franke 2025-06-03 17:23:10 +02:00
• 2dfc3bc26c
  Update README.md Minhui Zhong 2025-06-03 17:20:36 +02:00
• ac0e8400c9 Made green button and marker, mapped everything. Andreas Franke 2025-06-03 15:52:27 +02:00
• 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 Andreas Franke 2025-06-03 15:28:20 +02:00
• 0bba8dec66 Merge branch 'main' into pathfinding Andreas Franke 2025-06-03 14:13:09 +02:00
• 4885719fb6 Merge branch 'main' into florian FlorianU 2025-06-03 11:21:12 +02:00
• 85d6a8fbcc
  Merge pull request #11 from AndreasFranke5/florian FlorianU 2025-06-03 11:20:09 +02:00
• 9765b4b4f8 Merge branch 'main' into minhui minhuizhong 2025-06-03 10:56:52 +02:00
• a71aba745d implemented scenario switching FlorianU 2025-06-03 02:15:16 +02:00
• ff0db1526b implemented grabbable handle to reposition map FlorianU 2025-06-03 00:53:46 +02:00
• 4a5dcd05c4 Assigned some scripts to gameobjects Andreas Franke 2025-06-02 20:53:15 +02:00
• 922ced8dca Merge branch 'pathfinding' of https://github.com/AndreasFranke5/TwinCity into pathfinding Andreas Franke 2025-06-02 19:54:29 +02:00
• b364c293b6 Building works. Pathfinder not tested Andreas Franke 2025-06-02 19:53:43 +02:00
• b99a915145 fixed marker ray FlorianU 2025-06-02 19:13:39 +02:00
• 7e8f55b075 Merge branch 'main' into pathfinding FlorianU 2025-06-02 18:52:04 +02:00
• 41f4c45460
  Merge pull request #9 from AndreasFranke5/florian FlorianU 2025-06-02 18:44:29 +02:00
• 5481f29f50 fixed networked markers FlorianU 2025-06-02 18:44:13 +02:00
• b101e7a6b9 fixed multiplayer water setting and rotation FlorianU 2025-06-02 18:18:28 +02:00
• 1cd5aecba7 No errors but yet to be tested on Quest Andreas Franke 2025-06-02 18:08:04 +02:00
• 4b0992e236 deleted old marker1 minhuizhong 2025-06-02 14:39:06 +02:00
• 3988efff94 Added shortest path calc logic but not done Andreas Franke 2025-06-01 23:48:45 +02:00
• c200a7d787 Drawing a path between two markers. WIP Andreas Franke 2025-06-01 21:59:58 +02:00
• 3fb99410b6
  Merge pull request #8 from AndreasFranke5/florian FlorianU 2025-05-30 17:11:01 +02:00
• cef7ead8fe implemented networked tracking of pointers FlorianU 2025-05-30 17:10:41 +02:00
• acd9e97a95 fixed spawn rotation FlorianU 2025-05-30 16:07:41 +02:00