Commit graph

1459 commits

Author SHA1 Message Date
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
Tyler Renelle
c53e6a23cf feat(backgrounds): add new backgrounds 2014-11-04 19:45:42 -07:00
Matteo Pagliazzi
28668bea8c Merge pull request #352 from Alys/commGuide-translation-fix-2014-11-04
merge strings to ease translations
2014-11-04 19:15:13 +01:00
Alice Harris
cad04b376a merge strings to ease translations 2014-11-04 16:44:15 +10:00
Matteo Pagliazzi
2ac9cd037c chore(i18n): add communityGuidelines translations 2014-11-03 20:28:18 +01:00
Matteo Pagliazzi
e788872932 fix typo in previous commit 2014-11-03 19:55:10 +01:00
Matteo Pagliazzi
e692b4b392 do not allow user to revive if not dead, fixes HabitRPG/habitrpg#3599 2014-11-03 19:53:27 +01:00
Matteo Pagliazzi
7e573bc877 chore(i18n): update locales, add pirate english 2014-11-03 19:29:01 +01:00
Tyler Renelle
3fc4978176 feat(fall): back to default npcs 2014-11-02 23:10:48 -07:00
Tyler Renelle
1151002dd6 feat(fall): disable candy drops 2014-11-02 17:02:09 -07:00
Tyler Renelle
8932db4cc9 feat(mystery): update box 2014-11-01 13:29:29 -06:00
Tyler Renelle
3132bbcb41 feat(fall): back to fall npcs 2014-11-01 13:28:32 -06:00
Tyler Renelle
44aa1209cd Merge pull request #351 from spacetime/develop
Added space before "target=" when added to href
2014-11-01 13:06:58 -06:00
Rishab Arora
a772c6dd8f Added space before "target=" when added to href
Fixes bug where the first links in markdown boxes don't work
2014-11-01 23:04:00 +05:30
Tyler Renelle
6f3c855db0 feat(halloween): halloween sprites 2014-10-31 13:05:22 -06:00
Tyler Renelle
5e594b3197 Merge pull request #339 from negue/chat_mentions
highlight the current username
2014-10-29 14:35:49 -06:00
Tyler Renelle
f9249ff488 Merge pull request #338 from gjoyner/languages
The language file for the Forgot Password fix
2014-10-29 14:30:06 -06:00
Tyler Renelle
c0a53740c4 Merge branch 'Alys-communityGuidelines' into develop 2014-10-27 16:19:14 -06:00
Alice Harris
9de41cd259 Merge pull request #347 from Alys/task-column-Habits-Rewards-tabs
new tabs for Habits and Rewards columns on task page
2014-10-27 18:46:13 +10:00
Alice Harris
c156aaadee add compiled file 2014-10-27 18:39:33 +10:00
Alice Harris
59fd7e92ba improve labels for Habit tags 2014-10-27 18:32:51 +10:00
Alice Harris
44ee614427 add text for tabs for Habits and Rewards columns on task page 2014-10-27 18:32:14 +10:00
Matteo Pagliazzi
b552a6762d Merge pull request #345 from Omnomnobot/patch-3
Fixed a typo (youself -> yourself)
2014-10-26 12:44:24 +01:00
Matteo Pagliazzi
f63d2bf309 chore(i18n): update locales 2014-10-26 13:42:16 +01:00
Tyler Renelle
5c1b7d245d Merge branch 'Alys-communityGuidelines' into develop
Conflicts:
	dist/habitrpg-shared.js
	locales/en/generic.json
2014-10-25 16:19:22 -06:00
Tyler Renelle
d6b41fd63f fix(mystery): typo 2014-10-24 20:37:50 -06:00
Tyler Renelle
3c249725af feat(mystery): mystery items 2014-10 2014-10-24 20:32:40 -06:00
Tyler Renelle
2f8a8d4874 Merge pull request #346 from taldin/develop
Fix possible bug when losing Jean Chalard's tunic
2014-10-24 17:09:24 -06:00
Taldin
bffce00a24 Fix possible bug when losing Jean Chalard's tunic
Can't buy back armor_special_2 without being a backer.   Other legendary
quest items have this extra code.
2014-10-24 13:24:09 -07:00