95bb5be22a
Merge branch 'develop' into armoire
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith1.css
common/dist/sprites/spritesmith1.png
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
common/dist/sprites/spritesmith5.css
common/dist/sprites/spritesmith5.png
common/dist/sprites/spritesmith6.css
common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
20859b83ef
feat(Armoire): Improved counter
...
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
6074774e14
feat(backgrounds): June BGs
2015-06-04 11:30:25 -05:00
865f7651a9
Merge branch 'TheHollidayInn-invite-friends-in-header' into develop
2015-06-04 08:54:04 -05:00
7a1c5835d0
Final adjustments to PR #5114
...
* Added test for header ctrl
* Made openModal function more readable
* Only show setting to disable invite friends if party is exactly 1 member big
* Use party.memberCount instead of party.members.length because it's more expressive
2015-06-04 08:48:05 -05:00
09d32390f9
feat(Armoire): Item counter
...
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
2015-06-03 16:48:11 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
d1df5d740d
Changed button to invite friends text
2015-06-01 21:10:49 -05:00
e3f5c22fe8
Added start party option, locales, and plus button
2015-06-01 21:07:53 -05:00
5513061d80
Added invite to friends in header, added setting to hide the invite friends, and localized the invite friends string
2015-06-01 21:07:09 -05:00
80da3a2dcd
chore(news): Bailey on mounts
2015-06-01 19:17:30 -05:00
d76ca1c04d
feat(mystery): Programmatic presents
...
Shows the appropriately colored subscription giftwrap for the user's current month. Also includes the Bailey notification for this month's upcoming subscriber item.
2015-06-01 12:06:35 -05:00
829ed8a161
chore(news): May 31 Bailey
2015-05-31 16:04:42 -05:00
7a8046317d
feat(tour): Iteration 5/29
2015-05-29 15:14:19 -05:00
6af7342693
feat(tour): Revised intro tutorial
2015-05-29 14:03:42 -05:00
fce9d39f19
Added in one-time-bindings
2015-05-26 09:02:25 -05:00
a788d51aa5
Made gift dialog translatable
...
Addressing a bit beyond _#10 in the opening post of
https://github.com/HabitRPG/habitrpg/issues/4522
Screenshot of before-after-proof: http://oi57.tinypic.com/11c9ldi.jpg
2015-05-26 17:18:18 +05:00
3098cacf03
feat(subscriber): May Mystery Items
2015-05-25 21:03:13 -05:00
5d93f364c1
Merge branch 'blade-hairlessbear_markdown_help_table' into develop
2015-05-24 22:47:02 -05:00
9b2798ee71
Refine markdown help
2015-05-24 22:45:09 -05:00
fac855898f
Swap faq and overview in the top menu
...
Addressing request by lemoness
https://github.com/HabitRPG/habitrpg/issues/5261
2015-05-25 02:25:51 +05:00
681668f131
Tweak @hairlessbear's pr
...
* Simplify chat button stylings
* Add formatting help to send gift modal
* Clean up formatting of table
* Add example for unordered lists
* Remove ! from `env.t` that do not have html characters
* Use https instead of http in link
* Format markdown blurb
* Use ng-if instead of ng-show
* Collapse show help link into single element
2015-05-24 09:20:12 -05:00
4bc3ea0cdb
Removed commented out code
2015-05-23 22:59:17 -04:00
337a727390
Added hidable markdown help menu and adding to private messages
2015-05-23 22:51:40 -04:00
fe2e0618b8
Make Invite-friends-to-group dialog translatable
...
UI strings of the dialog of invitation to the group made translatable
2015-05-23 02:44:32 +05:00
2440b312a2
Made two lines translatable
...
Addressing #10 and #11 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522
* "Send gift" (in the form that pops up when you click on username
label)
* "Invite Friends" button (in "Members" section in guilds and party)
2015-05-21 17:12:16 +05:00
13faf8d0c7
feat(pets): Sheep Quest
2015-05-20 20:45:18 -07:00
3c35b52d27
Hide contributor level if contribText func is not available; put math on scope
2015-05-15 23:08:26 -05:00
2ba1a1fc85
Merge branch 'hairlessbear-challenge-achievement-display-fix-redux' into develop
2015-05-15 07:41:46 -05:00
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
35ff90b4d3
Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins
2015-05-13 12:12:57 -05:00
3abec07119
chore(news): Bailey
2015-05-13 11:44:52 -05:00
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
f7f126c352
Add alert box to dailies resting in the inn message
2015-05-13 07:29:17 -05:00
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
71c65c7a73
change coupon route in angular router to promo
2015-05-08 21:24:57 -05:00
1bfc82c636
Merge branch 'develop' into NotGonnaGitUs-develop
2015-05-08 21:02:09 -05:00
09a713dbde
Changed menu title to "promo codes" instead of "coupons".
2015-05-08 19:36:14 +05:30
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
e628dba5e8
Merge pull request #5087 from negue/copyMessageTodo
...
copy chat messages as todo
2015-05-07 22:21:42 +02:00
4f7c9cd445
feat(guide): temporarily remove current tutorial, add simple ? to expand help
2015-05-07 14:31:53 -04:00
2a375a120c
feat(backgrounds): prettify news
2015-05-06 19:48:47 -05:00
00db42b6c0
feat(backgrounds): May BGs
2015-05-06 19:41:54 -05:00
b2bad4d77f
Update todo preview in dialog
2015-05-03 17:12:08 +02:00
62f7eae5d5
Fixes #5132
2015-05-03 09:01:12 -05:00
1f85b5bf67
add hack to have both mouseover and persisten click behavior
2015-05-01 22:12:00 -05:00
e334ce7684
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-05-01 12:36:07 -05:00
954f9baeec
chore(bailey) - skills rebalancing
2015-05-01 12:29:59 -05:00
b6955db39c
chore(news): Spring Fling warning
2015-04-30 17:23:26 -05:00
e4b21ac325
Merge branch 'develop' of github.com:HabitRPG/habitrpg into negue-copyMessageTodo
2015-04-29 17:19:24 -05:00
Sabe Jones
