Skip to content

Commit 0359e0f

Browse files
andybakandybak
committed
Merge branch 'main' into feature/new-shapes
2 parents 06a6024 + 68655f4 commit 0359e0f

File tree

4 files changed

+105
-19
lines changed

4 files changed

+105
-19
lines changed

‎.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
github: icosa-foundation
3+
open_collective: icosa

‎README.md

Lines changed: 39 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,36 @@
1-
# Blocks README
1+
# Open Blocks - 3D Modelling for Everyone
22

3-
Blocks is licensed under Apache 2.0. It is not an officially supported
4-
Google product. See the [LICENSE](LICENSE) file for more details.
3+
![Current Version](https://img.shields.io/github/v/release/icosa-foundation/open-blocks)
4+
![Prerelease Version](https://img.shields.io/github/v/release/icosa-foundation/open-blocks?include_prereleases&label=prerelease)
5+
[![Support us on Open Collective!](https://img.shields.io/opencollective/all/icosa?logo=open-collective&label=Support%20us%20on%20Open%20Collective%21)](https://opencollective.com/icosa)
6+
[![X](https://img.shields.io/badge/follow-%40openblocksapp-blue.svg?style=flat&logo=x)](https://x.com/openblocksapp)
7+
[![Discord](https://discordapp.com/api/guilds/783806589991780412/embed.png?style=shield)](https://discord.gg/W7NCEYnEfy)
58

6-
This repo is archived, but a list of active forks is available at
7-
https://github.com/googlevr/blocks/network
89

9-
## Trademarks
10+
[![Open Blocks Banner](open-blocks.png)](https://openblocks.app)
11+
12+
Open Blocks is a free fork of Blocks by Google, An app designed to make creating 3D models fun, easy, and accessible. We are in the process of making large number of changes. Please check our progress and our roadmap on our [docs site](https://docs.openblocks.app).
13+
14+
We hope to maintain and improve upon Blocks as a community-led project, free forever!
15+
16+
As the original repo is archived we cannot submit PRs, so feel free to submit them here!
17+
18+
[User Guide](https://docs.openblocks.app/)
19+
[Please join the Icosa Discord and get involved!](https://discord.com/invite/W7NCEYnEfy)
20+
[Support us on Open Collective](https://opencollective.com/icosa)
21+
22+
## Downloads
23+
### Stores
24+
(Coming Soon)
25+
26+
### GitHub
27+
- [Formal GitHub Releases](https://github.com/icosa-foundation/open-blocks/releases/latest)
28+
29+
30+
## Acknowledgements
31+
* Thank you to the original developers for your amazing work and for finding a way to open source the app!
32+
33+
## Important note from the original Blocks README
1034

1135
The Blocks trademark and logo (“Blocks Trademarks”) are trademarks of
1236
Google, and are treated separately from the copyright or patent license grants
@@ -17,19 +41,16 @@ approved in advance.
1741
For more information, read the
1842
[Blocks Brand Guidelines](BRAND_GUIDELINES.md).
1943

20-
## Building the application
44+
---
2145

22-
Get the Blocks open-source application running on your own devices.
46+
# Building the application
47+
48+
Get the Open Blocks open-source application running on your own devices.
2349

2450
### Prerequisites
2551

2652
* [Unity 2019.4.25f1](unityhub://2019.4.25f1/01a0494af254)
2753

28-
The code is provided as-is. Some external dependencies were removed. It will
29-
not build out of the box. Someone who is comfortable with Unity and SteamVR
30-
will likely be able to get it running in an afternoon (maybe with some
31-
functionality disabled).
32-
3354
### Changing the application name
3455

3556
_Blocks_ is a Google trademark. If you intend to publish a cloned version of
@@ -44,9 +65,8 @@ Please see the [Blocks Brand Guidelines](BRAND_GUIDELINES.md) for more details.
4465
Some systems in Blocks were removed or replaced with alternatives due to
4566
open-source licensing issues. These are:
4667

47-
* OpenVR
48-
* AnimatedGifEncoder32
49-
* LZWEncoder
68+
* AnimatedGifEncoder32
69+
* LZWEncoder
5070

5171
## Known issues
5272

@@ -55,9 +75,9 @@ branch.
5575

5676
## Google service API support
5777

58-
Legacy code is included to connect to Google APIs for People and Drive
78+
Legacy code is included to connect to Google APIs for People and Drive
5979
integrations. This is not critical to the Blocks experience, but is left
60-
as a convenience for any forks that wish to make use of it with a new backend.
80+
as a convenience for any forks that wish to make use of it with a new backend.
6181

62-
You must register new projects and obtain new keys and credentials from the
82+
You must register new projects and obtain new keys and credentials from the
6383
Google Cloud Console to make use of these features.

‎README_ORIGINAL.md

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Blocks README
2+
3+
Blocks is licensed under Apache 2.0. It is not an officially supported
4+
Google product. See the [LICENSE](LICENSE) file for more details.
5+
6+
This repo is archived, but a list of active forks is available at
7+
https://github.com/googlevr/blocks/network
8+
9+
## Trademarks
10+
11+
The Blocks trademark and logo (“Blocks Trademarks”) are trademarks of
12+
Google, and are treated separately from the copyright or patent license grants
13+
contained in the Apache-licensed Blocks repositories on GitHub. Any use of
14+
the Blocks Trademarks other than those permitted in these guidelines must be
15+
approved in advance.
16+
17+
For more information, read the
18+
[Blocks Brand Guidelines](BRAND_GUIDELINES.md).
19+
20+
## Building the application
21+
22+
Get the Blocks open-source application running on your own devices.
23+
24+
### Prerequisites
25+
26+
* [Unity 2019.4.25f1](unityhub://2019.4.25f1/01a0494af254)
27+
28+
The code is provided as-is. Some external dependencies were removed. It will
29+
not build out of the box. Someone who is comfortable with Unity and SteamVR
30+
will likely be able to get it running in an afternoon (maybe with some
31+
functionality disabled).
32+
33+
### Changing the application name
34+
35+
_Blocks_ is a Google trademark. If you intend to publish a cloned version of
36+
the application, you are required to choose a different name to distinguish it
37+
from the official version. Before building the application, go into `App.cs` and
38+
the Player settings to change the company and application names to your own.
39+
40+
Please see the [Blocks Brand Guidelines](BRAND_GUIDELINES.md) for more details.
41+
42+
## Systems that were replaced or removed when open-sourcing Blocks
43+
44+
Some systems in Blocks were removed or replaced with alternatives due to
45+
open-source licensing issues. These are:
46+
47+
* OpenVR
48+
* AnimatedGifEncoder32
49+
* LZWEncoder
50+
51+
## Known issues
52+
53+
OculusVR mode and reference image insertion are not currently functional in this
54+
branch.
55+
56+
## Google service API support
57+
58+
Legacy code is included to connect to Google APIs for People and Drive
59+
integrations. This is not critical to the Blocks experience, but is left
60+
as a convenience for any forks that wish to make use of it with a new backend.
61+
62+
You must register new projects and obtain new keys and credentials from the
63+
Google Cloud Console to make use of these features.

‎open-blocks.png

361 KB
Loading

0 commit comments

Comments
 (0)