From 944c0d6531592f6d2d892f93c5311007a01da566 Mon Sep 17 00:00:00 2001
From: rot1024 <aayhrot@gmail.com>
Date: Tue, 11 Oct 2022 15:25:43 +0900
Subject: [PATCH 1/2] chore(server): fix make run-db

---
 server/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/Makefile b/server/Makefile
index bf92e133ad..ed74ae7199 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -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

From 6a56ce290cf83a0d7bdeb0e7b02b5f8302a660d0 Mon Sep 17 00:00:00 2001
From: KaWaite <34051327+KaWaite@users.noreply.github.com>
Date: Wed, 12 Oct 2022 17:21:36 +0900
Subject: [PATCH 2/2] feat(server): add field to manifest to allow for entering
 the ground (#353)

Co-authored-by: HideBa <49897538+HideBa@users.noreply.github.com>
---
 server/pkg/builtin/manifest.yml    | 5 +++++
 server/pkg/builtin/manifest_ja.yml | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/server/pkg/builtin/manifest.yml b/server/pkg/builtin/manifest.yml
index 0bf2e52ef2..ea22046c58 100644
--- a/server/pkg/builtin/manifest.yml
+++ b/server/pkg/builtin/manifest.yml
@@ -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
diff --git a/server/pkg/builtin/manifest_ja.yml b/server/pkg/builtin/manifest_ja.yml
index 9e624fa8d7..75177e87ab 100644
--- a/server/pkg/builtin/manifest_ja.yml
+++ b/server/pkg/builtin/manifest_ja.yml
@@ -11,6 +11,9 @@ extensions:
           camera:
             title: カメラ初期位置
             description: ページロード後最初に表示するカメラの位置を設定します。
+          allowEnterGround:
+            title: 地下へ入る
+            description: Onにすることでカメラが地表面へ潜り込むようになります。
           terrain:
             title: 地形
             description: 有効にすると、標高データが読み込みこまれ、立体的な地形を表現することができます。