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

1722 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer d5436dc8ec Corrected release mounts code 2015-01-10 09:13:25 -06:00
Blade Barringer 06a89f67d7 Added title to keys heading. Allows dynamic display of beast master and 
or mount master
 2015-01-10 08:25:43 -06:00
Blade Barringer 8f90d154a0 Merge remote-tracking branch 'upstream/develop' into mountmaster 
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
 2015-01-08 11:30:53 -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
Blade Barringer b042c3e723 Compiled coffeescript for release scripts 2015-01-02 14:13:56 -06:00
Blade Barringer 0053dd67bd Adjusted translation key text, added a new one for releasing both. Added 
releaseBoth function
 2015-01-02 13:20:58 -06:00
Blade Barringer 312aa11272 Refactored release scripts 2015-01-02 12:41:36 -06: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 ea56c807ad Adjusted text of quests for beast master and mount master to be more descriptive 2015-01-01 22:12:00 -06:00
Blade Barringer 9767917b98 Added tests for mount master 2015-01-01 22:08:58 -06:00
Blade Barringer 9b34cfe8c6 Compiled mountmaster achievement medal 2015-01-01 21:17:37 -06:00
Blade Barringer 49b031ca89 Added mountmaster achievement badge 2015-01-01 21:02:09 -06:00
Blade Barringer 3cd295195a Adjusted test for new way to do countMounts function 2015-01-01 17:13:48 -06:00
Blade Barringer fb25848035 Adjusted text to match beastmasterProgress 2015-01-01 17:05:20 -06:00
Blade Barringer e613edbe3a Adjusted text to be more accurate 2015-01-01 16:53:09 -06:00
Blade Barringer 3389d418ce Set up system to calculate if Mountmaster should be awarded 2015-01-01 16:51:58 -06:00
Blade Barringer c0f51379e7 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-01 16:25:56 -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 3224cf6004 Corrected release2 script to actually release mounts 2014-12-31 17:20:22 -06:00
Blade Barringer a5a7d22ce4 Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster 2014-12-31 13:17:21 -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