Merge pull request #28 from AltspaceVR/feature/n-parent-sync

Parent component sync
AltspaceVR · Feb 17, 2017 · 572ead8 · 572ead8
2 parents 55b4f44 + 91c8f9e
commit 572ead8
Show file tree

Hide file tree

Showing 67 changed files with 20,650 additions and 644 deletions.
diff --git a/.eslintrc b/.eslintrc
@@ -0,0 +1,20 @@
+{
+	"extends": "eslint:recommended",
+	"plugins": [
+		"html"
+	],
+	"env": {
+		"browser": true,
+		"commonjs": true
+	},
+	"globals": {
+		"THREE": true,
+		"altspace": true,
+		"AFRAME": true,
+		"Promise": true
+	},
+	"rules": {
+		"indent": ["error", "tab", {"SwitchCase": 1}],
+		"no-console": 0
+	}
+}
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ This is a fully functional example of what A-Frame code looks like.
 <!DOCTYPE html>
 <html><head>
 <script src="https://aframe.io/releases/0.3.0/aframe.min.js"></script>
-<script src="https://cdn.rawgit.com/AltspaceVR/aframe-altspace-component/v1.3.2/dist/aframe-altspace-component.min.js"></script>
+<script src="https://cdn.rawgit.com/AltspaceVR/aframe-altspace-component/v1.4.0/dist/aframe-altspace-component.min.js"></script>
 <script>
 
 // an example custom component, that will change the color when clicked