diff --git a/.gitignore b/.gitignore index b5d3569..1721e7d 100755 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .DS_Store -components +bower_components node_modules *.js diff --git a/LICENSE b/LICENSE index 8815f70..57bd510 100755 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (C) 2013 Diego Araos +Copyright (C) 2014 Diego Araos Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: diff --git a/README.md b/README.md index 577c066..3047992 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Web interface to control the AR Drone 2.0 with an Oculus Rift. This is based on 1. npm install 2. bower install -3. coffee -wc -o . . +3. coffee -c -o . . 4. Download and run oculus-rest server (https://github.com/possan/oculus-rest) 5. node . 6. Go to your browser http://localhost:3000/ @@ -21,4 +21,10 @@ Web interface to control the AR Drone 2.0 with an Oculus Rift. This is based on ##### License: MIT -Disclaimer: This is just a weekend project, missed testing and code quality might not be the best, therefore I'm not resposible for any damages that this project can cause due to misusage or inexperience. If you are unsure about something please contact me at diego@logicflight.com +Copyright (C) 2014 Diego Araos + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/component.json b/component.json index e5a8c6b..e69f0e5 100755 --- a/component.json +++ b/component.json @@ -1,6 +1,6 @@ { - "name": "drone-swarm", - "description": "Embrace the AR Drone swarm... using node.js", + "name": "oculus-drone", + "description": "Oculus Rift + AR Drone 2.0 controller", "version": "0.1.0", "dependencies": { "jquery": "~1.7.2", diff --git a/index.coffee b/index.coffee index 1158461..ef994c8 100644 --- a/index.coffee +++ b/index.coffee @@ -39,7 +39,7 @@ app.configure -> app.set('port', process.env.PORT || 3000) app.use(app.router) app.use(express.static(path.join(__dirname, 'public'))) - app.use("/components", express.static(path.join(__dirname, 'components'))) + app.use("/bower_components", express.static(path.join(__dirname, 'bower_components'))) server = require("http").createServer(app) # Initialize Sockets diff --git a/public/index.html b/public/index.html index c97c442..f264f25 100755 --- a/public/index.html +++ b/public/index.html @@ -2,10 +2,10 @@ - + - - + +