Commits · 349e6189fceef08886780e79f554d4dc6eb8a80b · GeoVistoogsi / AR

21 Jan, 2025 28 commits
- Merge branch '21caog1bif-master-patch-37934' into 'master' · 349e6189
  Cantuerk authored 3 months ago
```
Update public/index.html

See merge request !195
```
  349e6189
- Update public/index.html · e3badad3
  Cantuerk authored 3 months ago
  
  e3badad3
- Merge branch '21caog1bif-master-patch-20740' into 'master' · 566e08fc
  Cantuerk authored 3 months ago
```
Update public/ar_overviewmap.js, public/style.css

See merge request !194
```
  566e08fc
- Update public/ar_overviewmap.js, public/style.css · 8fae95fb
  Cantuerk authored 3 months ago
  
  8fae95fb
- Merge branch '21caog1bif-master-patch-47158' into 'master' · f75869f5
  Cantuerk authored 3 months ago
```
Update public/style.css, public/ar_main.js

See merge request !193
```
  f75869f5
- Update public/style.css, public/ar_main.js · 146b9e7d
  Cantuerk authored 3 months ago
  
  146b9e7d
- Merge branch '21caog1bif-master-patch-03353' into 'master' · 04610f55
  Cantuerk authored 3 months ago
```
Update public/style.css

See merge request !192
```
  04610f55
- Update public/style.css · d030678b
  Cantuerk authored 3 months ago
  
  d030678b
- Merge branch '21caog1bif-master-patch-55304' into 'master' · e1a11794
  Cantuerk authored 3 months ago
```
Update public/style.css

See merge request !191
```
  e1a11794
- Update public/style.css · 12b43deb
  Cantuerk authored 3 months ago
  
  12b43deb
- Merge branch '21caog1bif-master-patch-51793' into 'master' · 02220dfc
  Cantuerk authored 3 months ago
```
Update public/style.css, public/ar_main.js

See merge request !190
```
  02220dfc
- Update public/style.css, public/ar_main.js · 20aca077
  Cantuerk authored 3 months ago
  
  20aca077
- Merge branch '21caog1bif-master-patch-77419' into 'master' · 6d03f598
  Cantuerk authored 3 months ago
```
Update public/style.css

See merge request !189
```
  6d03f598
- Update public/style.css · 7ca7d10d
  Cantuerk authored 3 months ago
  
  7ca7d10d
- Merge branch '21caog1bif-master-patch-10683' into 'master' · cd13fb72
  Cantuerk authored 3 months ago
```
Update public/ar_main.js, public/style.css

See merge request !188
```
  cd13fb72
- Update public/ar_main.js, public/style.css · 7eaff7dd
  Cantuerk authored 3 months ago
  
  7eaff7dd
- Merge branch '21caog1bif-master-patch-84159' into 'master' · 905ab769
  Cantuerk authored 3 months ago
```
Update public/assets/icons/left-arrow.png, public/assets/icons/up-arrow.png,...

See merge request !187
```
  905ab769
- Update public/assets/icons/left-arrow.png, public/assets/icons/up-arrow.png,... · 26187724
  Cantuerk authored 3 months ago
```
Update public/assets/icons/left-arrow.png, public/assets/icons/up-arrow.png, public/assets/icons/down-arrow.png, public/assets/icons/right-arrow.png, public/ar_main.js, public/style.css
```
  26187724
- Merge branch '21caog1bif-master-patch-08928' into 'master' · 7de00d42
  Cantuerk authored 3 months ago
```
Update public/ar_main.js, public/style.css

See merge request !186
```
  7de00d42
- Update public/ar_main.js, public/style.css · 9b194f1b
  Cantuerk authored 3 months ago
  
  9b194f1b
- Merge branch '21caog1bif-master-patch-51181' into 'master' · 43a08e42
  Cantuerk authored 3 months ago
```
Update public/style.css, public/ar_main.js

See merge request !185
```
  43a08e42
- Update public/style.css, public/ar_main.js · f0764516
  Cantuerk authored 3 months ago
  
  f0764516
- Merge branch '21caog1bif-master-patch-78692' into 'master' · bb6cdee1
  Cantuerk authored 3 months ago
```
Update public/ar_main.js

See merge request !184
```
  bb6cdee1
- Update public/ar_main.js · 67715bc3
  Cantuerk authored 3 months ago
  
  67715bc3
- Merge branch '21caog1bif-master-patch-19199' into 'master' · 9d0b421b
  Cantuerk authored 3 months ago
```
Update public/templates/thesis/index.html, public/templates/raw/index.html,...

See merge request !183
```
  9d0b421b
- Update public/templates/thesis/index.html, public/templates/raw/index.html,... · 8ef620c9
  Cantuerk authored 3 months ago
```
Update public/templates/thesis/index.html, public/templates/raw/index.html, public/assets/icons/add-icon.png, public/assets/icons/back-icon.png, public/assets/previewImages/bench.PNG, public/assets/icons/check-icon.png, public/assets/icons/delete-icon.png, public/assets/icons/download-icon.png, public/assets/icons/edit-icon.png, public/assets/icons/exit-icon.png, public/assets/previewImages/flower_bed.PNG, public/assets/previewImages/fountain.PNG, public/assets/previewImages/hydrant.PNG, public/assets/previewImages/lantern.jpg, public/assets/icons/map-icon.png, public/assets/previewImages/map-user.png, public/assets/icons/move-icon.png, public/assets/icons/options-icon.png, public/assets/previewImages/park_light.png, public/assets/previewImages/robot.png, public/assets/icons/rotate-icon.png, public/assets/icons/scale-icon.png, public/assets/previewImages/statue.PNG, public/assets/previewImages/telephone_box.PNG, public/assets/previewImages/trash_can.PNG, public/assets/previewImages/well.PNG, public/assets/...
```
  8ef620c9
- Merge branch '21caog1bif-master-patch-16124' into 'master' · 578bbe75
  Cantuerk authored 3 months ago
```
Update public/ar_main.js

See merge request !182
```
  578bbe75
- Update public/ar_main.js · 185bbeb9
  Cantuerk authored 3 months ago
  
  185bbeb9
19 Jan, 2025 6 commits
- Merge branch 'master' of https://transfer.hft-stuttgart.de/gitlab/geovistoogsi/ar · b06ca8f7
  Tomi6545 authored 3 months ago
  
  b06ca8f7
- update map + save · faaad5f0
  Tomi6545 authored 3 months ago
  
  faaad5f0
- Merge branch '21caog1bif-master-patch-14630' into 'master' · 56c6f1d1
  Cantuerk authored 3 months ago
```
Update public/index.html, public/style.css

See merge request !180
```
  56c6f1d1
- Update public/index.html, public/style.css · 33017cb4
  Cantuerk authored 3 months ago
  
  33017cb4
- Merge branch '21caog1bif-master-patch-45871' into 'master' · 98e90082
  Cantuerk authored 3 months ago
```
Update public/index.html

See merge request !179
```
  98e90082
- Update public/index.html · c468418f
  Cantuerk authored 3 months ago
  
  c468418f
18 Jan, 2025 6 commits

Merge branch '21caog1bif-master-patch-45882' into 'master' · 4ac75a0a
Cantuerk authored 3 months ago
```
Update public/index.html, public/previewImages/park_light.png,...

See merge request !178
```
4ac75a0a

Update public/index.html, public/previewImages/park_light.png,... · 4718b16e

Cantuerk authored 3 months ago

Update public/index.html, public/previewImages/park_light.png, public/previewImages/move-icon.png, public/style.css

4718b16e

Merge branch '21caog1bif-master-patch-62416' into 'master' · 7a96ad48
Cantuerk authored 3 months ago
```
Update public/assets/models/park_light_model/license.txt,...

See merge request !177
```
7a96ad48

Update public/assets/models/park_light_model/license.txt,... · 182bad21

Cantuerk authored 3 months ago

Update public/assets/models/park_light_model/license.txt, public/assets/models/park_light_model/scene.bin, public/assets/models/park_light_model/scene.gltf, public/assets/models/park_light_model/textures/Material.001_baseColor.png
Deleted public/previewImages/calisthenics_park.png, public/assets/models/park_light_model/textures/park_light_baseColor.png, public/assets/models/park_light_model/textures/park_light_metallicRoughness.png, public/assets/models/park_light_model/textures/park_light_normal.png

182bad21

Merge branch '21caog1bif-master-patch-10843' into 'master' · b00e39b1
Cantuerk authored 3 months ago
```
Update public/assets/models/park_light_model/license.txt,...

See merge request !176
```
b00e39b1

Update public/assets/models/park_light_model/license.txt,... · 75832241

Cantuerk authored 3 months ago

Update public/assets/models/park_light_model/license.txt, public/assets/models/park_light_model/scene.bin, public/assets/models/park_light_model/scene.gltf, public/assets/models/park_light_model/textures/.gitkeep, public/assets/models/park_light_model/textures/park_light_metallicRoughness.png, public/assets/models/park_light_model/textures/park_light_normal.png, public/assets/models/park_light_model/textures/park_light_baseColor.png, public/assets/models/park_light_model/.gitkeep, public/index.html, public/previewImages/park_light.png

75832241