bf48671c7a
Add validation to everyX
2015-06-06 17:55:21 -05:00
ae1d10ed30
Merge branch 'blade-Finish_weeklies_pr' into refactor-tasks-jade
2015-06-05 17:37:46 -05:00
164a26616e
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-05 17:35:16 -05:00
488919d5ce
fixes to ultimateGearSets migration script - NOT FULLY TESTED YET
2015-06-06 08:03:33 +10:00
a35fa6850c
changed ultimateGearSets migration script to require only one run for all classes - NOT TESTED YET
2015-06-06 07:34:47 +10:00
cfa6efce85
Merge pull request #5351 from HabitRPG/armoire
...
Enchanted Armoire
2015-06-05 11:58:59 -07:00
e8c131cde8
Add rudimentary test for migration script
2015-06-05 13:12:38 -05:00
f4a4dbdfd8
fix(tests): Armoire probabilities
...
Updates the random number generation for Armoire tests to match the new 60/40 distribution.
2015-06-05 10:34:25 -05:00
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
8f744b043a
Add gear owned to spec helper
2015-06-05 08:59:45 -05:00
dc9bb35244
Add ng-form
2015-06-05 07:40:48 -05:00
403075262d
Remove bindonce symbol from ng-repeat
2015-06-05 07:26:03 -05:00
099e0abeed
Restore restore streaks functionality
2015-06-05 07:20:59 -05:00
701fa2455f
Refactor task views
2015-06-04 21:37:01 -05:00
b132b3c4fa
Make advanced options a button
2015-06-04 17:48:59 -05:00
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
db38663f94
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-04 12:45:23 -05:00
c39ad2a2ae
Merge pull request #5344 from SabreCat/develop
...
June BGs
2015-06-04 09:55:29 -07:00
6074774e14
feat(backgrounds): June BGs
2015-06-04 11:30:25 -05:00
c8f4e6209a
Merge pull request #5343 from HabitRPG/sabrecat/mounts
...
Readjusted lion
2015-06-04 09:24:21 -07:00
4f6f0220ad
fix(mounts): Readjusted lion
2015-06-04 11:02:58 -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
076f7f0db9
Create translatable strings for dailies
2015-06-03 21:48:38 -05:00
705e0dce71
Calculate days since task start with start of day
2015-06-04 08:25:06 -05:00
2234c7219e
Moved invite friends button to under the subscribe button
2015-06-03 20:33:39 -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
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
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
7adde1d1dd
Merge branch 'develop' into blade-Finish_weeklies_pr
2015-06-03 07:41:09 -05:00
e52a73f367
Merge branch 'negue-fixQuestNotify' into develop
2015-06-03 07:38:38 -05:00
d6f5ba0fc7
Merge pull request #5336 from negue/fixQuestNotify
...
FIX: Quest Invitation Notification
2015-06-03 07:52:09 +02:00
64a61a26ca
Add test for push notifications
2015-06-02 22:55:26 -05:00
c90f7e2c34
feat(Armoire): WIP
2015-06-02 17:42:14 -05:00
399ff8c00b
Merge branch 'http-tests' into develop
2015-06-02 17:34:07 -05:00
7a157fabb2
Finish tests for castEnd
2015-06-02 17:32:44 -05:00
88e1ec690a
Start tests for rootScope castEnd
2015-06-02 13:04:59 -05:00
5612b4be6b
Only send "Quest Started" Notifications to users which accepted the quest
2015-06-02 20:02:14 +02:00
3ed6db753d
Merge pull request #5337 from NickTomlin/notification-service
...
Change signature of notification service
2015-06-02 12:37:25 -05:00
ee88ed4b44
Change signature of notification service
2015-06-02 12:33:21 -05:00
264a1e4b16
FIX: Quest Invitation Notification
...
ADD: Quest Started Notification
2015-06-02 17:40:19 +02:00
ca31b490e6
Add missing semicolons and s's
2015-06-02 08:43:10 -05:00
af94236a01
Add wiki link to reward help string.
...
Fixes #5333
2015-06-02 08:15:16 -05:00
24c299783a
Merge branch 'TheHollidayInn-markdown-for-spells' into develop
2015-06-02 07:58:29 -05:00
b375c068de
Refactor notification service and add tests
2015-06-02 07:51:54 -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
879c8c5428
Merge pull request #5329 from HabitRPG/sabrecat/mounts
...
Reposition mounts
2015-06-01 17:31:32 -07:00
Blade Barringer