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

1710 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sabe Jones 625d1dfbed Merge pull request #436 from SabreCat/stressbeast 
Stressbeast healing on rage
 2015-01-13 12:04:42 -06:00
Sabe Jones a2be1bc472 fix(world-boss): Bit stronger healing 2015-01-13 12:00:06 -06:00
Sabe Jones 480b4e2764 feat(world-boss): Healing on rage 2015-01-13 11:50:15 -06:00
Alice Harris b0fc2a8e7c Merge pull request #434 from Alys/develop 
change G to Gem to remove confusion with Gold
 2015-01-11 11:06:48 +10:00
Alice Harris 4e2a79e69c change G to Gem to remove confusion with Gold 2015-01-11 10:58:47 +10:00
Sabe Jones fd7ba143cc Merge pull request #432 from SabreCat/stressbeast 
World boss for Winter Wonderland 2015
 2015-01-08 15:51:23 -06:00
Sabe Jones 8bd32e0f35 chore(grunt): grunt full 2015-01-08 15:29:41 -06:00
Sabe Jones fde64b0bdf feat(event): World Boss 
Implements the 2015 Winter Wonderland world boss: the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:24:26 -06:00
Matteo Pagliazzi 54a9df4619 test(cron): setup failing test for changing cds to an hour past last cron 2015-01-07 16:52:04 +01:00
Matteo Pagliazzi f4b72c088f chore(i18n): add danish and update locales 2015-01-06 15:59:20 +01:00
Matteo Pagliazzi d63cc4da8f merge cron-fix 2015-01-06 08:55:48 +01:00
deilann b5de2ebf4b Merge pull request #430 from scribblypanda/develop 
off-hand to shield-hand in gear.json and questsContent.json
 2015-01-05 20:50:47 -08:00
Tyler Renelle 9ab3849502 grunt 2015-01-05 21:33:14 -07:00
scribblypanda 2718fd39e3 off-hand to shield-hand in gear.json and questsContent.json 2015-01-05 23:27:04 -05:00
Sabe Jones 61b827183b fix(grunt): Push CSS 2015-01-05 17:15:05 -06:00
Sabe Jones 97a48eb66e chore(grunt): grunt full 2015-01-05 17:00:17 -06:00
Sabe Jones 285ff6228c fix(backgrounds): Frigid, not Snowy, Peak 2015-01-05 16:41:23 -06:00
Sabe Jones 0bfc5b37c0 feat(backgrounds): January backgrounds 2015-01-05 16:36:11 -06:00
negue 1bdacffe96 Merge pull request #428 from negue/markdownDirective 
add remove-watch and use-timeout attribute to the markdown directive
 2015-01-05 22:11:38 +01:00
Matteo Pagliazzi 5eda9a34b7 chore(grunt): compile 2015-01-05 19:20:22 +01:00
Brandon Reid 15eb64c7d2 Fixed cron dayStart option. 
Wrote test cases to verify fix.
Fixed test cases that were incorrect.
 2015-01-05 19:20:21 +01:00
Matteo Pagliazzi a65c675243 chore(i18n): add hungarian and update locales 2015-01-05 17:31:26 +01:00
Blade Barringer a54e1cd448 Compiled version of adjustment to spells 2015-01-04 16:15:36 -06:00
Blade Barringer 5d6da27a70 Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg 2015-01-04 16:10:30 -06:00
Tyler Renelle 8b4c6c450b Revert "revert last commit" 
This reverts commit 0cc87d4ea0.
 2015-01-03 13:59:13 -07:00
Matteo Pagliazzi 0cc87d4ea0 revert last commit 2015-01-02 19:07:31 +01:00
Matteo Pagliazzi d362003cdf fix json 2015-01-02 18:52:14 +01:00
Matteo Pagliazzi 1f258e601c move spritesmith and phantomjs to dev dependencies 2015-01-02 18:50:39 +01:00
Matteo Pagliazzi edbfc24b08 fix(i18n): remove duplicate strings cc @negue 2015-01-02 12:45:40 +01:00
Sabe Jones 83559c5d98 chore(January): Jan updates 
Reverts New Year's NPCs to normal winter garb and updates the Mystery Item package to its January scheme.
 2015-01-01 23:18:18 -06:00
Blade Barringer 38a5dca58e Merge branch 'yearUpdate' of https://github.com/thehindenburg/habitrpg-shared into thehindenburg-yearUpdate 2015-01-01 15:37:55 -06:00
Sabe Jones cf10ecb30e Merge pull request #424 from crookedneighbor/upgrade-spritesmith 
Updated spritesmith
 2015-01-01 15:36:11 -06:00
Melissa Mcewen aa6abeecaa Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varibles to other spells 2015-01-01 14:47:04 -06:00
Melissa Mcewen a40d820d56 Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varible to spell 2015-01-01 14:34:15 -06:00
Melissa Mcewen 4a30363bc7 Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varible to spell 2015-01-01 14:30:30 -06:00
Negue 571cc9ed1d change ngModel to text 2015-01-01 20:31:21 +01:00
Negue f900e6451c add remove-watch and use-timeout attribute to the markdown directive 2015-01-01 18:20:33 +01:00
thehindenburg 74a871a8d2 add two years to winter gear 2014-12-31 17:46:06 -08:00
Blade Barringer 439f72cb91 Separated out the check for nyeRecieved and pushing to the array 2014-12-31 18:35:59 -06:00
Blade Barringer 0b57d42e2a Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2014-12-31 09:32:29 -06:00
Blade Barringer 611e350b63 Compiled changes to spookdust and snowball in task view 2014-12-31 09:31:09 -06:00
Blade Barringer f2bf3efc5c Adjusted position of ghost and snowball 2014-12-31 09:14:29 -06:00
Blade Barringer 008f79ad84 Resized shop versions of snowball and spookdust to match gold coins 2014-12-31 09:08:58 -06:00
Blade Barringer 8fb22c5301 Merge pull request #422 from crookedneighbor/resize-special-items 
Resize special items
 2014-12-31 08:49:49 -06:00
Blade Barringer 92ad91d545 Reverted gruntfile back 2014-12-31 08:41:11 -06:00
Blade Barringer 015ab34a4f Compiled images with cards 2014-12-31 08:40:50 -06:00
Blade Barringer 7cd9674d97 Resized cards 2014-12-31 08:39:35 -06:00
Blade Barringer 63a96db650 Merge branch 'develop' into resize-special-items 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith3.css
	dist/spritesmith3.png
 2014-12-31 08:37:17 -06:00
Matteo Pagliazzi c3283483e3 chore(i18n): update locales 2014-12-31 13:35:49 +01:00
Alice Harris a7dd2dbd74 add canOwn code to nye2014 hat 2014-12-31 16:25:12 +10:00