T

Blade Barringer 6f4fbfeaeb Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert

Conflicts:
	common/img/sprites/spritesmith/npcs/npc_ian.png
	common/img/sprites/spritesmith/npcs/seasonalshop_winter2015.png
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png

2015-02-03 19:26:14 -06:00

archive

add debug buttons back in, including +10 gems (@sabrecat)

2013-10-31 15:14:19 -07:00

common

Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert

2015-02-03 19:26:14 -06:00

database_reports

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

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

img/sprites/spritesmith

Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert

2015-02-01 14:07:18 -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

adjusted comments

2015-01-24 16:46:18 +10:00

public

Refined triad Bingo calculation

2015-01-25 21:00:34 -06:00

src

Converted shared to common for controllers

2015-01-25 15:26:37 -06:00

test

Converted shared to common in api test

2015-01-25 15:54:19 -06:00

views

chore(news): Victory Bailey

2015-01-23 10:20:50 -06:00

.bowerrc

chore(bower): bowerrc (see https://github.com/bower/bower/issues/933 )

2014-02-28 22:12:15 -07:00

.buildpacks

refactor(tasks) improve UI consistency

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

.gitignore

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

2015-01-21 10:37:08 -06:00

.jshintrc

feat(jshint): add initial config

2014-04-01 07:37:56 +03:00

.nodemonignore

fix .nodemonignore, reduce cpu usage

2014-10-07 21:30:00 +02:00

.travis.yml

Merge branch 'develop' of github.com:HabitRPG/habitrpg into common-convert

2015-01-21 10:37:08 -06:00

bower.json

Removed shared form package and bower

2015-01-21 11:00:27 -06:00

CHANGELOG.md

Restored changelog

2015-01-20 16:22:29 -06:00

config.json.example

feat(discount) google discount & use sub.key instead of sub.months

2014-12-30 20:05:07 -07: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

Moved folders into common directory

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

karma.conf.js

fix(tests): include select2 in test manifest

2014-01-23 10:12:17 -08: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

Removed shared form package and bower

2015-01-21 11:00:27 -06:00

Procfile

update procfile for heroku. @paglias this is the heroku script-runner btw

2013-09-07 10:54:03 -04:00

protractor.conf.js

Test server port changed to 3001

2014-01-01 14:01:51 -03:00

README.md

Moved folders into common directory

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

VAGRANT.md

Update VAGRANT.md

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

vagrant.sh

adjust comments

2014-09-12 13:12:42 +10:00

Vagrantfile

Updated base vagrant box. added full provisioning of HRPG env.

2014-04-11 10:18:01 -04: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.