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

264 Commits

Author SHA1 Message Date
Blade Barringer bb00e9d97c Added new hair types 2015-02-04 09:26:22 -06:00
Sabe Jones c9b81414a4 feat(seasonal): Normal view 2015-02-02 18:53:54 -06:00
Sabe Jones 0cc819cc64 fix(event): Robes shop icon 2015-01-29 13:19:32 -06:00
Sabe Jones c8b9cf2873 feat(event): Habit Birthday 2015 2015-01-29 13:05:05 -06:00
Sabe Jones b8d9f047b1 fix(sprites): Rooster recolors 
Fixes https://github.com/HabitRPG/habitrpg/issues/4576.
 2015-01-27 11:54:16 -06:00
Sabe Jones e70fce24f5 Merge pull request #451 from SabreCat/scrolls 
Differentiated quest scrolls and January 2015 subscriber item
 2015-01-26 11:20:29 -06:00
Sabe Jones e2f47651a4 feat(mystery): January subscriber set 2015-01-26 10:59:29 -06:00
Sabe Jones 009255bdb5 fix(sprite): Improved Nameless Helm 
Fixes https://github.com/HabitRPG/habitrpg/issues/4568.
 2015-01-24 10:57:24 -06:00
Sabe Jones 2ca6636c94 feat(quests): Differentiated scrolls 
Adds pixel art for individual quests so they can be differentiated in the Market.
 2015-01-23 10:27:13 -06:00
Blade Barringer cc6cb3785e Merge branch 'mountmaster' into bailey-20150120 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
 2015-01-20 10:39:45 -06:00
Blade Barringer 86c7203170 Added rock mounts 2015-01-18 21:11:41 -06:00
Blade Barringer 511b4a1b0b Added pet rocks 2015-01-18 20:34:12 -06:00
Blade Barringer 418f54a32d Added rock pet egg 2015-01-18 18:38:56 -06:00
Blade Barringer 0bb9aa9f56 Added rock quest boss 2015-01-18 18:30:54 -06:00
Blade Barringer 3bed7d8153 Added january mystery items 2015-01-18 18:25:25 -06:00
Blade Barringer c13f6b15a1 Added feb background images 2015-01-18 18:12:45 -06:00
Blade Barringer 2efadf7381 Removed white space on t-rex iamges closes #4531 2015-01-16 22:33:06 -06:00
Blade Barringer 1460e5762e Added sprite 2015-01-16 12:15:22 -06:00
Blade Barringer 75cf2a4788 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
 2015-01-16 10:46:59 -06:00
Sabe Jones c260362d96 feat(quest): T-Rex pet 
Implements two new Quests, and the "tyrannosaur" pets included as rewards for same.
 2015-01-15 15:45:56 -06:00
Blade Barringer 83d91dfe34 Merged in changes from develop and re-ran grunt full 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	dist/spritesmith5.css
	dist/spritesmith5.png
 2015-01-10 09:33:52 -06:00
Sabe Jones fde64b0bdf feat(event): World Boss 
Implements the 2015 Winter Wonderland world boss: the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:24:26 -06:00
Blade Barringer 8f90d154a0 Merge remote-tracking branch 'upstream/develop' into mountmaster 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
 2015-01-08 11:30:53 -06:00
Sabe Jones 285ff6228c fix(backgrounds): Frigid, not Snowy, Peak 2015-01-05 16:41:23 -06:00
Sabe Jones 0bfc5b37c0 feat(backgrounds): January backgrounds 2015-01-05 16:36:11 -06:00
Sabe Jones 83559c5d98 chore(January): Jan updates 
Reverts New Year's NPCs to normal winter garb and updates the Mystery Item package to its January scheme.
 2015-01-01 23:18:18 -06:00
Blade Barringer 49b031ca89 Added mountmaster achievement badge 2015-01-01 21:02:09 -06:00
Blade Barringer f2bf3efc5c Adjusted position of ghost and snowball 2014-12-31 09:14:29 -06:00
Blade Barringer 008f79ad84 Resized shop versions of snowball and spookdust to match gold coins 2014-12-31 09:08:58 -06:00
Blade Barringer 7cd9674d97 Resized cards 2014-12-31 08:39:35 -06:00
Blade Barringer 63a96db650 Merge branch 'develop' into resize-special-items 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith3.css
	dist/spritesmith3.png
 2014-12-31 08:37:17 -06:00
Sabe Jones 8fabcc4ffd Merge pull request #425 from SabreCat/nye 
New Year's event features
 2014-12-30 22:17:23 -06:00
Sabe Jones dd3ec20e5e feat(NYE): Silly Party Hat 2014-12-30 21:20:07 -06:00
Blade Barringer a0eb6f2229 Removed larger border from side of fortify potion 2014-12-30 19:04:25 -06:00
Blade Barringer a1e48eadd1 Merge branch 'issue-3954' of https://github.com/ebiagogo/habitrpg-shared into ebiagogo-issue-3954 
Conflicts:
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.png
	dist/spritesmith3.png
	dist/spritesmith4.png
	dist/spritesmith5.png
 2014-12-30 14:47:22 -06:00
Blade Barringer f414cac772 Resized special inv items so they are the same size as the gems 2014-12-30 10:57:00 -06:00
Blade Barringer 627a9af3b9 Compiled css and images for cyrstal armor (shop). Closes #180 2014-12-29 23:04:30 -06:00
Blade Barringer aca7a039c4 Updated crystal armor 2014-12-29 22:51:06 -06:00
Blade Barringer a80e0322ee Updated hydra pet to use standard pet dimensions 2014-12-29 22:19:24 -06:00
Blade Barringer 2a3f2504f0 Updated image sprites for octopi 2014-12-29 22:07:21 -06:00
Sabe Jones c14285dbd9 feat(NYE): Image resources 2014-12-29 20:17:47 -06:00
Sabe Jones 37db763fc2 fix(event): Mystery sprite error 2014-12-25 18:08:14 -06:00
Sabe Jones 9471393776 feat(event): 2014 Mystery Items 2014-12-25 16:08:06 -06:00
Sabe Jones 0ec9e5b1e1 feat(news): Promo images 2014-12-21 15:40:07 -06:00
Sabe Jones 649e207769 Merge pull request #402 from SabreCat/winter2015/hair 
Wintery Hair Colors for Wonderland 2015
 2014-12-21 15:16:10 -06:00
Sabe Jones 1ff25dfd5b Merge pull request #401 from SabreCat/winter2015/gear 
Winter Wonderland 2015 Gear
 2014-12-21 15:09:51 -06:00
Sabe Jones d0a97fb20f feat(event): Wintery Hair Colors 
Also removes an accidental duplication of a prior hair resource.
 2014-12-21 13:55:23 -06:00
Sabe Jones e62cb74ad0 fix(event): head, not helm 2014-12-21 12:43:44 -06:00
Sabe Jones 8ec9f79188 feat(event): Winter Wonderland 2015 gear 2014-12-21 12:37:37 -06:00
Sabe Jones c8aadf296e feat(event): Winter NPCs 2014-12-21 10:44:08 -06:00