8a42a3a51e
Merge branch 'develop' into api-v3
2016-04-08 21:31:41 -05:00
1f6eef0082
Sabrecat/armoire 201604
...
* WIP(content): add sprites
* feat(content): Armoire and Backgrounds 2016-04
2016-04-05 15:30:01 -05:00
3089658cc7
Merge branch 'develop' into api-v3
2016-03-30 23:40:00 +02:00
a9d227b490
Merge branch 'develop' into wheelchair
2016-03-28 21:12:52 -05:00
d89d1e50dd
Merge branch 'develop' into api-v3
2016-03-25 15:58:04 +01:00
cd6adf2421
fix: correct wheelchair spelling
2016-03-24 21:31:20 -05:00
c88f2ce580
refactor: Use resized version of wheelchair for selection
2016-03-24 07:57:57 -05:00
0f9cf57613
feat: Add wheelchair to avatar customization
2016-03-24 07:57:13 -05:00
f7027b5cf3
feat(event): subscriber items 2016-03
2016-03-23 15:36:24 -04:00
0bde9e2df2
Merge branch 'develop' into api-v3
2016-03-21 23:03:28 +01:00
8447259016
Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
...
Spring Fling 2016
2016-03-18 16:08:46 -05:00
b5f91a657f
feat(event): Spring Fling complete
2016-03-18 16:56:16 -04:00
10a8476aaf
WIP(event): Spring Fling cont'd
2016-03-17 13:10:05 -04:00
4effa79e17
WIP(event): Spring Fling partial
2016-03-17 13:04:12 -04:00
ced0b44b2f
fix: Remove name from sortable inventory
2016-03-17 08:47:56 -05:00
d4d668a7aa
fix: Correct typo in equipment click
2016-03-17 08:09:37 -05:00
c7310b97ec
Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues."
...
This reverts commit 9d50201180
2016-03-17 08:09:18 -05:00
9d50201180
Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues.
...
This reverts commits 1c811dbc82146810a3e99508ed45dfa6fb945120
2016-03-17 21:47:29 +10:00
a639038a41
Move stat allocation to a mixin to avoid code duplication
2016-03-16 22:07:00 -05:00
1c811dbc82
refactor: Extract orderBy equipment button into mixin
2016-03-15 19:41:24 -05:00
9508ed45df
refactor: Move order by equipmentment button to top of view
2016-03-15 19:41:11 -05:00
a6fb945120
inventory sorting
...
Add inventory sorting buttons based on name, attribute, and set (armoire):
- Each gear[klass] has its own sorting buttons and sorting state including costume classes
- The attributes sort descending when selected, then by sum of all attributes
- There is no default sort
- The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
- Name sorts by .text() ascending
2016-03-15 19:41:11 -05:00
3fa9d17ad4
Merge branch 'develop' into api-v3
2016-03-08 19:25:50 -06:00
d502db71e5
Changed tavern tier 1 text icon
...
The icon for the text/description of the 1st tier contributor was
incorrect. It should be the boot icon, but the firefox icon was being
displayed.
2016-03-08 03:05:46 -03:00
9cac8dd95e
Merge pull request #6741 from delftswa2016/fix-hidden-button-issue-6740
...
Fixed partially hidden button in chat box
2016-03-06 18:18:02 +10:00
9114d74357
Merge branch 'develop' into api-v3
2016-03-01 09:44:57 +01:00
251dd3cb8e
Changed submenu from Hall of Heroes to Hall of Contributors
2016-02-29 20:23:05 -06:00
0c700cc36d
Merge branch 'develop' into api-v3
2016-02-29 16:39:31 +01:00
6cd861dcdc
Merge pull request #6742 from murraybd/develop
...
Display attribute info in Character Build
2016-02-28 19:39:20 +10:00
9ef4b6409e
Merge branch 'develop' into api-v3 and move new relic to new location
2016-02-22 11:43:35 +01:00
45a938c12d
put the atrribute allocation td building in a loop to clean up the code per Alys
2016-02-19 21:46:23 -08:00
04d0bcadb7
in profile.jade in the character build section display detailed info about the attribute
2016-02-19 19:22:05 -08:00
00473dded7
fixed partially hidden button
...
added clearfix class to prevent floating for the next elements.
2016-02-19 22:17:39 +01:00
cc31d266e4
port locals middleware, add some tests and a lot of fixes
2016-02-19 18:42:03 +01:00
f7c9769aab
chore(event): revert Valentine's
2016-02-15 14:48:39 -05:00
e1b13db6e8
feat(quests): pets 201602
...
Also enables the Valentine's Day card for selection in the Market.
2016-02-08 16:20:05 -05:00
a3251ac9a0
fix(groups): DRY profile name logic
2016-02-05 15:26:15 -05:00
dd3918436f
fix(groups): don't show HP in Guilds
2016-02-05 15:19:23 -05:00
e0effcdf5f
Merge pull request #6626 from taldin/party_health
...
Add HP to party page
2016-02-04 15:56:39 -06:00
51e579cb6a
Update for cleaner code.
...
Per Alys and crookedneighbor's suggestion.
2016-02-02 10:01:08 -08:00
0fcdc49adb
chore(event): end Winter Wonderland
2016-02-01 17:01:17 -05:00
12749ba497
fixed it so infinite decimals wouldn't print
...
Added .toFixed(1) call.
2016-02-01 10:14:42 -08:00
e08f77651b
Add HP to party page
...
Party page now displays each party member's health next to their name
(healers don't have to click on each party member to see their health)
2016-01-30 16:32:10 -08:00
7d0ad86c43
Color code quest accepted/rejected text
2016-01-22 21:56:39 +00:00
2989057dd3
Fix for issue #5182 : Allow cancel editing group infobox
2016-01-18 22:39:06 -06:00
c6b4b24052
Merge pull request #6523 from HabitRPG/sabrecat/subscription-tweaks
...
Text and visual tweaks for Gems
2016-01-18 15:25:58 -06:00
23720e0a43
style(subscription): more tweaks
2016-01-15 14:10:02 -05:00
5315cc9055
Update character.json to separate optOut into two translation strings
...
optOut is currently used to skip the class selection and to opt out of the messaging system.
that creates translation problems.
Fixes #6511
Closes #6518
2016-01-14 20:40:07 -06:00
e761315c74
Remove tooltip for 'reverse chat messages' checkbox
...
Fixes #6517
Closes #6525
2016-01-14 20:28:08 -06:00
2db1ef0f7a
style(subscriptions): Gem layout feedback
2016-01-12 15:00:07 -05:00
Blade Barringer