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

240 Commits

Author SHA1 Message Date
Blade Barringer 75eb6304eb Renamed variable name 2015-01-28 13:51:03 -06:00
Blade Barringer 21be3e8957 Adjusted default tasks per lemoness 2015-01-28 13:43:15 -06:00
Blade Barringer b890326545 Added new tasks for onboarding per lemoness 2015-01-27 21:50:41 -06:00
Sabe Jones e2f47651a4 feat(mystery): January subscriber set 2015-01-26 10:59:29 -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
Sabe Jones 7925935ff5 feat(world-boss): Desperation move 2015-01-19 21:47:27 -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
Sabe Jones 4e50c43da2 fix(world-boss): Scale based on current HP 2015-01-13 13:19:38 -06:00
Sabe Jones a2be1bc472 fix(world-boss): Bit stronger healing 2015-01-13 12:00:06 -06:00
Sabe Jones 480b4e2764 feat(world-boss): Healing on rage 2015-01-13 11:50:15 -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
Blade Barringer 5d6da27a70 Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg 2015-01-04 16:10:30 -06:00
Blade Barringer c0f51379e7 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-01 16:25:56 -06:00
Melissa Mcewen aa6abeecaa Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varibles to other spells 2015-01-01 14:47:04 -06:00
Melissa Mcewen 4a30363bc7 Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varible to spell 2015-01-01 14:30:30 -06:00
Blade Barringer 439f72cb91 Separated out the check for nyeRecieved and pushing to the array 2014-12-31 18:35:59 -06:00
Blade Barringer a5a7d22ce4 Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster 2014-12-31 13:17:21 -06:00
Alice Harris a7dd2dbd74 add canOwn code to nye2014 hat 2014-12-31 16:25:12 +10: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
Tyler Renelle 5fc001e4f6 feat(google-discount): add google discount 2014-12-30 20:05:51 -07:00
Sabe Jones 11beb14e14 fix(NYE): t undefined 2014-12-30 20:42:32 -06:00
Sabe Jones e7388822f1 fix(NYE): Card to self exploit 2014-12-30 20:33:45 -06:00
Sabe Jones 5623fb0078 fix(NYE): I18N shop text 2014-12-30 20:14:56 -06:00
Shared 7facfd1b84 Changed armorSpecialSkiText to armorSpecialSkiNotes for the notes 2014-12-30 22:28:46 +05:30
Sabe Jones 9e74d94e48 WIP(NYE): New Year's Cards 2014-12-29 20:57:12 -06:00
Sabe Jones f7d45c951e feat(seasonal): Implement snowball 
Minor refactoring of special spell purchasing, and turns snowball into Gold- instead of Gem-purchasable.
 2014-12-29 19:38:43 -06:00
Sabe Jones 6c8f9e39b6 fix(event): Mystery typo 2014-12-25 18:05:04 -06:00
Sabe Jones 9471393776 feat(event): 2014 Mystery Items 2014-12-25 16:08:06 -06:00
Sabe Jones 8ec9f79188 feat(event): Winter Wonderland 2015 gear 2014-12-21 12:37:37 -06:00
Blade Barringer 324077566b Merge branch 'mountmaster' of https://github.com/taldin/habitrpg-shared into taldin-mountmaster 
Conflicts:
	script/content.coffee
 2014-12-11 08:31:19 -06:00
Sabe Jones 7fd4cebbdc fix(quest): Penguin corrections 
Fix missing egg item and line breaks in quest text
 2014-12-09 20:44:10 -06:00
Sabe Jones d25455fa5a feat(quest): Implement Penguin pet quest 2014-12-09 20:21:20 -06:00
Tyler Renelle bf7e1e66ed feat(plans): time traveler - by full sets 2014-12-03 15:24:08 -07:00
Tyler Renelle d81badde69 feat(plans): add time traveler - buy individual mystery items 2014-12-03 15:24:08 -07:00
Tyler Renelle 76be625f6d feat(plans): add consecutive-month benefits for subscribers 2014-12-03 15:24:08 -07:00
Sabe Jones 4d8a9c5287 feat(backgrounds): December purchasables 2014-11-30 22:54:37 -06:00
Tyler Renelle 703451d452 fix(mystery): typo 2014-11-30 14:11:49 -07:00
Tyler Renelle 5ee9f4904a Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop 
Conflicts:
	locales/en/gear.json
 2014-11-29 08:26:23 -07:00
Sabe Jones 645327b9b0 feat(event): Thanksgiving updates 2014-11-26 19:33:01 -06:00
Tyler Renelle 22cddb1086 feat(mystery): mystery 201411 2014-11-24 19:34:47 -07:00
Sabe Jones 9ececc9565 feat(quest): Implement Owl quest 2014-11-18 20:23:27 -06:00
Sabe Jones 000eefc695 feat(quest): add owl to egg types 2014-11-18 19:49:33 -06:00
Tyler Renelle dacaf41d63 fix(MMM): typo 2014-11-18 16:39:42 -08:00
Taldin e477f6482d Shouldn't get Noble Tunic from Knight Quest 
Fixed getting both Jean Chalard's Noble Tunic and Mustelaine's Offhand
Morning Star.   Removed the line awarding the Tunic (armor_special2).
 2014-11-17 17:50:22 -08:00