Merge pull request #41 from paulsonnentag/develop

Develop
paulsonnentag · Oct 18, 2016 · 70e28b2 · 70e28b2
2 parents 0e9f35a + 9894ff5
commit 70e28b2
Show file tree

Hide file tree

Showing 27 changed files with 1,217 additions and 828 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,23 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+
+## [0.2.0] - 2016-10-18 
+###  Added
+
+- Improve client library
+    - add swipe animation
+    - add connect button
+    - handle resize
+- Improve golf demo
+    - better graphics
+    - accelerate ball based on orientation
+- Improve particle demo
+    - fewer particles
+    - make particles draggable
+
 ### Fixed
+- Fix collision detection of golf demo
 - Fix transform calculation when merging a cluster with multiple clients into another cluster
 
 ## [0.1.0] - 2016-09-30

diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@
 > **DISCLAIMER**
 > 
 > This is a very early version of Swip.js. If the app doesn't respond you might have to reload the browser or restart the server.
+> It works best if you create a separate wireless network to connect multiple devices with your swip.js application 
 
 <img src='assets/explanation.jpg' width="400">
 
@@ -29,7 +30,7 @@ npm run build
 
 ## Particles
 
-![alt tag] (./assets/example1.gif)
+<a href="https://www.youtube.com/watch?v=qXOwT0ieOgw" target="_blank"><img src="./assets/blob_prev.jpg"/></a>
 
 Enter the following command to run the particles demo:
 
@@ -39,7 +40,7 @@ npm run particles
 
 ## Golf
 
-![alt tag] (./assets/example2.gif)
+<a href="https://www.youtube.com/watch?v=ZE0gxa-p8HY" target="_blank"><img src="./assets/golf_prev.jpg"/></a>
 
 Enter the following command to run the golf demo:
 

diff --git a/assets/blob_demo.gif b/assets/blob_demo.gif
diff --git a/assets/blob_prev.jpg b/assets/blob_prev.jpg
diff --git a/assets/golf_demo.gif b/assets/golf_demo.gif
diff --git a/assets/golf_prev.jpg b/assets/golf_prev.jpg
diff --git a/dreamcode.js b/dreamcode.js
diff --git a/examples/golf/client/assets/style.css b/examples/golf/client/assets/style.css
@@ -0,0 +1,6 @@
+html, body {
+    margin: 0;
+    padding: 0;
+    width: 100%;
+    height: 100%;
+}
diff --git a/examples/golf/client/index.html b/examples/golf/client/index.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <title>Golf</title>
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=no">
+    <meta name="apple-mobile-web-app-capable" content="yes">
+    <link rel='stylesheet' href='assets/style.css'>
+  </head>
+  <body>
+
+    <div id="root"></div>
+
+    <script src="/socket.io/socket.io.js"></script>
+    <script src="/swip/swip.js"></script>
+    <script src="src/app.js"></script>
+  </body>
+</html>