Merge pull request #3 from cgrinker/master

Fixing Property Mismatch for Sphere scale primative
brochington · Aug 26, 2016 · ab8bd20 · ab8bd20
2 parents f837bd6 + 3fe7bae
commit ab8bd20
Show file tree

Hide file tree

Showing 107 changed files with 2,662 additions and 2,313 deletions.
diff --git a/akkad/.babelrc → .babelrc b/akkad/.babelrc → .babelrc
diff --git a/akkad/.eslintrc → .eslintrc b/akkad/.eslintrc → .eslintrc
diff --git a/akkad/LICENSE.txt → LICENSE.txt b/akkad/LICENSE.txt → LICENSE.txt
diff --git a/README.md b/README.md
@@ -3,13 +3,8 @@ Akkad
 
 [![Join the chat at https://gitter.im/brochington/Akkad](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/brochington/Akkad?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
-
 `npm install --save akkad`
 
-To get an Akkad project started quickly, check out the [Akkad boilerplate](https://github.com/brochington/akkad-boilerplate).
-
-requires npm >= 5.0
-
 #### Docs:
 
 [Getting Started](https://github.com/brochington/Akkad/blob/master/docs/getting_started.md)
@@ -20,13 +15,12 @@ requires npm >= 5.0
 
 [State tutorial](https://github.com/brochington/Akkad/blob/master/docs/tutorials/state.md)
 
-
 Akkad is a React Webgl target that uses the Babylon.js library. Its aim is to allow any developer familiar with React the ability to create 3D scenes and games.
 
 ### Features
 
 - Full power of React meets WebGL and Babylon
-- Embed multiple interactive "scenes" directly in your React based site.
+- Embedd multiple interactive "scenes" directly in your React based site.
 - Uses a redux-like state cycle
 - Defined method of extention via Entities and Systems.
 
@@ -39,8 +33,7 @@ Akkad is a React Webgl target that uses the Babylon.js library. Its aim is to al
 - Collisions
 - Particles
 - Basic triggers like onClick
-- Overlays with React generated DOM
-- Draw textures on elements with the Canvas API.
+- Add things like overlays with React generated DOM
 - Lot's more to come!
 
 ## Example
@@ -77,17 +70,24 @@ export default App;
 
 Please check out the example project included for more.
 
+
 ### Development
 
 Akkad includes an example project for quick testing and development work. To use the example project:
 
-From the project root:
+link the akkad library in the example app. From the project root:
 ```
 $ cd akkad
-$ npm run setup:watch
+$ npm link
 $ cd ../example
-$ npm run setup:dev // only needed the first time.
-$ npm run start:dev
+$ npm link akkad
+$ npm start
+```
+
+In another terminal tab, navigate back to project root. Start up Akkad watch compilation:
+```
+$ cd akkad
+$ npm run watch
 ```
 
 This will allow you to make changes to Akkad live while you are running the example app.
diff --git a/akkad/TODO.md → TODO.md b/akkad/TODO.md → TODO.md
diff --git a/akkad/README.md b/akkad/README.md