Merge pull request #2 from AnalyticalGraphicsInc/master

Update from master
CesiumGS · Feb 8, 2018 · 75cb69a · 75cb69a
2 parents 0b7fed1 + 273e2d5
commit 75cb69a
Show file tree

Hide file tree

Showing 100 changed files with 5,709 additions and 240 deletions.
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
@@ -0,0 +1,6 @@
+# Code of Conduct 
+
+One of Cesium's strengths is our community.  Our contributors and users are pushing the 3D geospatial field to amazing new levels.  We rely on an open, friendly, inclusive environment to facilitate this.  As such, we follow the [Contributor Covenant](http://contributor-covenant.org/)'s [Code of Conduct](http://contributor-covenant.org/version/1/4/code-of-conduct.md) to ensure a harassment-free experience in the Cesium community.  Any unacceptable behavior can be confidentially sent to the core team at [email protected].
+
+This applies to this repo, forum, twitter, and all channels, including all repos in the [AnalyticalGraphicsInc](https://github.com/AnalyticalGraphicsInc) GitHub organization.
+
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -25,3 +25,7 @@ byteLength       // uint32,   length, in bytes, of the entire tile.
 ## Binary
 
 * All binary data, e.g., tile formats, are in little endian.
+
+## Code of Conduct
+
+To ensure an inclusive community, contributors and users in the Cesium community should follow the [code of conduct](./CODE_OF_CONDUCT.md).
diff --git a/README.md b/README.md