Skip to content

Commit

Permalink
Merge branch 'main' into fix-typo-error
Browse files Browse the repository at this point in the history
  • Loading branch information
lavalse authored Oct 14, 2022
2 parents 609338c + 6a56ce2 commit 583a3e0
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
2 changes: 1 addition & 1 deletion server/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ run-app:
go run ./cmd/reearth

run-db:
docker compose up -f ../docker-compose.yml -d reearth-mongo
docker compose -f ../docker-compose.yml up -d reearth-mongo

gql:
go generate ./internal/adapter/gql
Expand Down
5 changes: 5 additions & 0 deletions server/pkg/builtin/manifest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@ extensions:
type: camera
title: Initial camera position
description: The starting position of your project.
- id: allowEnterGround
type: bool
title: Enter the ground
defaultValue: false
description: Set to true to allow the camera to enter the surface of the earth.
- id: terrain
type: bool
title: Terrain
Expand Down
3 changes: 3 additions & 0 deletions server/pkg/builtin/manifest_ja.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ extensions:
camera:
title: カメラ初期位置
description: ページロード後最初に表示するカメラの位置を設定します。
allowEnterGround:
title: 地下へ入る
description: Onにすることでカメラが地表面へ潜り込むようになります。
terrain:
title: 地形
description: 有効にすると、標高データが読み込みこまれ、立体的な地形を表現することができます。
Expand Down

0 comments on commit 583a3e0

Please sign in to comment.