Merge branch 'master' into upstream-merge-31727

2017-12-10 21:51:51 +00:00
parent 988baf6781 b66e664f11
commit 7179547be4
205 changed files with 2604 additions and 1534 deletions
@@ -46,7 +46,7 @@
 	if(client)
 		client.click_intercept = null

-		client.change_view(world.view) // Resets the client.view in case it was changed.
+		client.change_view(CONFIG_GET(string/default_view)) // Resets the client.view in case it was changed.

 	if(!GLOB.individual_log_list[ckey])
 		GLOB.individual_log_list[ckey] = logging