Integrating latest from github/staging

Integrating up through commit 5e1bdae
This commit is contained in:
alexpete
2021-03-26 14:31:50 -07:00
parent 9c54341af8
commit 36c4e827bd
764 changed files with 11453 additions and 20251 deletions
+39
View File
@@ -0,0 +1,39 @@
{
"Amazon": {
"AzCore": {
"Bootstrap": {
"remote_filesystem": 0,
"provo_remote_filesystem": 0,
"android_remote_filesystem": 0,
"ios_remote_filesystem": 0,
"mac_remote_filesystem": 0,
"assets": "pc",
"android_assets": "es3",
"ios_assets": "ios",
"mac_assets": "osx_gl",
"allowed_list": "",
"remote_ip": "127.0.0.1",
"remote_port": 45643,
"connect_to_remote": 0,
"windows_connect_to_remote": 1,
"provo_connect_to_remote": 1,
"salem_connect_to_remote": 0,
"jasper_connect_to_remote": 0,
"android_connect_to_remote": 0,
"ios_connect_to_remote": 0,
"mac_connect_to_remote": 0,
"wait_for_connect": 0,
"provo_wait_for_connect": 0,
"salem_wait_for_connect": 0,
"jasper_wait_for_connect": 0,
"windows_wait_for_connect": 1,
"android_wait_for_connect": 0,
"ios_wait_for_connect": 0,
"mac_wait_for_connect": 0,
"connect_ap_timeout" : 3,
"launch_ap_timeout": 15,
"wait_ap_ready_timeout": 1200
}
}
}
}