64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
ebbc72e9c2
Refactor sellForGold, add displayPotion/item
2015-10-30 02:26:41 -07:00
1923a3a467
change on-hover text for Mystery Item gift box to just mention wiki page
2015-10-30 06:59:54 +10:00
11ae4a9b87
change on-hover text for Mystery Item gift box to link to wiki page and remove statement about finding exact date on wiki
2015-10-30 06:30:11 +10:00
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05:00
6ff904bd5a
Merge branch 'develop' into czan-develop
2015-10-29 08:40:03 -05:00
01373882c6
make error notification persistent, change text and make it translatable
2015-10-28 19:42:26 +01:00
5754b4f72a
chore(i18n): update locales
2015-10-27 21:38:23 -05:00
1a6b1f2a1c
Update string
2015-10-27 21:36:52 -05:00
b82054128d
chore(i18n): update locales
2015-10-27 21:36:51 -05:00
711413f832
Update string
2015-10-27 21:28:33 -05:00
cdc58c78fd
Merge branch 'nicolevonvon-develop' into develop
2015-10-27 20:19:09 -05:00
c812c0ae90
Add popover to no owner label
2015-10-27 20:18:39 -05:00
47ec2e1f93
Challenges now display'no owner' if original owner deletes account
2015-10-27 22:15:19 +02:00
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
c04b27ffd5
Simplify community guidelines string
2015-10-26 18:08:45 -05:00
f0e4149adb
Merge branch 'develop' into ksami-develop
2015-10-26 17:56:05 -05:00
2df6df2bee
Merge pull request #6091 from HabitRPG/sabrecat/mystery-201510
...
October 2015 Subscriber Items
2015-10-26 15:04:43 -05:00
fb30a7b03b
Compile sprites.
2015-10-24 20:14:30 -05:00
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
392889c7da
feat(mystery): October 2015 subscriber set
2015-10-23 15:45:43 -04:00
f2c856f6e6
Make link translatable in options/inventory/time-travelers
2015-10-23 23:40:11 +08:00
b3cc58886c
Make strings translatable in options/social/chat-box
2015-10-23 23:20:59 +08:00
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
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
0a6d9fa23a
WIP(pets): Frog quest
2015-10-19 23:12:24 -04:00
2883dc6c85
Merge branch 'ksami-develop' into develop
2015-10-19 08:14:48 -05:00
9ad1dbd8ce
Adjust mystic hourglass string to take in interpolation
2015-10-19 08:10:37 -05:00
1a2510e4da
Adjsut string to take in interpolation
2015-10-19 08:03:27 -05:00
5e3f46d786
Checks user auto-equip preference in buy function
2015-10-19 05:52:46 +00:00
860abce1d7
Adds auto-equip string to locales/en
2015-10-19 05:20:10 +00:00
dbc9c5a48c
Merge pull request #6008 from locks/patch-1
...
Typo in comment string
2015-10-18 15:29:29 -05:00
65dc274e49
Make text in options/settings translatable
2015-10-16 20:48:12 +08:00
380265731f
feat(world-boss): Exhaust Ian's text
2015-10-14 21:02:59 -04:00
e88030e15f
Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
...
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
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
30de99b700
adjust world bosses FAQ answer
2015-10-13 06:49:07 +10:00
dcf17b5505
feat(event): Jack-O'-Lantern mounts
2015-10-12 14:49:12 -04:00
02133600ce
Add ios question to content
2015-10-12 07:40:31 -05:00
ece3e0d0aa
add FAQ item for World Bosses
2015-10-12 21:26:59 +10:00
20415da586
Merge pull request #6018 from dcecile/develop
...
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
4044b0cb64
fix(world-boss): Update mechanics explanation
2015-10-08 18:48:13 -04:00
60cc428b81
chore(i18n): update locales
2015-10-08 17:42:10 -05:00
d873848f81
Commit missing file
2015-10-08 17:37:10 -05:00
0ccf07a4e0
Compile sprites
2015-10-08 17:32:34 -05:00
ccd77090f4
Fix css template for sprites
2015-10-08 17:31:32 -05:00
58801f5025
fix(world-boss): Don't repeat explanation
2015-10-08 13:17:49 -04:00
291a135fe1
Merge pull request #6023 from HabitRPG/sabrecat/world-boss
...
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
1d4536fc47
fix(sprites): Remove errant blob
2015-10-08 10:59:44 -05:00
a1328bc837
Add bolding to item name
2015-10-07 20:10:27 -07:00
Thrashmandicoot