Blade Barringer
da20a493c6
Merge branch 'hairlessbear-level_100_attribute_message' into develop
2015-05-16 22:50:57 -05:00
Blade Barringer
9017ba7d7e
Hide attribute points counter if you're over 100 and have 0 left
2015-05-16 17:08:06 -05:00
hairlessbear
52d869b195
Fixed issue #5203
2015-05-16 16:52:58 -04:00
Blade Barringer
3c35b52d27
Hide contributor level if contribText func is not available; put math on scope
2015-05-15 23:08:26 -05:00
Blade Barringer
d6385a94e9
Front page now shows avatar with link
2015-05-15 22:31:47 -05:00
Blade Barringer
2ba1a1fc85
Merge branch 'hairlessbear-challenge-achievement-display-fix-redux' into develop
2015-05-15 07:41:46 -05:00
Sabe Jones
0cb1d8ec9a
test(purchases): Gem buying tests
...
Also corrects the byline for Inn improvements to credit primary coder @hairlessbear.
2015-05-13 14:21:13 -05:00
Sabe Jones
35ff90b4d3
Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins
2015-05-13 12:12:57 -05:00
Sabe Jones
3abec07119
chore(news): Bailey
2015-05-13 11:44:52 -05:00
Sabe Jones
29109051d7
feat(customize): Animal skins and ears
...
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
hairlessbear
8e5cdbd742
Fixed challenges achievement always displaying (again)
...
Unearned achievements are hidden when viewing others' profiles, but are visible when a user views their own profile. Currently, the challenges achievement is displayed when viewing other users' profiles, even when they have not won any. This PR makes the challenges achievement display to other users' only when one or more challenges have been won.
2015-05-13 12:12:03 -04:00
Blade Barringer
f7f126c352
Add alert box to dailies resting in the inn message
2015-05-13 07:29:17 -05:00
Alys
2ac763cc50
add message about Resting in the Inn to top of Dailies column when preferences.sleep is true
2015-05-13 16:56:52 +10:00
Blade Barringer
c123ca6a42
Correct casing of translatable string
2015-05-10 09:13:05 -05:00
GihHubSphinx
6c5d9f3a6c
Tried to make line translatable
...
Tried to make the "Only group leader can create challenges" line in the
guild creation dialog translatable
2015-05-10 08:59:43 -05:00
Alys
5123bdb4c4
Merge pull request #5080 from joyclark/develop
...
Fixing the grid view for mounts so that the animals are aligned correctly.
2015-05-10 19:01:56 +10:00
Blade Barringer
71c65c7a73
change coupon route in angular router to promo
2015-05-08 21:24:57 -05:00
Blade Barringer
1bfc82c636
Merge branch 'develop' into NotGonnaGitUs-develop
2015-05-08 21:02:09 -05:00
NotGonnaGitUs
09a713dbde
Changed menu title to "promo codes" instead of "coupons".
2015-05-08 19:36:14 +05:30
Blade Barringer
4ccfaa974f
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-08 08:45:24 -05:00
Blade Barringer
8569f7b749
Merge branch 'joyclark-autocomplete-click-behavior' into develop
2015-05-08 08:45:06 -05:00
NotGonnaGitUs
ef0b96e5e4
Changed promo code text.
2015-05-08 10:33:26 +05:30
git-afsantos
38056a4837
fix(stats) removed extraneous class bonus
...
Even leveled users below level 100 were showing an extra 0.5 stat class bonus. This was due to the level bonus being a float, instead of an integer. Used `Math.ceil` to fix the level bonus, thus removing the extraneous 0.5 class bonus.
2015-05-08 00:05:44 +01:00
negue
e628dba5e8
Merge pull request #5087 from negue/copyMessageTodo
...
copy chat messages as todo
2015-05-07 22:21:42 +02:00
Tyler Renelle
4f7c9cd445
feat(guide): temporarily remove current tutorial, add simple ? to expand help
2015-05-07 14:31:53 -04:00
Sabe Jones
2a375a120c
feat(backgrounds): prettify news
2015-05-06 19:48:47 -05:00
Sabe Jones
00db42b6c0
feat(backgrounds): May BGs
2015-05-06 19:41:54 -05:00
Matteo Pagliazzi
8066589268
disable registration while request in progress
2015-05-06 15:43:30 +02:00
Blade Barringer
84a4c36c7e
Merge branch 'NotGonnaGitUs-RestingatInnText' into develop
2015-05-05 19:45:42 -05:00
Blade Barringer
d482fdcea5
Refactor tavern view
2015-05-05 19:45:05 -05:00
Matteo Pagliazzi
d2198c7572
remove invite friends from settings page
2015-05-05 19:52:06 +02:00
Matteo Pagliazzi
ca90de7a55
Merge pull request #5144 from NotGonnaGitUs/FrontPageLinkFix
...
Fixed broken business link
2015-05-05 17:34:53 +02:00
Tyler Renelle
a090fed10b
feat(analytics): "motivate yourself" 3 variants @lemoness
2015-05-04 15:31:00 -04:00
NotGonnaGitUs
25b63cfacd
Made daniel's text in the inn based on current rest status of the user.
2015-05-04 23:37:54 +05:30
NotGonnaGitUs
076cc76e5d
Fixed broken link
2015-05-04 21:26:45 +05:30
NotGonnaGitUs
78e8499c5f
Fixed missing space.
2015-05-04 01:12:43 +05:30
NotGonnaGitUs
a45390321e
Patched translation fixes and added a few phrases to locales.
2015-05-03 23:41:42 +05:30
Joy Clark
4450a5d7c3
Fixes #5094 Now show list based on whether or not a search query is defined. The autocomplete function from the directive is encapsulated so that it can be called and then the query can be set to null.
2015-05-03 18:14:28 +02:00
Negue
b2bad4d77f
Update todo preview in dialog
2015-05-03 17:12:08 +02:00
Blade Barringer
b408f016fd
Merge pull request #5119 from NotGonnaGitUs/develop
...
Made front page translatable
2015-05-03 09:43:43 -05:00
Blade Barringer
62f7eae5d5
Fixes #5132
2015-05-03 09:01:12 -05:00
Blade Barringer
1f85b5bf67
add hack to have both mouseover and persisten click behavior
2015-05-01 22:12:00 -05:00
Sabe Jones
6685e93554
fix(Spring): WHO IS LESLIE
2015-05-01 19:19:23 -05:00
Sabe Jones
d50d4ad8bb
feat(Spring): Flung
2015-05-01 19:09:28 -05:00
Blade Barringer
e334ce7684
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-01 12:36:07 -05:00
Blade Barringer
954f9baeec
chore(bailey) - skills rebalancing
2015-05-01 12:29:59 -05:00
NotGonnaGitUs
124df58644
Made front page translatable.
2015-05-01 21:18:25 +05:30
NotGonnaGitUs
02e7b52fbf
Adding environment variables to the static front page for translation. - Halfway done.
2015-05-01 20:14:19 +05:30
Sabe Jones
b6955db39c
chore(news): Spring Fling warning
2015-04-30 17:23:26 -05:00
Blade Barringer
e4b21ac325
Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo
2015-04-29 17:19:24 -05:00
