Merge branch 'godot-3.x' into godot-3.4

Quinn · Quinn · commit 2a7676069ad3 · 2022-06-11T21:50:45.000-07:00
diff --git a/bullet_server.cpp b/bullet_server.cpp
@@ -321,7 +321,7 @@ BulletServer::BulletServer() {
 	play_area_mode = VIEWPORT;
 	play_area_rect = Rect2();
 	play_area_margin = 0;
-  play_area_allow_incoming = true;
+  play_area_allow_incoming = false;
 	relay_autoconnect = true;
 }
 

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ BulletServer::BulletServer() {`
`321`	`321`	`play_area_mode = VIEWPORT;`
`322`	`322`	`play_area_rect = Rect2();`
`323`	`323`	`play_area_margin = 0;`
`324`		`- play_area_allow_incoming = true;`
	`324`	`+ play_area_allow_incoming = false;`
`325`	`325`	`relay_autoconnect = true;`
`326`	`326`	`}`
`327`	`327`