Blade Barringer
724bc6e861
Compiled css for sprites
2015-10-30 10:10:12 -05:00
Blade Barringer
e8fa22bf93
chore(i18n): update locales
2015-10-30 09:25:43 -05:00
Blade Barringer
aa111b3c1a
Update tests to assert against translation strings
2015-10-30 09:01:57 -05:00
Thrashmandicoot
64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
Thrashmandicoot
ebbc72e9c2
Refactor sellForGold, add displayPotion/item
2015-10-30 02:26:41 -07:00
Alys
1923a3a467
change on-hover text for Mystery Item gift box to just mention wiki page
2015-10-30 06:59:54 +10:00
Alys
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
Sabe Jones
27d1e9c788
feat(event): Habitoween
...
Swaps out basic fall costume NPCs for their Halloween versions. Removes "broken" NPC sprites not needed after World Boss.
2015-10-29 14:15:18 -04:00
Blade Barringer
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05:00
Blade Barringer
6ff904bd5a
Merge branch 'develop' into czan-develop
2015-10-29 08:40:03 -05:00
Sabe Jones
f4ea6c1d5d
feat(sharing): Opt Out WIP
...
First draft of support for opting out of future modal display on specific events, and adds the second barebones target page for sharing.
2015-10-28 16:36:47 -04:00
Amin Arria
bd230df0d3
Added rebirthLevel var to remove need of extra translation string
2015-10-28 14:33:45 -04:30
Sabe Jones
27e3797307
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/locales/en/challenge.json
2015-10-28 14:54:55 -04: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
281411f423
Merge branch 'develop' into sabrecat/more-modals
2015-10-22 14:05:26 -04: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
1ad6ffd35d
Merge branch 'develop' into sabrecat/more-modals
2015-10-20 12:50:34 -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
Amin Arria
23114ac929
Fix trailing comma
2015-10-19 17:19:30 -04:30
Amin Arria
3bd809f7c2
Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages
2015-10-19 12:14:38 -04:30
Amin Arria
038039dbee
Fixes #5550 , change message according to rebirthLevel
2015-10-19 12:10:27 -04:30
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
Ricardo Mendes
5e3f46d786
Checks user auto-equip preference in buy function
2015-10-19 05:52:46 +00:00
Ricardo Mendes
860abce1d7
Adds auto-equip string to locales/en
2015-10-19 05:20:10 +00:00
Blade Barringer
dbc9c5a48c
Merge pull request #6008 from locks/patch-1
...
Typo in comment string
2015-10-18 15:29:29 -05:00
Sabe Jones
22ec450521
feat(modals): Won Challenge
...
Draft of the modal that appears when a user wins a challenge. Needs better logic for when to display.
2015-10-16 23:36:57 -04:00
ksami
65dc274e49
Make text in options/settings translatable
2015-10-16 20:48:12 +08:00
Sabe Jones
338aced208
feat(modals): Grew Mount
...
A modal now appears when you raise a pet into a mount, which allows the user to immediately equip the new mount.
2015-10-15 17:33:20 -04:00
Sabe Jones
c6dd2a0d10
feat(modals): Hatch Pet modal
...
Complete except for the planned addition of a heart sprite over the pet.
2015-10-15 16:34:53 -04: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
