452b459d69
chore(Bailey): Announce December
2014-11-30 23:03:08 -06:00
4d8a9c5287
feat(backgrounds): December purchasables
2014-11-30 22:54:37 -06:00
0c675f704b
Simplified styles for locked and unlocked backgrounds
2014-11-30 18:57:01 -06:00
632d0fdf5d
Merge pull request #4299 from pollockjj/develop
...
Solution for: Differentiate Locked and Unlocked Backgrounds (#4261 )
2014-11-30 18:41:51 -06:00
703451d452
fix(mystery): typo
2014-11-30 14:11:49 -07:00
f7c6e9063b
chore(i18n): update locales
2014-11-30 21:59:49 +01:00
96f8f2cdd5
refactor(inventory): move all special items into single category
...
"special" (cleaner)
2014-11-30 13:12:28 -07:00
aa6afcdce8
chore(i18n): update locales
2014-11-30 20:21:59 +01:00
2ee6f0ed61
feat(Bailey): November subscription reminder
2014-11-30 11:50:31 -06:00
9e42c7fb05
Merge pull request #4303 from crookedneighbor/develop
...
Adjusted ng-hide so users cannot block themeselves
2014-11-30 10:54:32 -06:00
44baa822c8
Adjusted ng-hide so users cannot block themeselves
2014-11-30 10:50:39 -06:00
6520caed7d
Modified to 15px border and lock icon based on feedback from dev team
2014-11-29 21:56:10 -06:00
0f3070e334
Allow send messages to yourself - see #4295
2014-11-30 01:52:46 +01:00
9abaedc7c5
Modified two-line solution for ticket #4261 to one-line based on feedback/solution from B. Barringer
2014-11-29 13:17:54 -06:00
70c7894354
Merge pull request #4295 from crookedneighbor/do-not-send-private-messages-to-system
...
Removed option to send private message if it would go to system. Closes #4295
2014-11-29 19:56:02 +01:00
e4b2351b42
Removed extraneous space
2014-11-29 12:53:19 -06:00
223cac838e
Added one time binding to ng-if
2014-11-29 12:52:34 -06:00
3a29eef799
Removed pm symbol if sent by own user
2014-11-29 12:30:15 -06:00
e0f09cd468
Removed option to send private message if it would go to system. Closes
2014-11-29 12:26:28 -06:00
1a567ce82f
Changes to address github ticket: Differentiate Locked and Unlocked Backgrounds ( #4261 ). Added two new background-specific styles to customizer.styl and utilized them in profile.jade by checking for ownership of the asset and displaying a border or not, as appropriate
2014-11-29 12:25:21 -06:00
3204418af1
Revert #4291
...
This reverts commit a1ea6869b7
2014-11-29 09:16:44 -07:00
5823a25d06
cleanup 20140829_change_headAccessory_to_eyewear.js
2014-11-29 09:05:27 -07:00
192110e25a
grunt
2014-11-29 09:04:58 -07:00
e63f2b6d97
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
database_reports/count_users_who_own_specified_gear.js
2014-11-29 08:33:28 -07:00
5ee9f4904a
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
locales/en/gear.json
2014-11-29 08:26:23 -07:00
391bd76c03
Merge pull request #4294 from crookedneighbor/indentation-error
...
Corrected indentation error
2014-11-29 08:18:36 -07:00
e4478355bc
Merge pull request #372 from ShilohT/gear
...
Standardization of locales/en/gear.json
2014-11-29 21:00:12 +10:00
9a1b209da1
Corrected indentation error
2014-11-28 19:41:11 -06:00
eb27a76709
feat(thanksgiving): revert npcs back to normal
2014-11-28 18:34:36 -07:00
607c72049c
Merge pull request #4291 from sbreiler/develop
...
Fix #4259
2014-11-28 20:51:04 +01:00
5011ae63c1
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-11-27 23:47:38 +00:00
0d7b05dbc6
resolve merge conflict
2014-11-27 23:47:28 +00:00
28b25c6b89
Fix #4259 (always 100% long bars in IE11)
...
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
2014-11-27 22:55:01 +01:00
64a76566a0
Fix #4259 (always 100% long bars in IE11)
...
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
2014-11-27 22:52:03 +01:00
a1ea6869b7
Fix #4259 (always 100% long bars in IE11)
...
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
Fixes health, level and mana bar.
2014-11-27 22:47:52 +01:00
1c70a5bad5
upgrade angular-ui-router
2014-11-27 12:30:13 -07:00
17f3868b96
Merge pull request #374 from SabreCat/turkey
...
Give Alex and Bailey their Thanksgiving costumes
2014-11-27 12:13:05 -07:00
60bf777668
grunt
2014-11-27 12:11:14 -07:00
a4a94f7973
fix(event): grunt
2014-11-27 09:13:20 -06:00
d37dd90484
fix(event): Festify missed NPCs
2014-11-27 09:05:21 -06:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
68305eb6d8
Nerfed Burst of Flames and Backstab; Buffed Tools
...
New reward calculations for Backstab, as proposed by @ShabbyX
Changed Burst of Flames damage to 10% of INT, as proposed by @deilann
Strengthened Tools of the Trade, as proposed by @Alys
2014-11-27 02:22:43 -05:00
0a4dc94474
Merge pull request #370 from Alys/gem-cap-message-2014-11-25
...
make Gold=>Gem conversion cap message more accurate in terms of when to wait until - fixes https://github.com/HabitRPG/habitrpg/issues/3996
2014-11-27 14:46:23 +10:00
a86b92f5a0
Standardized text in gear.json
...
Added "Confers no benefit." if missing.
Added "(Month) 2014 Subscriber Item." if missing.
Rearranged some Mystery Item notes from "(Description). (Month) 2014
Subscriber Item. Confers no benefit." to "(Description). Confers no
benefit. (Month) 2014 Subscriber Item."
- All Special Event accessory notes are written in this order.
Changed "October 2014 Subscriber Outfit" to "October 2014 Subscriber
Item".
- All other preexisting Mystery Item strings read "Item".
Changed "Adds # points to (Stat)" in some Special Event equipment to
"Increases (Stat) by #"
- All other equipment reads "Increases (Stat) by #."
Changed "Confers no stat bonus." to "Confers no benefit." in some
Special Event accessories.
- All other items read "Confers no benefit."
Moved "Limited Edition 2013 Winter Gear." to end of string.
- All other Limited Edition tags are at the end.
Changed and capitalized "Special edition convention armor." to "Special
Edition Convention Item."
- Armor is a type of equipment.
2014-11-26 23:26:30 -05:00
a8cf102610
feat(thanksgiving): add migration for turkey mounts / pets
2014-11-26 19:12:59 -07:00
eb80bdf3e0
grunt(turkey-mount)
2014-11-26 19:10:22 -07:00
be3342cb26
feat(event): Thanksgiving Bailey
2014-11-26 19:34:16 -06:00
645327b9b0
feat(event): Thanksgiving updates
2014-11-26 19:33:01 -06:00
212868010c
bugfix: all-market-poptop breaks on the left side
...
Right side popovers have been switched to 'top', but left side popovers
need to remain 'right'.
2014-11-26 14:17:42 -08:00
4a6cd9c2f3
Fixes market to have popover-placement="top'
...
Market fixed to have popover-placement="top' instead of 'left', which
was causing some problems, and 'right' for consistency.
2014-11-26 14:03:31 -08:00
Sabe Jones