Commit Graph

352 Commits

Author SHA1 Message Date
Sabe Jones 804cced3ff chore(various): News and sprites
Also tweaks the drop probability of equipment from 70% to 60%.
2015-06-05 10:22:22 -05:00
Sabe Jones 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
Sabe Jones 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
Sabe Jones 6074774e14 feat(backgrounds): June BGs 2015-06-04 11:30:25 -05:00
Blade Barringer 865f7651a9 Merge branch 'TheHollidayInn-invite-friends-in-header' into develop 2015-06-04 08:54:04 -05:00
Blade Barringer 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
Sabe Jones 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
Sabe Jones 97ae243c40 fix(Armoire): Fixes
Armoire items are now breakable on character death, and can be purchased back directly from Rewards after death or Rebirth. Corrected string token on Costume area. Images show up correctly on Armoire drop notifications.
2015-06-03 12:50:57 -05:00
Sabe Jones af3ee8cfcd feat(Armoire): Updates from feedback
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
2015-06-03 11:58:30 -05:00
Sabe Jones c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
TheHollidayInn d1df5d740d Changed button to invite friends text 2015-06-01 21:10:49 -05:00
TheHollidayInn e3f5c22fe8 Added start party option, locales, and plus button 2015-06-01 21:07:53 -05:00
TheHollidayInn 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
Sabe Jones 80da3a2dcd chore(news): Bailey on mounts 2015-06-01 19:17:30 -05:00
Sabe Jones 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
Sabe Jones 829ed8a161 chore(news): May 31 Bailey 2015-05-31 16:04:42 -05:00
Sabe Jones 766f3b6057 Merge pull request #5307 from HabitRPG/tutorial
Tutorial overhaul
2015-05-31 13:58:12 -07:00
Sabe Jones 726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05:00
Sabe Jones 7a8046317d feat(tour): Iteration 5/29 2015-05-29 15:14:19 -05:00
Sabe Jones 6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00
Blade Barringer 39cb9bfb99 downcase beffymaroo 2015-05-26 22:42:17 -05:00
Blade Barringer 9793df87d1 Merge branch 'reyrodrigez-develop' into develop 2015-05-26 22:26:48 -05:00
Blade Barringer 0e2f0596f6 Remove explicit divs 2015-05-26 22:26:24 -05:00
Blade Barringer 85993d25cf Merge branch 'hairlessbear-move_flower_to_accessories' into develop 2015-05-26 22:20:21 -05:00
Laszlo Heves eb3f7829cf Update date 2015-05-27 02:22:35 +02:00
Laszlo Heves e0eab880a4 Define semantic classes with shorthand syntax 2015-05-27 02:21:48 +02:00
Laszlo Heves 72c1e9e137 Using shorthand id definitions 2015-05-27 02:07:13 +02:00
Laszlo Heves 020f7f1f5d Adding semantic ids to community guidelines 2015-05-27 01:39:40 +02:00
Laszlo Heves 17842d2103 Adding Beffymaroo to moderators 2015-05-27 01:25:40 +02:00
Blade Barringer fce9d39f19 Added in one-time-bindings 2015-05-26 09:02:25 -05:00
GihHubSphinx 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
hairlessbear 958068c2b0 Rebased to resolve merge conflicts 2015-05-26 00:19:35 -04:00
Sabe Jones 3098cacf03 feat(subscriber): May Mystery Items 2015-05-25 21:03:13 -05:00
Blade Barringer 5d93f364c1 Merge branch 'blade-hairlessbear_markdown_help_table' into develop 2015-05-24 22:47:02 -05:00
Blade Barringer 9b2798ee71 Refine markdown help 2015-05-24 22:45:09 -05:00
Blade Barringer 690321baca Merge pull request #5270 from GitHubSphinx/Sphinx-i18n-db2
Made text on static/contact translatable
2015-05-24 22:17:10 -05:00
Blade Barringer a298393e04 Merge pull request #5275 from GitHubSphinx/Sphinx-entry1
Swap faq and overview in the top menu
2015-05-24 22:15:24 -05:00
Blade Barringer abbfdaeda5 Adjust NotGonnaGitUs's PR
* move challenge test to separate file
* adjust wording of popover text
* prevent refunding gems for tavern challenges
* adjust ui of challenge creation page
* fix bug in cancel function
* adjust wording of delete confirmation message
2015-05-24 21:22:40 -05:00
GihHubSphinx 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
Blade Barringer 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
GihHubSphinx dc51c6e478 Made text on static/contact translatable
Addressing _#12 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

Before/after screenshot: http://i.snag.gy/b00FV.jpg

"Report a Bug" string is used from generic.json as already translated
before
2015-05-24 13:31:29 +05:00
hairlessbear 4bc3ea0cdb Removed commented out code 2015-05-23 22:59:17 -04:00
hairlessbear 337a727390 Added hidable markdown help menu and adding to private messages 2015-05-23 22:51:40 -04:00
Blade Barringer a07f8572b0 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-05-22 23:35:19 -05:00
Blade Barringer ed56f51611 Merge branch 'hairlessbear-avatar_indicate_equipped' into develop 2015-05-22 23:35:01 -05:00
Blade Barringer 9ec14c1ac6 Merge pull request #5251 from GitHubSphinx/Sphinx-i18n-db1
Made two lines translatable
2015-05-22 23:20:13 -05:00
Blade Barringer 1e757cc087 Adjust disabled button look 2015-05-22 23:12:09 -05:00
GihHubSphinx 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
Jaiden Mispy eab2dbfa86 Disable chat textarea and buttons while sending 2015-05-22 12:14:10 -07:00
GihHubSphinx 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