Commit Graph

55 Commits

Author SHA1 Message Date
Blade Barringer 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
Sabe Jones 3e848ce67e chore(pets): Compile sprites 2015-08-19 14:59:26 -05:00
Sabe Jones b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
Sabe Jones f97012798e WIP(party-page): Party preview graphic 2015-08-06 16:36:28 -05:00
Sabe Jones a03fa32a3a fix(NPCs): De-Splashify sprites 2015-08-04 14:39:29 -05:00
Sabe Jones 6b37b0ced6 fix(armoire): Add sprites, pass tests 2015-08-04 13:00:34 -05:00
Sabe Jones 60e65a8bea feat(armoire): August additions
Also includes the August backgrounds and upgrades the "restock Armoire" migration to use @Alys's progressive output script.
2015-08-04 12:45:01 -05:00
Sabe Jones bbbae27631 chore(naming-day): Bailey and sprites 2015-07-29 14:12:04 -05:00
Sabe Jones ceb9cf7817 WIP(event): Habitica Day 2015-07-28 16:20:08 -05:00
Sabe Jones 3adb315184 feat(death): Release candidate
Version to push live for end user feedback. (Pardon the merge conflict garbage included in prior commit; rerunning spritesmith sorted it out!)
2015-07-24 16:24:14 -05:00
Sabe Jones d022a0eb67 Merge branch 'develop' into sabrecat/death-modal
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
2015-07-24 16:11:51 -05:00
Sabe Jones d32d05e873 feat(mystery): July 2015 goodies
Also makes the mystery box opening notification translatable and adds item graphics to it.
2015-07-23 12:05:13 -05:00
Alys c3e2b92546 add all the files I forgot to add for https://github.com/HabitRPG/habitrpg/commit/02cccb01ef1ade15b4eba816148314726e2efb30 (blank placeholder image for collection quests, partial fix for #4936) 2015-07-23 13:58:38 +10:00
Sabe Jones 5789f22320 WIP(death): Draft with decal 2015-07-21 14:39:08 -05:00
Sabe Jones 6cad2df6a3 test(quests): Add user.ops.buyQuest test
Also adds the Bailey announcement for the day and implements "locked" quest scrolls for the beginning quests in extant quest chains.
2015-07-14 17:34:01 -05:00
Sabe Jones b9f795529b feat(quests): Dilatory Distress
Implements the "Dilatory Distress" quest chain, purchasable for Gold. Also adds four new items to the Enchanted Armoire.
2015-07-13 18:21:32 -05:00
Blade Barringer b01e4489ef Compile sprites 2015-07-12 22:30:46 -05:00
Sabe Jones d5f97b2781 chore(news): Derby Day Bailey 2015-07-09 14:24:22 -05:00
Sabe Jones 6cc0a08dc2 feat(event): Derby Day pet quest 2015-07-09 12:57:43 -05:00
Sabe Jones 3dd2493fed chore(news): iOS release Bailey 2015-07-07 13:27:19 -05:00
Blade Barringer fe7642e33a Add find the cub art
Closes #5545
2015-07-01 20:19:46 -05:00
Sabe Jones 25dd82ffa0 feat(event): Summer Splash cont'd
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
Sabe Jones 775f903c3d feat(events): Limited edition
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
2015-06-25 11:19:01 -05:00
Sabe Jones 3641bea441 feat(event): Summer Splash 2015
Summer seasonal event for 2015, including festive NPC graphics, the summer edition of the Seasonal Shop, and new class equipment available in Rewards.
2015-06-20 23:07:14 -05:00
Sabe Jones f6fafc5b6d WIP(event): Summer Splash 2015 2015-06-19 10:42:20 -05:00
Sabe Jones ad7e5a6dc9 feat(pets): Cuttlefishies 2015-06-17 17:26:36 -05:00
Sabe Jones 95bb5be22a Merge branch 'develop' into armoire
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	common/dist/sprites/spritesmith5.css
	common/dist/sprites/spritesmith5.png
	common/dist/sprites/spritesmith6.css
	common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
Sabe Jones 6074774e14 feat(backgrounds): June BGs 2015-06-04 11:30:25 -05:00
Sabe Jones c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
Sabe Jones d76ca1c04d feat(mystery): Programmatic presents
Shows the appropriately colored subscription giftwrap for the user's current month. Also includes the Bailey notification for this month's upcoming subscriber item.
2015-06-01 12:06:35 -05:00
Sabe Jones 5127814f9e chore(grunt): compile sprites 2015-05-29 15:19:51 -05:00
Sabe Jones ed25cffaf7 chore(grunt): compile sprites 2015-05-25 21:10:37 -05:00
SabreCat 13faf8d0c7 feat(pets): Sheep Quest 2015-05-20 20:45:18 -07:00
Sabe Jones 2b8414766b chore(grunt): compile sprites 2015-05-13 11:19:33 -05:00
Sabe Jones 040e6e0a41 chore(grunt):compile sprites 2015-05-06 19:53:08 -05:00
Sabe Jones 74877f0653 chore(grunt): compile sprites 2015-05-01 19:22:09 -05:00
Sabe Jones 286eed95a2 chore(grunt): compile sprites 2015-04-21 21:34:39 -05:00
Sabe Jones 55324e8fa5 chore(grunt): compile sprites 2015-04-15 18:56:51 -05:00
Sabe Jones ad15351ce0 chore(grunt): compile sprites 2015-04-01 23:48:09 -05:00
Sabe Jones bed404cf47 chore(flowers): COMPILE FLOWERS
Required root access.
2015-03-31 19:01:04 -05:00
Sabe Jones 15c72b2ea8 chore(grunt): compile sprites 2015-03-29 16:44:50 -05:00
Sabe Jones 75ab7427fc chore(grunt): Eggy eggy sprites 2015-03-25 22:12:55 -05:00
Tyler Renelle 560d51b2e2 feat(tour): esc force closes, but puts justin head in toolbar. clicking
justin head brings tour back.
2015-03-24 15:41:44 -06:00
Sabe Jones 58db06c515 chore(grunt): Compile 2015-03-20 15:53:42 -05:00
Blade Barringer 9c43a7da22 chore(grunt compile:sprites) 2015-03-09 16:34:55 -05:00
Blade Barringer 9e6c268a97 chore(grunt compile:sprites) 2015-03-09 13:42:35 -05:00
Sabe Jones 3d3438e074 chore(grunt): Compile sprites 2015-02-24 20:45:50 -06:00
Blade Barringer 6eeff5a0af Changed matt back to brown hair version 2015-02-24 13:37:14 -06:00
Sabe Jones 87b13d5fc8 chore(grunt): compile sprites 2015-02-17 20:46:40 -06:00
Sabe Jones e0cbeaadc5 chore(grunt): compile sprites 2015-02-16 18:31:00 -06:00