Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-05-08 23:19:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #15976 from huffman/feat/serverless-tutorial

Browse source 
DEV-266: Add serverless tutorial
This commit is contained in:
Ryan Huffman 2019-07-25 13:39:03 -07:00 committed by GitHub
commit de233e456e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3482 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmake/macros/SetPackagingParameters.cmake
View file

@ -131,8 +131,11 @@ macro(SET_PACKAGING_PARAMETERS)
endif () endif ()
if (DEPLOY_PACKAGE) if (DEPLOY_PACKAGE)
# for deployed packages always grab the serverless content # For deployed packages we do not grab the serverless content any longer.
set(DOWNLOAD_SERVERLESS_CONTENT ON) # Instead, we deploy just the serverless content that is in the interface/resources/serverless
# directory. If we ever move back to delivering serverless via a hosted .zip file,
# we can re-enable this.
set(DOWNLOAD_SERVERLESS_CONTENT OFF)
endif () endif ()
if (APPLE) if (APPLE)

3486
interface/resources/serverless/tutorial.json
View file

File diff suppressed because it is too large Load diff

2
libraries/networking/src/AddressManager.cpp
View file

@ -30,7 +30,7 @@
#include "UserActivityLogger.h" #include "UserActivityLogger.h"
#include "udt/PacketHeaders.h" #include "udt/PacketHeaders.h"
const QString DEFAULT_HIFI_ADDRESS = "hifi://welcome"; const QString DEFAULT_HIFI_ADDRESS = "file:///~/serverless/tutorial.json";
const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json"; const QString DEFAULT_HOME_ADDRESS = "file:///~/serverless/tutorial.json";
const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json"; const QString REDIRECT_HIFI_ADDRESS = "file:///~/serverless/redirect.json";
const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager"; const QString ADDRESS_MANAGER_SETTINGS_GROUP = "AddressManager";