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

193 Commits

Author SHA1 Message Date
Sabe Jones ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Josh Holland fae0bbc8f6 Add Moonstone Chain quest art 2016-02-28 19:37:07 -06:00
Josh Holland e2ca21f935 Add Message in a Bottle quest art 2016-02-28 17:12:57 +00:00
Sabe Jones 3270cbf89f fix(events): revert missed sprite and quest availability 2016-02-24 19:49:17 -05:00
Sabe Jones 5c1d379f41 feat(subscription): mystery items 201602 2016-02-23 17:00:55 -05:00
Alys 8d106d6d78 Merge branch 'fix_gryphons' of https://github.com/taldin/habitrpg into taldin-fix_gryphons 
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
 2016-02-18 18:56:40 +10:00
Sabe Jones f7c9769aab chore(event): revert Valentine's 2016-02-15 14:48:39 -05:00
Taldin b293d7acc2 Fixes #6356 (gryphon avatar clipping) 
Updated gryphon mount graphics.
 2016-02-09 10:27:10 -08:00
Sabe Jones e1b13db6e8 feat(quests): pets 201602 
Also enables the Valentine's Day card for selection in the Market.
 2016-02-08 16:20:05 -05:00
Sabe Jones d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05:00
Sabe Jones 0fcdc49adb chore(event): end Winter Wonderland 2016-02-01 17:01:17 -05:00
Sabe Jones 91c6ce27c5 feat(event): Habit Birthday 2016 
Also adds AWS Elastic Beanstalk local config file to .gitignore.
 2016-01-28 17:16:01 -05:00
Sabe Jones c6d6e73ae6 feat(subscription): January 2016 mystery items 2016-01-26 15:20:55 -05:00
Sabe Jones f872547264 chore(news): Bailey 2016-01-20 2016-01-20 16:32:12 -05:00
Sabe Jones 14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Nathan Maton b26d3bef40 replaced collars 2016-01-09 23:29:54 -06:00
Sabe Jones 1b7f17cbd2 chore(news): Bailey 2016-01-08 2016-01-08 16:28:49 -05:00
Sabe Jones adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Sabe Jones 6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Sabe Jones 054e3cb361 feat(event): New Year's Eve 2015 2015-12-29 14:55:05 -05:00
Sabe Jones 7d0efdeeda chore(news): Android announcement 
Also adds a higher-quality version of the Winter Town background.
 2015-12-23 14:43:16 -05:00
Sabe Jones 468198b9e2 feat(mystery): subscriber items 2015-12 
Also enables the Snowball in the Seasonal Shop.
 2015-12-22 16:16:30 -05:00
Sabe Jones c259c5c819 fix(event): sprite and string tweaks 2015-12-18 17:58:46 -05:00
Sabe Jones 493ae6f26a feat(event): Winter Wonderland complete 2015-12-18 15:48:14 -05:00
Sabe Jones 6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones fe1de12494 feat(pets): December quest 2015-12-14 16:28:39 -05:00
Blade Barringer 81067efd19 Merge branch 'joyclark-new_mount_heads' into develop 2015-12-12 17:16:36 -06:00
Blade Barringer a7ffb41acd fix(sprites): Correct size of tiger mount icon 2015-12-12 16:04:03 -06:00
Blade Barringer 1f37338782 fix(sprites): Correct mount head icons for peppermint pets 2015-12-12 14:35:14 -06:00
Blade Barringer 6d6e1caf0f fix(sprites): Correct spooky pet mount icons 2015-12-12 14:20:38 -06:00
Blade Barringer 8ad2b07253 fix(sprites): Correct gryphon mount icon sizing 2015-12-12 11:09:27 -06:00
Blade Barringer 9aa73db281 fix(sprites): Correct size of tiger sprites 2015-12-12 11:02:54 -06:00
Sabe Jones f6cdf5d257 chore(news): Android Bailey 2015-12-10 17:00:48 -05:00
Joy Clark 8756aeebfa fixing wolf sprite 2015-12-08 18:05:18 +01:00
joyclark faf2611ca3 making change for peppermit heads. 2015-12-08 13:36:25 +01:00
Joy Clark d8b0774618 Add Mount_Icon images 2015-12-08 13:22:12 +01:00
Sabe Jones 0f578b79ff feat(pets): Peppermint Hatching Potions 
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
 2015-12-04 17:20:33 -05:00
Blade Barringer a3665e7095 chore(image): Add vice2 quest image 2015-12-04 07:46:02 -06:00
Sabe Jones 03222bf084 feat(content): Armoire and backgrounds 2015/12 2015-12-01 16:29:22 -05:00
Sabe Jones 046e7bcfdc chore(event): Revert NPCs 2015-11-27 13:10:54 -05:00
Daniel Van Camp 98a62c5cc9 fix the phoenix base on the right place now 
(cherry picked from commit a8a2e3b74a)
 2015-11-26 11:22:57 -05:00
Sabe Jones 29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Sabe Jones 9671f4a09d feat(event): November sprites 2015-11-25 13:33:36 -06:00
Sabe Jones c352a30d4e chore(news): Bailey 2015-11-16 
Also sprite recompile to incorporate sticker promo image.
 2015-11-16 17:26:44 -05:00
Sabe Jones 83b61f9aa3 Merge branch 'develop' into sabrecat/pet-201511 
Conflicts:
	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-11-11 18:36:25 -05:00
Sabe Jones b32ab5a587 chore(news): Pet quest Bailey 
Also adds one missing sprite asset for the quest.
 2015-11-11 18:31:22 -05:00
Sabe Jones eba2ac386e feat(pets): November quest 
Fully functional commit. Missing only Bailey and the quest scroll sprite.
 2015-11-11 17:23:16 -05:00
Sabe Jones 586edc03c6 WIP(pets): Incomplete cobra sprites 2015-11-11 16:23:38 -05:00
Sabe Jones eed4207c6d Merge branch 'develop' into sabrecat/more-modals 
Conflicts:
	common/dist/sprites/spritesmith-largeSprites-0.png
	common/locales/en/front.json
 2015-11-09 16:24:17 -05:00
Sabe Jones 164309e050 feat(sharing): Streak Achievement 2015-11-06 16:54:23 -05:00