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

1017 Commits

Author SHA1 Message Date
Blade Barringer 6dbfbeec81 Merge branch 'develop' into HabitRPG-sabrecat/backgrounds-201510 2015-10-03 06:40:50 -05:00
Blade Barringer 928e8478f7 Add coffeescript back in 2015-10-03 06:39:10 -05:00
Blade Barringer 655d8de7c8 chore(i18n): update locales 2015-10-02 22:28:12 -05:00
Blade Barringer 7a9bdfc9bf Correct base sets 2015-10-02 22:26:51 -05:00
Sabe Jones 56419aee25 feat(content): October 2015 backgrounds 2015-10-02 16:13:11 -04:00
Blade Barringer 36cbca380e Corrected order of backgrounds 2015-10-02 14:45:06 -05:00
Blade Barringer bf7d6dddcc chore(i18n): update locales 2015-10-02 11:41:57 -05:00
Blade Barringer c6c159a44c Add midnight shield back in 2015-10-02 11:40:42 -05:00
Blade Barringer eb5e77cbb2 Fix locales for healAll 2015-10-02 10:34:54 -05:00
Blade Barringer 97ad1a8bb2 chore(i18n): update locales 2015-10-02 10:31:27 -05:00
Blade Barringer 339ab9e507 correct key to use mispelled version :/ 2015-10-02 10:11:20 -05:00
Blade Barringer 5a7662db09 Merge pull request #5976 from crookedneighbor/refactor-content 
Refactor Content Files
 2015-10-02 08:55:10 -05:00
Damien Gourbiere 17eff9ed84 Issue #5928 - Replaced 'link' with actual URL in faq.json 2015-10-02 08:56:25 -04:00
Blade Barringer e07a99dc27 Export premium pets and mounts 2015-10-02 04:01:14 -05:00
Blade Barringer 54c5741fca chore(i18n): update locales 2015-10-01 22:44:53 -05:00
Blade Barringer 4d682214c1 Merge pull request #5996 from Gondulf/develop 
Issue #5978 - Corrected grammar in gear.jason
 2015-10-01 22:40:43 -05:00
Damien Gourbiere 4df9299e25 Reverted change to the stirring stick description 2015-10-01 23:25:27 -04:00
Damien Gourbiere d43242884f Issue #5978 - Corrected grammar in gear.jason 2015-10-01 23:09:24 -04:00
Blade Barringer be3decf859 Merge branch 'develop' into refactor-content 2015-10-01 21:20:04 -05:00
Blade Barringer a7fe29e04e Add comment to quest block 2015-10-01 17:26:21 -05:00
Sabe Jones 22c69c7e2f fix(magic-potions): Correct potion list merge 2015-10-01 16:53:11 -04:00
Sabe Jones 5349bc7312 chore(gulp): Compile sprites 2015-10-01 14:27:21 -05:00
Sabe Jones fc46023561 feat(armoire): October content 
(cherry picked from commit 2b2a85838dbc4539d41e6e2d508374b0960238d6)

Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith-main-3.png
	common/dist/sprites/spritesmith-main-4.css
	common/dist/sprites/spritesmith-main-4.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png
 2015-10-01 14:21:01 -05:00
Sabe Jones f4c18bb7f3 chore(gulp): Compile sprites 2015-10-01 14:11:22 -05:00
Sabe Jones 233211adc9 Merge pull request #5962 from HabitRPG/sabrecat/magic-potions 
Magic Potions!
 2015-10-01 14:04:14 -05:00
Sabe Jones 3d38777ec8 fix(content): Correctly generate api.hatchingPotions 2015-10-01 14:54:52 -04:00
Blade Barringer c8afac9580 Put magic pets on their own row 2015-10-01 13:21:15 -05:00
Blade Barringer 6667adb983 Reorder helper keys 2015-10-01 12:32:40 -05:00
Blade Barringer 86ec40e43d Add comment to gear file 2015-10-01 12:32:22 -05:00
Blade Barringer 3c933eaf4e Add comment to food file 2015-10-01 12:31:08 -05:00
Blade Barringer ee2134dcb7 Add comment to eggs file 2015-10-01 12:30:51 -05:00
Blade Barringer 5f4aa427fc Add comment to pets and mounts file 2015-10-01 12:30:36 -05:00
Blade Barringer faf5d263e0 Correct gear sets 2015-09-30 20:12:14 -05:00
Blade Barringer b96d3fc3fc Add special back 2015-09-30 19:50:57 -05:00
Blade Barringer 3be24456ec Move special and armoire gear to own module 2015-09-30 19:04:09 -05:00
Sabe Jones 9afaa92c2e feat(magic-potions): Clarify drop behavior 2015-09-30 15:31:09 -04:00
Blade Barringer 0199dcadf3 Add armoire set 2015-09-29 21:38:45 -05:00
Blade Barringer c56e7ba44e Move base euqipment to own module 2015-09-29 17:58:37 -05:00
Blade Barringer ff4dae8f89 Move mystery set into own module 2015-09-29 17:53:32 -05:00
Blade Barringer e9a4465a4c Merge branch 'develop' into refactor-content 2015-09-29 17:30:33 -05:00
Blade Barringer 5c0a0e1d18 Compile css 2015-09-29 17:30:08 -05:00
Blade Barringer 8676e660a8 Correct rogue shield 2015-09-29 12:20:57 -05:00
Blade Barringer bc47d44acc Add in text for evil santa quests 2015-09-29 08:00:53 -05:00
Blade Barringer 2db4b7b7b2 Move i18n to javascript 2015-09-28 17:33:45 -05:00
Sabe Jones ffe0cff7cd fix(drops): Pick drop eggs from dropEggs 2015-09-28 16:28:59 -04:00
Sabe Jones feff6fadfa feat(magic-potions): Final tweaks 2015-09-28 14:58:46 -04:00
Blade Barringer b8a8eff434 Merge branch 'develop' into refactor-content 2015-09-28 12:45:18 -05:00
Blade Barringer 2d862593ae Compile sprites 2015-09-28 08:50:20 -05:00
Blade Barringer d1faa50e5e Merge branch 'develop' into refactor-content 2015-09-28 07:52:02 -05:00
Blade Barringer bc46609fbc Use shorthand function syntax 2015-09-28 07:44:31 -05:00