Commit graph

1709 commits

Author SHA1 Message Date
Tyler Renelle
3dd775235d fix(): remove some logs 2014-12-03 19:05:54 -07:00
Tyler Renelle
a62a09d7d2 Merge pull request #376 from HabitRPG/block-subs
Block Subscriptions
2014-12-03 16:02:14 -07: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
a6944ec072 Merge pull request #375 from SabreCat/develop
December backgrounds
2014-11-30 23:20:22 -06:00
Sabe Jones
d7b904efec chore(December): grunt 2014-11-30 23:08:53 -06: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
Matteo Pagliazzi
f7c6e9063b chore(i18n): update locales 2014-11-30 21:59:49 +01:00
Matteo Pagliazzi
aa6afcdce8 chore(i18n): update locales 2014-11-30 20:21:59 +01:00
Tyler Renelle
192110e25a grunt 2014-11-29 09:04:58 -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
Alice Harris
e4478355bc Merge pull request #372 from ShilohT/gear
Standardization of locales/en/gear.json
2014-11-29 21:00:12 +10:00
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
ShilohT
a86b92f5a0 Standardized text in gear.json
Added "Confers no benefit." if missing.
Added "(Month) 2014 Subscriber Item." if missing.
Rearranged some Mystery Item notes from "(Description). (Month) 2014
Subscriber Item. Confers no benefit." to "(Description). Confers no
benefit. (Month) 2014 Subscriber Item."
- All Special Event accessory notes are written in this order.
Changed "October 2014 Subscriber Outfit" to "October 2014 Subscriber
Item".
- All other preexisting Mystery Item strings read "Item".
Changed "Adds # points to (Stat)" in some Special Event equipment to
"Increases (Stat) by #"
- All other equipment reads "Increases (Stat) by #."
Changed "Confers no stat bonus." to "Confers no benefit." in some
Special Event accessories.
- All other items read "Confers no benefit."
Moved "Limited Edition 2013 Winter Gear." to end of string.
- All other Limited Edition tags are at the end.
Changed and capitalized "Special edition convention armor." to "Special
Edition Convention Item."
- Armor is a type of equipment.
2014-11-26 23:26:30 -05: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
Blade Barringer
58df93fad4 Corrected ordering of moment().add and moment().subtract to remove
deprecation warnings in tests
2014-11-19 20:37:10 -06: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