Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,856 Commits 64 Branches 1,256 Tags
ff5ca53e06d09a13605d9bb045fa5639146b35ec
Commit Graph

1856 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alice Harris ff5ca53e06 Merge pull request #452 from Verabird/decreaseMP 
Adjust calculation of cronMP from checklists
 2015-02-07 19:53:09 +10:00
Verabird 0f5d2411b1 Adjust calculation of cronMP from checklists 2015-01-26 15:51:55 -05:00
Alice Harris 6ca9c10cda change some comments 2015-01-26 14:53:13 +10:00
Alice Harris 731589c0ea Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 2015-01-25 08:39:37 +10:00
Alice Harris 65a03ead50 Merge pull request #450 from Verabird/decreaseMP 
Fix completed todos counting as checked dailies...
 2015-01-25 08:34:26 +10:00
Verabird ff0906a5c0 Fix completed todos counting as checked dailies and change unless-else to if-else 2015-01-24 12:07:39 -05:00
Sabe Jones 009255bdb5 fix(sprite): Improved Nameless Helm 
Fixes https://github.com/HabitRPG/habitrpg/issues/4568.
 2015-01-24 10:57:24 -06:00
Alice Harris baf092253d Merge pull request #448 from Verabird/decreaseMP 
Missed dailies decrease MP gained at cron
 2015-01-24 17:29:58 +10:00
Blade Barringer 72bc1cf40c Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2015-01-23 15:29:36 -06:00
Blade Barringer 318dd506af Added watts theme string 2015-01-23 15:29:00 -06:00
Matteo Pagliazzi e8f6091764 chore(i118n): update locales 2015-01-23 21:01:24 +01:00
Verabird 1e35bcb6ed Include checklist effect in cron MP gain and account for all gray dailies 2015-01-22 12:16:06 -05:00
Verabird 350997d7b2 Add initial try for having undone dailies decrease gained MP 2015-01-21 11:26:25 -05:00
Blade Barringer 32ed4dace7 Fixed triad bingo achievement not being awarded to people who already 
had it
 2015-01-20 19:24:46 -06:00
Blade Barringer 76373ed816 Merge pull request #447 from HabitRPG/bailey-20150120 
Bailey 20150120 & Mount Master
 2015-01-20 17:06:02 -06:00
negue cb566a9679 Merge pull request #441 from negue/markdown 
markdown timeoutTime attribute
 2015-01-20 17:57:23 +01:00
Blade Barringer cc6cb3785e Merge branch 'mountmaster' into bailey-20150120 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	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-01-20 10:39:45 -06:00
Sabe Jones 6a6a4e5924 Merge pull request #446 from SabreCat/stressbeast 
World boss desperation move
 2015-01-19 23:17:26 -06:00
Sabe Jones 7925935ff5 feat(world-boss): Desperation move 2015-01-19 21:47:27 -06:00
Blade Barringer 42e1020c60 Added back in showCompleted=false to display tags 2015-01-19 18:50:54 -06:00
Tyler Renelle 899de5fc25 grunt 2015-01-19 16:14:21 -07:00
Alice Harris c7ccc5c21d Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 
Conflicts:
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.png
	dist/spritesmith3.png
	dist/spritesmith4.png
 2015-01-20 06:01:09 +10:00
Alice Harris 64cd6eac25 Merge pull request #350 from Alys/todos-dated-tab-2014-11-01 
create a "Dated" To-Dos tab
 2015-01-19 18:16:17 +10:00
Alice Harris da1a11b62d Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01 2015-01-19 17:53:48 +10:00
Blade Barringer 62d7505233 Merge pull request #423 from crookedneighbor/vIiRuS-groupSorting 
Additional options for group sorting in header
 2015-01-18 23:08:34 -06:00
Blade Barringer 6a7d84b842 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2015-01-18 21:24:28 -06:00
Blade Barringer 8b864e114b Compiled spritesheets 2015-01-18 21:11:49 -06:00
Blade Barringer 86c7203170 Added rock mounts 2015-01-18 21:11:41 -06:00
Blade Barringer 511b4a1b0b Added pet rocks 2015-01-18 20:34:12 -06:00
Alice Harris 9b9b70b7d4 change "level" to "tier"; remove incorrect number of gems 2015-01-19 11:24:42 +10:00
Blade Barringer e22269fd61 Merge pull request #442 from HabitRPG/triad-bingo 
Triad bingo
 2015-01-18 19:12:18 -06:00
Blade Barringer 69c9c12969 Updated keys to kennel info for triad bingo 2015-01-18 19:10:50 -06:00
Blade Barringer 418f54a32d Added rock pet egg 2015-01-18 18:38:56 -06:00
Blade Barringer 0bb9aa9f56 Added rock quest boss 2015-01-18 18:30:54 -06:00
Blade Barringer 3bed7d8153 Added january mystery items 2015-01-18 18:25:25 -06:00
Blade Barringer c13f6b15a1 Added feb background images 2015-01-18 18:12:45 -06:00
Blade Barringer e7cb3f58e9 Merge branch 'issue4468' of https://github.com/scribblypanda/habitrpg-shared into scribblypanda-issue4468 2015-01-18 15:24:48 -06:00
Blade Barringer 6c9c2a5ec1 Merge pull request #445 from j-wilkins/patch-1 
fix typo in README.md
 2015-01-18 12:00:15 -06:00
Jake Wilkins d6a7fa0d2c s/migraring/migrating 2015-01-18 10:35:03 -07:00
Alice Harris 8401790017 Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	locales/cs/gear.json
	locales/de/gear.json
	locales/de/generic.json
	locales/de/subscriber.json
	locales/es/communityguidelines.json
	locales/es/gear.json
	locales/es/generic.json
	locales/es_419/communityguidelines.json
	locales/es_419/gear.json
	locales/es_419/generic.json
	locales/es_419/questscontent.json
	locales/fr/gear.json
	locales/fr/generic.json
	locales/fr/limited.json
	locales/hu/backgrounds.json
	locales/hu/communityguidelines.json
	locales/hu/content.json
	locales/hu/front.json
	locales/hu/gear.json
	locales/hu/generic.json
	locales/hu/groups.json
	locales/hu/limited.json
	locales/hu/messages.json
	locales/hu/npc.json
	locales/hu/pets.json
	locales/hu/questscontent.json
	locales/hu/subscriber.json
	locales/hu/tasks.json
	locales/it/gear.json
	locales/it/generic.json
	locales/it/groups.json
	locales/it/limited.json
	locales/it/subscriber.json
	locales/nl/gear.json
	locales/nl/limited.json
	locales/nl/questscontent.json
	locales/pl/gear.json
	locales/pl/limited.json
	locales/pl/subscriber.json
	locales/pt/gear.json
	locales/ro/gear.json
	locales/ru/gear.json
	locales/ru/limited.json
	script/content.coffee
 2015-01-18 15:46:25 +10:00
Tyler Renelle 436e8b5622 Merge pull request #444 from HabitRPG/lefnire/one-module 
Move to a single "habitrpg" module for services / directives / filters
 2015-01-17 19:08:21 -07:00
Tyler Renelle 81bdb2481c refactor(services): move to a single "habitrpg" module for services / 
directives / filters
 2015-01-17 18:42:01 -07:00
Blade Barringer 2efadf7381 Removed white space on t-rex iamges closes #4531 2015-01-16 22:33:06 -06:00
Tyler Renelle 465bfe4df9 Merge pull request #443 from HabitRPG/lefnire/httpinterceptor 
move httpInterceptor from app.js to habitrpg-shared/config.js
 2015-01-16 18:32:52 -07:00
Tyler Renelle dbeb6f8c1e refactor(config): add mobile 2015-01-16 18:31:37 -07:00
Tyler Renelle 6b6802a27a refactor(config): move httpInterceptor from website/app.js to 
habitrpg-shared/config.js. Will merge in mobile soon
 2015-01-16 16:48:35 -07:00
Blade Barringer 75971b0f40 Added triad bingo check to releaseBoth function 2015-01-16 17:01:01 -06:00
Blade Barringer 8b1ba48bfe Merge branch 'mountmaster' into triad-bingo 2015-01-16 16:53:35 -06:00
Blade Barringer d9fed69147 Corrected releasBoth function to reset current pet and deduct the 
correct amount of gems
 2015-01-16 16:52:59 -06:00
Blade Barringer 5b2c4d5a09 Compiled css 2015-01-16 12:23:25 -06:00