Commit Graph

1072 Commits

Author SHA1 Message Date
Blade Barringer
6ff904bd5a Merge branch 'develop' into czan-develop 2015-10-29 08:40:03 -05:00
Matteo Pagliazzi
01373882c6 make error notification persistent, change text and make it translatable 2015-10-28 19:42:26 +01:00
Blade Barringer
5754b4f72a chore(i18n): update locales 2015-10-27 21:38:23 -05:00
Blade Barringer
1a6b1f2a1c Update string 2015-10-27 21:36:52 -05:00
Blade Barringer
b82054128d chore(i18n): update locales 2015-10-27 21:36:51 -05:00
Blade Barringer
711413f832 Update string 2015-10-27 21:28:33 -05:00
Blade Barringer
cdc58c78fd Merge branch 'nicolevonvon-develop' into develop 2015-10-27 20:19:09 -05:00
Blade Barringer
c812c0ae90 Add popover to no owner label 2015-10-27 20:18:39 -05:00
nicolevonvon
47ec2e1f93 Challenges now display'no owner' if original owner deletes account 2015-10-27 22:15:19 +02:00
Carlo Zancanaro
4d6bd38648 Add GET routes for /user/tags and /user/tags/{id}
An operation that is useful for tools to be able to do is to list a
user's tags without having to pull down the entire user object (which is
likely significantly larger than the tags). This commit adds a route to
GET /user/tags, to get a list of the user's tags, as well as a GET
/user/tags/{id} to get the details of a particular tag.

This commit also includes tests for the two new routes.
2015-10-27 13:49:17 +11:00
Blade Barringer
c04b27ffd5 Simplify community guidelines string 2015-10-26 18:08:45 -05:00
Blade Barringer
f0e4149adb Merge branch 'develop' into ksami-develop 2015-10-26 17:56:05 -05:00
Sabe Jones
2df6df2bee Merge pull request #6091 from HabitRPG/sabrecat/mystery-201510
October 2015 Subscriber Items
2015-10-26 15:04:43 -05:00
Blade Barringer
fb30a7b03b Compile sprites. 2015-10-24 20:14:30 -05:00
Sabe Jones
2582d0b7c7 fix(sprites): Flip goblin tail
The Goblin Tail slightly breaks from convention for items (it's 12px wider than most), but that allows it to remain visible and well composed when the avatar is riding a mount.
2015-10-23 16:33:58 -04:00
Sabe Jones
392889c7da feat(mystery): October 2015 subscriber set 2015-10-23 15:45:43 -04:00
ksami
f2c856f6e6 Make link translatable in options/inventory/time-travelers 2015-10-23 23:40:11 +08:00
ksami
b3cc58886c Make strings translatable in options/social/chat-box 2015-10-23 23:20:59 +08:00
Sabe Jones
5fbd6814b0 fix(pets): Realign frog sprites
Also adds a note about the To-Do sorting fix to the Bailey announcement
2015-10-20 18:55:57 -04:00
Sabe Jones
d0a34fc0ad feat(quests): 2015-10 Pet
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
2015-10-20 12:32:45 -04:00
Sabe Jones
0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Blade Barringer
2883dc6c85 Merge branch 'ksami-develop' into develop 2015-10-19 08:14:48 -05:00
Blade Barringer
9ad1dbd8ce Adjust mystic hourglass string to take in interpolation 2015-10-19 08:10:37 -05:00
Blade Barringer
1a2510e4da Adjsut string to take in interpolation 2015-10-19 08:03:27 -05:00
Blade Barringer
dbc9c5a48c Merge pull request #6008 from locks/patch-1
Typo in comment string
2015-10-18 15:29:29 -05:00
ksami
65dc274e49 Make text in options/settings translatable 2015-10-16 20:48:12 +08:00
Sabe Jones
380265731f feat(world-boss): Exhaust Ian's text 2015-10-14 21:02:59 -04:00
Sabe Jones
e88030e15f Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
Sabe Jones
825b316ba8 fix(analytics): Cap progressUp
Previously, users could cron with enormous quest progress values, and this would be logged to the cron event in Analytics. However, for the purposes of damaging world bosses, quest progress is capped at 900. Given that progressUp is primarily used to predict world boss damage, this commit now caps progressUp in analytics at 900 as well.
2015-10-13 14:27:16 -04:00
Alys
30de99b700 adjust world bosses FAQ answer 2015-10-13 06:49:07 +10:00
Sabe Jones
dcf17b5505 feat(event): Jack-O'-Lantern mounts 2015-10-12 14:49:12 -04:00
Blade Barringer
02133600ce Add ios question to content 2015-10-12 07:40:31 -05:00
Alys
ece3e0d0aa add FAQ item for World Bosses 2015-10-12 21:26:59 +10:00
Alys
20415da586 Merge pull request #6018 from dcecile/develop
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
Sabe Jones
4044b0cb64 fix(world-boss): Update mechanics explanation 2015-10-08 18:48:13 -04:00
Blade Barringer
60cc428b81 chore(i18n): update locales 2015-10-08 17:42:10 -05:00
Blade Barringer
d873848f81 Commit missing file 2015-10-08 17:37:10 -05:00
Blade Barringer
0ccf07a4e0 Compile sprites 2015-10-08 17:32:34 -05:00
Blade Barringer
ccd77090f4 Fix css template for sprites 2015-10-08 17:31:32 -05:00
Sabe Jones
58801f5025 fix(world-boss): Don't repeat explanation 2015-10-08 13:17:49 -04:00
Sabe Jones
291a135fe1 Merge pull request #6023 from HabitRPG/sabrecat/world-boss
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
Sabe Jones
1d4536fc47 fix(sprites): Remove errant blob 2015-10-08 10:59:44 -05:00
Sabe Jones
aba3908170 chore(gulp): Compile sprites 2015-10-07 15:15:21 -04:00
Dan Cecile
22284bbc24 Issue #2606 - Verify/fix indices during sortTask
Because the 'sortTask' operation uses a 'from' index and a 'to'
index as parameters, the server needs to check if these indices
are valid before performing the client's request. If the task ID
doesn't match the task at the 'from' index, then it's clear that
the client was looking at a preened list of todos (everything except
more-than-3-days-old-non-quest completed tasks). In that case, try
to recalculate the indices before continuing.
2015-10-06 21:24:34 -04:00
Sabe Jones
51355f7eea fix(quest-eggs): Short-circuit canBuy
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
2015-10-06 16:56:17 -04:00
Sabe Jones
d27fb9dba2 WIP(world-boss): Rage and rewards
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
Sabe Jones
3ca836a81c fix(world-boss): Pass test
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
2015-10-05 17:18:44 -04:00
Sabe Jones
f6abcc0ddf WIP(world-boss): Initial stats outlay
Also quest reward sprites, groundwork for world damage, and partial content build.
2015-10-05 16:59:19 -04:00
Sabe Jones
0d7a57d176 Merge branch 'develop' into sabrecat/world-boss
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
Sabe Jones
dd53383ec6 Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510
October 2015 backgrounds
2015-10-05 11:29:44 -05:00