T

Sabe Jones 95bb5be22a Merge branch 'develop' into armoire

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	common/dist/sprites/spritesmith5.css
	common/dist/sprites/spritesmith5.png
	common/dist/sprites/spritesmith6.css
	common/dist/sprites/spritesmith6.png

2015-06-04 15:49:06 -05:00

archive

Merge in develop

2015-05-24 15:46:57 -05:00

common

Merge branch 'develop' into armoire

2015-06-04 15:49:06 -05:00

database_reports

Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop

2014-11-29 08:33:28 -07:00

dist

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

2015-03-06 07:47:10 -06:00

keys/google

Revert "refactor(iap): use env var for google IAP". orders are being

2014-12-16 13:07:01 -07:00

migrations

feat(Armoire): Improved counter

2015-06-04 15:45:55 -05:00

test

Merge branch 'develop' into armoire

2015-06-04 15:49:06 -05:00

website

Merge branch 'develop' into armoire

2015-06-04 15:49:06 -05:00

.bowerrc

Removes custom bower directories

2015-02-15 09:30:07 -05:00

.buildpacks

refactor(tasks) improve UI consistency

2014-11-27 10:32:57 +00:00

.gitignore

ignore habitrpg-shared.js (add to .gitignore, delete from repo)

2015-04-04 13:53:36 +10:00

.jshintrc

Add mocha to .jshintrc

2015-04-29 08:04:53 -05:00

.nodemonignore

Corrected paths or nodemonignore

2015-02-12 21:45:37 -06:00

.travis.yml

Updated .travis.yml

2015-04-04 21:45:36 -04:00

bower.json

Revert "fix(emoji): move back to main jsemoji repo, fixes #4265 "

2015-03-10 22:05:24 -05:00

config.json.example

Merge branch 'develop' into mixpanel

2015-05-31 15:40:21 -05:00

CONTRIBUTING.md

Update CONTRIBUTING.md

2014-09-21 16:57:52 +10:00

Dockerfile

Update docker file

2014-08-07 00:39:57 -04:00

DOCS-README.md

Updated DOCS-README.md for Docker

2013-09-28 14:59:34 -07:00

EXTENDEDCHANGELOG.md

chore(bailey): add bailey for group plans + perfect day achiev. Keep

2014-01-28 12:27:30 -08:00

Gruntfile.js

Adjust gruntfile regex and recompile

2015-05-26 22:19:45 -05:00

karma.conf.js

Merge branch 'TheHollidayInn-markdown-for-spells' into develop

2015-06-02 07:58:29 -05:00

LICENSE

Moved folders into common directory

2015-01-21 10:34:04 -06:00

newrelic.js

chore(newrelic): some newrelic code location experiments

2014-01-30 13:43:30 -07:00

package.json

chore(npm): install mixpanel

2015-05-29 16:24:03 -05:00

Procfile

REmoved build process from procfile

2015-02-10 08:49:29 -06:00

protractor.conf.js

Provisional commit of revised test manager and protractor version, pending a Travis run

2015-04-04 21:35:16 -04:00

README.md

Moved folders into common directory

2015-01-21 10:34:04 -06:00

Corrected path for coverage

2015-02-04 10:26:54 -06:00

VAGRANT.md

Update VAGRANT.md

2014-09-21 17:13:15 +10:00

vagrant.sh

issue #3852 change Mongodb installion

2015-03-27 14:25:41 -05:00

Vagrantfile

Removes custom bower directories

2015-02-15 09:30:07 -05:00

validate-commit-msg.js

chore(changelog): change max commit message length back to 999 (sorry, @lefnire!

2014-01-28 16:37:19 -06:00

validate-commit-msg.spec.js

chore(changelog): change max commit message length back to 999 (sorry, @lefnire!

2014-01-28 16:37:19 -06:00

README.md

HabitRPG

HabitRPG is an open source habit building program which treats your life like a Role Playing Game. Level up as you succeed, lose HP as you fail, earn money to buy weapons and armor.

We need more programmers! Your assistance will be greatly appreciated.

For an introduction to the technologies used and how the software is organised, refer to Contributing to HabitRPG - "Coders (Web & Mobile)" section.

To set up a local install of HabitRPG for development and testing, see Setting up HabitRPG locally, which contains instructions for Windows, *nix / Mac OS, and Vagrant.

Then read Guidance for Blacksmiths for additional instructions and useful tips.