Merge branch 'develop' of github.com:HabitRPG/habitrpg into rebalancing

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "website/public/bower_components"
+}

.buildpacks

@@ -0,0 +1,2 @@
+https://github.com/heroku/heroku-buildpack-nodejs.git
+https://github.com/stomita/heroku-buildpack-phantomjs.git

.gitignore

@@ -1,6 +1,25 @@
-coverage.html
+.DS_Store
+website/public/gen
+website/public/common
 node_modules
+*.swp
+.idea*
+config.json
 npm-debug.log
-.idea
-.swo
-.swp
+lib
+website/public/bower_components
+website/build
+newrelic_agent.log
+.bower-tmp
+.bower-registry
+.bower-cache
+.vagrant
+
+*.log
+src/*/*.map
+src/*/*/*.map
+test/*.js
+test/*.map
+website/public/docs
+*.sublime-workspace
+coverage.html

.jshintrc

@@ -0,0 +1,12 @@
+{
+	"globals": {
+		"confirm": false
+	},
+
+	"browser": true,
+	"node": true,
+
+	"asi": true,
+	"boss": true,
+	"newcap": false
+}

.nodemonignore

@@ -0,0 +1,15 @@
+node_modules/**
+.bower-cache/**
+.bower-tmp/**
+.bower-registry/**
+website/public/**
+website/views/**
+website/build/**
+.git/**
+Gruntfile.js
+CHANGELOG.md
+.idea*
+*.log
+newrelic_agent.log
+*.swp
+*.swx

.travis.yml

@@ -1,3 +1,9 @@
 language: node_js
 node_js:
-  - "0.10"
+  - '0.10'
+  - mongodb
+before_script:
+  - 'npm install -g grunt-cli mocha'
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - cp config.json.example config.json

CONTRIBUTING.md

@@ -0,0 +1,14 @@
+# Reporting Bugs
+
+[Please see these instructions for reporting bugs](https://github.com/HabitRPG/habitrpg/issues/2760)
+
+## Frequently Asked Questions
+You might find help with your issue on the [Frequently Asked Questions](http://habitrpg.wikia.com/wiki/FAQ) page.
+
+# Requesting a feature
+
+HabitRPG uses [Trello](https://trello.com/b/EpoYEYod/habitrpg) to track feature requests. [Read more](https://trello.com/c/odmhIqyW/440-read-first-table-of-contents).
+
+# Contributing Code
+
+See [Contributing to HabitRPG](http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG#Coders_.28Web_.26_Mobile.29)

DOCS-README.md

@@ -0,0 +1,77 @@
+# HabitRPG Docs Project
+
+Generated documentation for all of HabitRPG's source files will be kept in the folder and subfolders. If you would like to use the existing documentation, or contribute to the documentation efforts, read on.
+
+## Viewing Docs
+
+You're looking at it! 
+
+Unless you are viewing this file directly from GitHub, you should see a list of files and folders to the left of this readme. 
+
+If you are working locally, you can goto `localhost:3000/docs/` and view the Docs. 
+
+All documentation is generated from comments in the code, into HTML files in the `public/docs/` folder. After you have cloned the HabitRPG repo locally, and done all the `npm install` goodness, the Docs should generate automagickly when you run `grunt run:dev`
+
+## What I do now?
+
+Well if you know Markdown, simply add detailed comments in the code using Markdown syntax. 
+
+````
+/* 
+User.js
+=======
+
+Defines the user data model (schema) for use via the API.
+*/
+
+// Dependencies
+// ------------
+var mongoose = require("mongoose");
+var Schema = mongoose.Schema;
+var helpers = require('habitrpg-shared/script/helpers');
+var _ = require('lodash');....
+````
+
+As you can see, you can use both multiline style comments `/* fancy stuff */` and inline comments `// Ooooh my`. 
+
+The exception being end of line comments  
+`text: String, // example: Wolf `
+
+The above will not be on the "pretty print" side of the Docs, but will stay in the code. An example use case for end of line comments would be for FIXME notes.
+
+Add anything that would be helpful to a developer regarding how to use the functions, variables, and objects associated with HabitRPG.
+
+**All documentation should be committed as pull request to the `docs-project` branch of HabitRPG.** Since we are adding comments directly to the code, I don't want to be editing files used for beta or master. We can merge in the docs after we're sure we didn't break anything. 
+
+### jsDoc Syntax
+
+Yes, the generator also supports jsDoc-style comments such as  
+````
+@param {Array} files Array of file paths relative to the `inDir` to generate documentation for.
+````
+
+**Important Note:** If you use the `@param` syntax, you must use multiline comment blocks (ie `/* stuff */`), otherwise they won't be parsed like parameters.
+
+This may or may not be useful for HabitRPG. Example use cases:  
+- Documenting the API  
+- Javascript Models
+
+## Okay, I added great comments. Now what?
+
+If you're running locally, just re-run `grunt run:dev`. Any changed docs will be automagickly updated.
+
+Once you're satisfied with the output, push your changes to your fork of HabitRPG and issue a Pull Request on the `docs-project` branch. 
+
+It's that easy!
+
+## Tech Info
+
+The generator we are using is [Docker](https://github.com/jbt/docker), which is a fork of [Docco](http://jashkenas.github.io/docco/). Docker supports the same wide-range of filetypes, including being able to generate documentation for a whole project, including an index.
+
+We also use the [Grunt-Docker](https://github.com/Prevole/grunt-docker) node module for automatic processing.
+
+## Road Map
+
+- Customize CSS with HabitRPG specific Styling  
+- Explore possibilities of importing Wiki content  
+- Specify style guide for consistency of comments  

Dockerfile

@@ -0,0 +1,41 @@
+FROM ubuntu:trusty
+
+MAINTAINER Thibault Cohen <[email protected]>
+
+ENV DEBIAN_FRONTEND noninteractive
+
+### Init
+
+RUN apt-get update
+
+### Utils
+
+RUN apt-get install -y git vim graphicsmagick nodejs phantomjs npm pkgconf libcairo2-dev libjpeg8-dev
+
+### Installation
+
+RUN cd /opt && git clone https://github.com/HabitRPG/habitrpg.git
+
+#RUN cd /opt/habitrpg && git checkout -t origin/develop
+
+RUN cd /opt/habitrpg && git pull
+
+RUN cd /opt/habitrpg && npm install -g grunt-cli bower nodemon
+
+RUN ln -s /usr/bin/nodejs /usr/bin/node
+
+RUN cd /opt/habitrpg && npm install
+
+# Add config file
+
+ADD ./config.json /opt/habitrpg/
+
+RUN mkdir -p /opt/habitrpg/build
+
+RUN cd /opt/habitrpg && bower install --allow-root
+
+# Run server
+
+RUN cd /opt/habitrpg && grunt build:prod 
+
+CMD cd /opt/habitrpg && grunt nodemon

EXTENDEDCHANGELOG.md

@@ -0,0 +1,64 @@
+<a name="">HabitRPG</a>
+#  (2014-01-28)
+
+
+## Documentation
+
+- **rebirth:** Bullet point about repurchase of limited ed gear after Rebirth
+  ([d3f4a561](https://github.com/habitrpg/habitrpg/commits/d3f4a561fdf137e5d8f406bae03be4fef1caff22))
+
+
+## Bug Fixes
+
+- **#2003:** healer gear not showing
+  ([949cd97b](https://github.com/habitrpg/habitrpg/commits/949cd97b91b42e9450eba559bbfea17e239ab100))
+- **#2375:** merge in @SabreCat's stats.jade changes "More elegant show/hide setup for attribute bonuses"
+  ([518f200a](https://github.com/habitrpg/habitrpg/commits/518f200a8fc7373b44ed7d7b5f016d921b0746bd))
+- **beastmaster:** fixes #2557, adds opacity to previously-owned pets after they're mounted. You can earn them back again
+  ([5caaff1c](https://github.com/habitrpg/habitrpg/commits/5caaff1cea1a68fe572e7ddf4aac50248b13df5d))
+- **bosses:** don't reset progress.up when starting a new quest. We want to be able to carry over damage from the same day a boss battle begins, even if the dailies were completed before battle-start. Fixes #2168
+  ([4efd0f5e](https://github.com/habitrpg/habitrpg/commits/4efd0f5ed8708f2491dd483f93e3d7a268a6337d))
+- **classes:**
+  - misc fixes
+  ([d2121a85](https://github.com/habitrpg/habitrpg/commits/d2121a858716cb5a532a53ee9c5a1adaa74a7f69))
+  - misc class fixes (not @snicker, ng-if on item store since we dynamically swap it sometimes)
+  ([478be611](https://github.com/habitrpg/habitrpg/commits/478be6111337cd200374f7f31b959725c6a0b945))
+- **find_uniq_user:** fix
+  ([ecbe780e](https://github.com/habitrpg/habitrpg/commits/ecbe780e70549b1470504efe052f238c89a9db14))
+- **mounts:** Move avatar upward when mounted regardless of pet
+  ([bc1adeb1](https://github.com/habitrpg/habitrpg/commits/bc1adeb1277103a5ca1f756e175ed68bbe837a2f))
+- **nodemon:** ignore CHANGELOG.md on watch
+  ([d6c55952](https://github.com/habitrpg/habitrpg/commits/d6c55952da8b49f36e9d8e4570d80931d081343d))
+- **party:** Round boss health up instead of to nearest integer
+  ([626da568](https://github.com/habitrpg/habitrpg/commits/626da5681f5ea95700f8ddf40587c7184926971c),
+   [#2504](https://github.com/habitrpg/habitrpg/issues/2504))
+- **paypal:** fixes #2492, remove environment check for now, only have production-mode option. revisit
+  ([1dc68112](https://github.com/habitrpg/habitrpg/commits/1dc68112d131e4ebdec32ddff938eb6311d6565f))
+- **profile:** fix bug where empty profile displayed on username click
+  ([0579c432](https://github.com/habitrpg/habitrpg/commits/0579c432489c4a038e8c9f95ea3b285f5abc146f),
+   [#2465](https://github.com/habitrpg/habitrpg/issues/2465))
+- **quests:**
+  - bug fix to multi-drop
+  ([f478d10c](https://github.com/habitrpg/habitrpg/commits/f478d10c20f816cd104b3f0da814c189957f45f5))
+  - list multiple rewards in dialog
+  ([e48c7277](https://github.com/habitrpg/habitrpg/commits/e48c7277f8256cf827790aece51e897fe0439374))
+- **settings:** reintroduce space between captions and help bubbles stripped during localization
+  ([5ddf09fe](https://github.com/habitrpg/habitrpg/commits/5ddf09fe13c7f8d844c8c47be0fb8f8b2fd1df33))
+- **spells:**
+  - more $rootScope spell-casting bug fixes
+  ([47bd6dcb](https://github.com/habitrpg/habitrpg/commits/47bd6dcb79778d90d6f3ddeb003c3d8e45433333))
+  - add some spells tests, don't send up body to spell paths
+  ([e0646bb9](https://github.com/habitrpg/habitrpg/commits/e0646bb98d44b6874b5259107c9be5fa34c58933))
+  - some $rootScope.applying action fixes so cast-ending is immediate instead of waiting on response. Also, slim down party population to the essentials to avoid RequestEntityTooLarge
+  ([c6f7ab8a](https://github.com/habitrpg/habitrpg/commits/c6f7ab8a5c6f4e382208a928b90ba5f4eba9cd37))
+  - <ESC> to cancel spell-casting
+  ([a1df41ad](https://github.com/habitrpg/habitrpg/commits/a1df41ad8165cd9eb6d2d5d59c7fe404edde716c))
+- **stable:** show hatchable combo when petOwned>0 (fyi @deilann)
+  ([51bff238](https://github.com/habitrpg/habitrpg/commits/51bff23885ca0080e7e71ff752daa0950ae923ae))
+- **stats:** Better layout for attribute point allocation
+  ([d782fc6b](https://github.com/habitrpg/habitrpg/commits/d782fc6b6a3cd7e90d327c93a5764626b2990c74))
+- **tests:**
+  - include select2 in test manifest
+  ([38b4cea7](https://github.com/habitrpg/habitrpg/commits/38b4cea73299f51c4db7f6b2eb12533d219745f8))
+  - don't use cluster in tests, else we get "connection refused"
+  ([7a479098](https://github.com/habitrpg/habitrpg/commits/7a479098dc6535654e322c737d80813790967941)