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

1487 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle eb27a76709 feat(thanksgiving): revert npcs back to normal 2014-11-28 18:34:36 -07:00
Tyler Renelle 17f3868b96 Merge pull request #374 from SabreCat/turkey 
Give Alex and Bailey their Thanksgiving costumes
 2014-11-27 12:13:05 -07:00
Tyler Renelle 60bf777668 grunt 2014-11-27 12:11:14 -07:00
Sabe Jones a4a94f7973 fix(event): grunt 2014-11-27 09:13:20 -06:00
Sabe Jones d37dd90484 fix(event): Festify missed NPCs 2014-11-27 09:05:21 -06:00
Alice Harris 0a4dc94474 Merge pull request #370 from Alys/gem-cap-message-2014-11-25 
make Gold=>Gem conversion cap message more accurate in terms of when to wait until - fixes https://github.com/HabitRPG/habitrpg/issues/3996
 2014-11-27 14:46:23 +10:00
Tyler Renelle eb80bdf3e0 grunt(turkey-mount) 2014-11-26 19:10:22 -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
Tyler Renelle 04b8e889f3 Merge branch 'crookedneighbor-add-quick-reply-string' into develop 
Conflicts:
	locales/en/groups.json
 2014-11-24 18:11:18 -07:00
Matteo Pagliazzi e3f126c3db Merge pull request #369 from crookedneighbor/add-translation-strings 
Added additional translation strings for pms
 2014-11-24 20:20:46 +01:00
Alice Harris 66aebf2e80 make Gold=>Gem conversion cap message more accurate in terms of when to wait until - fixes https://github.com/HabitRPG/habitrpg/issues/3996 2014-11-25 05:16:36 +10:00
Blade Barringer 801521df98 Added message sent note string 2014-11-23 21:39:36 -06:00
Blade Barringer 66e68a5814 Added additional strings for pm modal 2014-11-23 21:33:41 -06:00
Blade Barringer 6b859fa11b Added additional translation strings for pms 2014-11-23 21:20:27 -06:00
Blade Barringer 85c7f80f14 Added string for quick reply 2014-11-23 20:41:52 -06:00
Matteo Pagliazzi d01b4291af chore(i18n): update locales 2014-11-23 20:53:44 +01:00
Alice Harris ec1056c07f Merge pull request #367 from taldin/update-tavern-tier-descs 
tavern-tier-rewards-update(en)
 2014-11-22 07:51:39 +10:00
Tyler Renelle 03f47cd0aa feat(private-messages): add a "clear all" fn 2014-11-21 08:42:08 -07:00
Tyler Renelle 1bca160eb6 feat(private-messages): add features for private-messaging (deletePM, blockUser) 2014-11-20 19:06:00 -07:00
Taldin 9a434476c4 tavern-tier-rewards-update(en) 
Updated to show the correct gem awards for tiers in the tavern (en
corrected only)
 2014-11-20 15:33:33 -08:00
Tyler Renelle f68f884525 refactor(reflist): helper fn for reflist.push (not used now, but might 
need soon)
 2014-11-20 16:22:42 -07:00
Tyler Renelle b88a48ebd3 grunt(owl) 2014-11-18 23:06:13 -08:00
Tyler Renelle b3d26d0b05 Merge pull request #364 from SabreCat/owl 
Implement Owl quest for November event
 2014-11-18 23:02:24 -08:00
Sabe Jones 9e8947ca75 fix(quest): HTML line breaks 2014-11-18 21:47:18 -06:00
Sabe Jones 3ef40626a6 fix(quest): Rogue line breaks 2014-11-18 21:36:52 -06:00
Sabe Jones 587aec1836 fix(quest): Not so smart quotes 2014-11-18 21:27:53 -06: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
Tyler Renelle a38c8761a2 feat(premium): add premium features 2014-11-18 16:21:16 -08:00
Tyler Renelle 619c8f6f17 Merge pull request #361 from taldin/adjust_golden_knight 
Adjust golden knight (shouldn't get Jean Chalard's Tunic)
 2014-11-17 18:42:35 -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
Taldin bc59db2c4d Fix rebuying Mustelaine's Morningstar after death 
Modifies script\content.coffee.
 2014-11-17 16:53:09 -08:00
Tyler Renelle d74f9d7a47 fix(goldenknight): add shop img for shield_special_goldenknight and fix 
translation issues, fixes https://github.com/HabitRPG/habitrpg/issues/4249
 2014-11-17 12:14:14 -08:00
Tyler Renelle 83a22b8133 feat(webhooks): add webhooks operations 2014-11-16 20:03:20 -08:00
Tyler Renelle d078654f41 chore(logo): 512x & 1024x logos 2014-11-16 13:57:50 -08:00
Matteo Pagliazzi 63d700aa5a chore(i18n): update locales 2014-11-15 18:06:45 +01:00
Tyler Renelle cbd436a867 fix(invite-friends): canbuy->canBuy typo 2014-11-13 17:53:09 -07:00
Sabe Jones 1aa7f6ca91 feat(quest): Begin implementing owl 
Initial/test commit for building out the Owl quest.
 2014-11-12 20:57:19 -06:00
Tyler Renelle 9bb40d6a96 feat(invite-friends): add basilist quest 2014-11-12 19:23:43 -07:00
Alice Harris dcfa0817f6 Merge pull request #357 from ShilohT/develop 
Added definitions for new 'Data' menu item
 2014-11-12 20:14:57 +10:00
Tyler Renelle 97a9ecf1f4 feat(quests): goldeknight auto-drops at 40 2014-11-11 21:04:21 -07:00
Tyler Renelle 73bdc0dbaf feat(quests): golden knight chain 2014-11-11 20:59:31 -07:00
ShilohT 14a4bfd0cb Update settings.json 
Added definitions for new 'Data' menu item
 2014-11-10 02:11:04 -05:00
Alice Harris 5b9f79eab2 rename Habit tabs to make them shorter (Weak/Strong instead of Struggling/On Track) - https://github.com/HabitRPG/habitrpg/pull/4167#issuecomment-61394775 2014-11-09 09:09:38 +10:00
Alice Harris 6f4eebb348 Merge pull request #354 from Alys/beeminderDeleteWarning-2014-11-06 
add warning text for Beeminder users about deleting To-Dos
 2014-11-07 19:31:26 +10:00
Tyler Renelle 8120d69d05 feat(halloween): costume contest badges 2014-11-06 16:21:52 -07:00
Tyler Renelle d043048d28 deleted facebook.jpeg, now using zocial (see HabitRPG/habitrpg#6304dd2) 2014-11-06 16:21:09 -07:00
Alice Harris a34beb7686 add warning text for Beeminder users about deleting To-Dos 2014-11-06 12:24:27 +10:00