Merge commit 'refs/pull/21/head' of github.com:icosa-foundation/open-…

…blocks

.git-blame-ignore-revs

@@ -1,2 +1,3 @@
 b5c9a69a0cc4f18d10f261e17d2a0eba49177ea1
+16d7589e89d835ed98f56228748dff86e6e46b84
 886f900ed7390e22ac6c8698eae06ad21d294309

CONTRIBUTING.md

@@ -2,7 +2,8 @@
 
 We encourage you to fork the repository; this repository does not currently
 accept patches or contributions. See README.md for rules governing
-the Blocks trademark.
+the Blocks trademark. See https://github.com/googlevr/blocks/network for a
+list of active forks.
 
 Should our contribution policy ever change, contributors will need to
 follow a few small guidelines.
@@ -30,4 +31,4 @@ information on using pull requests.
 ## Community Guidelines
 
 This project follows
-[Google's Open Source Community Guidelines](https://opensource.google/conduct/).
+[Google's Open Source Community Guidelines](https://opensource.google/conduct/).

README.md

@@ -3,6 +3,9 @@
 Blocks is licensed under Apache 2.0. It is not an officially supported
 Google product. See the [LICENSE](LICENSE) file for more details.
 
+This repo is archived, but a list of active forks is available at
+https://github.com/googlevr/blocks/network
+
 ## Trademarks
 
 The Blocks trademark and logo (“Blocks Trademarks”) are trademarks of
@@ -18,10 +21,9 @@ For more information, read the
 
 Get the Blocks open-source application running on your own devices.
 
-### Prerequisites #TODO
+### Prerequisites
 
-*   [Unity 2018.4.11f1](unityhub://2018.4.11f1/7098af2f11ea)
-*   [SteamVR](https://store.steampowered.com/app/250820/SteamVR/)
+*   [Unity 2019.4.25f1](unityhub://2019.4.25f1/01a0494af254)
 
 The code is provided as-is.  Some external dependencies were removed.  It will
 not build out of the box.  Someone who is comfortable with Unity and SteamVR
@@ -46,60 +48,16 @@ open-source licensing issues. These are:
  * AnimatedGifEncoder32
  * LZWEncoder
 
-## Google service API support
-
-Set up Google API support to access Google services in the app.
-
-### Enabling Google service APIs
-
-Follow these steps when enabling Google service APIs:
-
-1.  Create a new project in the
-    [Google Cloud Console](https://console.developers.google.com/).
-1.  Enable the following APIs and services:
-
-    *   **Google Drive API** — for backup to Google Drive
-    *   **People API** — for username and profile picture
-
-Note: The name of your application on the developer console should match the
-name you've given the app in `App.kGoogleServicesAppName` in `App.cs`.
-
-### Creating a Google API key
-
-Follow these steps when creating a Google API key:
+## Known issues
 
-1.  Go to the Credentials page from the Google Cloud Console.
-1.  Click **Create Credential** and select **API key** from the drop-down menu.
+OculusVR mode and reference image insertion are not currently functional in this
+branch.
 
-### Google OAuth consent screen information
-
-The OAuth consent screen asks users for permission to access their Google
-account. You should be able to configure it from the Credentials screen.
-
-Follow these steps when configuring the OAuth consent screen:
-
-1.  Fill in the name and logo of your app, as well as the scope of the user data
-    that the app will access.
-1.  Add the following paths to the list of scopes:
-
-    *   Google Drive API `../auth/drive.appdata`
-    *   Google Drive API `../auth/drive.file`
-
-### Creating an OAuth credential
-
-The credential identifies the application to the Google servers. Follow these
-steps to create an OAuth credential:
-
-1.  Create a new credential on the Credentials screen.
-1.  Select **OAuth**, and then select **Other**. Take note of the client ID and
-    client secret values that are created for you. Keep the client secret a
-    secret!
-
-### Storing the Google API Key and credential data
+## Google service API support
 
-Follow these steps to store the Google API Key and credential data: #TODO
+Legacy code is included to connect to Google APIs for People and Drive 
+integrations. This is not critical to the Blocks experience, but is left
+as a convenience for any forks that wish to make use of it with a new backend. 
 
-1.  There is an asset in the `Assets/` directory called `Secrets` that contains
-    a `Secrets` field. Add a new item to this field.
-2.  Select `Google` as the service. Paste in the API key, client ID, and client
-    secret that were generated earlier.
+You must register new projects and obtain new keys and credentials from the 
+Google Cloud Console to make use of these features.