krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,920 Commits 64 Branches 1,225 Tags
b7cd46a6fe02b1ce1db910b8e5549ff39b2bc0a2
Commit Graph

99 Commits

Author SHA1 Message Date
Blade Barringer
1df4cf81dd compile sprites using gulp 2015-09-12 11:22:15 -05:00
Sabe Jones
41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	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
 2015-09-08 13:25:10 -05:00
Sabe Jones
6f85fcfde2 Merge branch 'develop' into sabrecat/party-page 
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-09-01 13:40:20 -05:00
Sabe Jones
daf3a2d2bc feat(pets): Horse sprites 2015-09-01 12:07:21 -05:00
Sabe Jones
c0a47130e4 chore(content): Compile sprites 2015-08-31 15:54:08 -05:00
Blade Barringer
a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -05:00
Sabe Jones
9e45017faa Merge branch 'develop' into sabrecat/onboarding-tweaks 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	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
 2015-08-28 13:24:10 -05:00
Sabe Jones
f308116c54 feat(tutorial): Moar avatars 2015-08-28 11:48:30 -05:00
Blade Barringer
15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -05:00
Sabe Jones
f88c536836 chore(news): Back to School Bailey 2015-08-27 16:20:15 -05:00
Sabe Jones
f5c08c4ae5 WIP(tutorial): Gregarious Vice 2015-08-27 15:36:53 -05:00
Sabe Jones
f8994a3ee3 WIP(tutorial): Revised images 2015-08-27 15:21:09 -05:00
Sabe Jones
5c4ebef0a9 feat(tutorial): New intro images 2015-08-27 13:08:12 -05:00
Sabe Jones
a0e1d50bd6 feat(mystery): 2015 August sprites 2015-08-24 15:38:09 -05:00
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
Blade Barringer
344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Blade Barringer
a040acf739 Compile sprites 2015-08-14 23:26:50 -05:00
Sabe Jones
572e64e3ed WIP(party-page): Refactor groups service 2015-08-14 12:58:46 -05:00
Sabe Jones
0f31873262 Merge branch 'develop' into sabrecat/party-page 
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	website/views/options/social/index.jade
 2015-08-14 11:23:35 -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
65f21619ae feat(naming-day): Bailey etc. 2015-07-30 19:46:04 -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
8492541636 fix(visuals): Armoire and Seasonal Shop 
Cleans up the Enchanted Armoire sprite and fixes bad alignment of Gem prices on the Seasonal Shop page.
 2015-07-28 13:35:17 -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 02cccb01ef (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
Blade Barringer
8a97b597f5 Resize sea foam image 
Fixes #5609
 2015-07-15 07:53:12 -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
Blade Barringer
ba85487b29 Correct naming of backgrounds 2015-07-01 19:50:49 -05:00
Sabe Jones
d248b74569 fix(event): Splash visual tweaks 2015-07-01 14:21:37 -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
Blade Barringer
7aa2bb0db5 Chore(compile sprites) 2015-06-27 16:24:12 -05:00
Andy Martin
0fb911016a shrink spritesmith images to reduce page load 2015-06-25 22:25:14 -06:00
Sabe Jones
335acd276c fix(sprites): Reposition snorkely things 2015-06-25 15:08:26 -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