Commit graph

191 commits

Author SHA1 Message Date
Blade Barringer
a9d227b490 Merge branch 'develop' into wheelchair 2016-03-28 21:12:52 -05:00
Blade Barringer
2d55a2a31d chore: compile sprites 2016-03-24 07:57:57 -05:00
Nick Bunn
0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Sabe Jones
f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Sabe Jones
b5f91a657f feat(event): Spring Fling complete 2016-03-18 16:56:16 -04:00
Sabe Jones
beb86ea4bd Merge branch 'khipkin/party-badges' into develop
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
2016-03-15 14:57:38 -04:00
Kaitlin Hipkin
997fe155e2 fix blurry upscale of achievement-partyUp img 2016-03-10 20:49:54 -05:00
Sabe Jones
45b8dbc1a6 feat(content): snails complete 2016-03-09 15:55:22 -05:00
Kaitlin Hipkin
b0fe5f4081 add 2x party up/on achieve images and recompile spritesheets 2016-03-09 12:43:54 -05:00
Kaitlin Hipkin
6642a8e131 add party up/on achiev images and recompile spritesheets 2016-03-09 12:02:43 -05:00
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
c95950c679 recompile spritesheets 2016-02-18 20:07:35 +10: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
Blade Barringer
d02c3d321e refactor: Remove compiled spritesheet from source control 2016-01-14 18:03:14 -06:00
Sabe Jones
14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Matteo Pagliazzi
f83b271b30 rever new history preening 2016-01-13 11:07:52 +01:00
Blade Barringer
502ba27b47 chore(sprites): Compile sprites 2016-01-09 23:32:17 -06:00
Matteo Pagliazzi
be0fe3eb4f Merge pull request #6479 from HabitRPG/new-history-preening
New history preening
2016-01-09 20:12:33 +01:00
Sabe Jones
1b7f17cbd2 chore(news): Bailey 2016-01-08 2016-01-08 16:28:49 -05:00
Matteo Pagliazzi
fdd5ab724a begin implementing new preenUserHistory method: port current code to es6 and setup tests 2016-01-07 18:44:25 +01: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
Blade Barringer
5127068ca7 chore: Compile css 2015-12-26 19:02:28 -06:00
darkmeep
1c261056fe clear local storage page added
changed submit bug to clear browser data

feat(views): Style clear local storage button
2015-12-26 19:00:42 -06: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
ee87d1b4b7 chore(sprites): Compile 2015-12-12 17:12:53 -06:00
Alys
5d6c4d4dcd add Android app with Google Play logo to static apps page; remove mailing list signup form 2015-12-12 11:32:17 +10: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
1769fc15f7 css files and sprite sheets 2015-12-08 13:22:13 +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