8a42a3a51e
Merge branch 'develop' into api-v3
2016-04-08 21:31:41 -05:00
b7d801a603
fix(news): typo
2016-04-08 16:17:51 -05:00
7118e68cf0
chore(news): Beguilement Strike Bailey
2016-04-08 19:06:09 +00:00
74dace9b5a
chore: Re-enable New Relic
...
closes #7011
2016-04-05 20:08:31 -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
c5f17b4011
Merge branch 'develop' into api-v3
2016-04-01 11:50:41 +02:00
3281894d83
chore(news): World Boss Bailey
2016-03-31 19:54:13 -04:00
a07aed331c
fix(world-boss): add chat message, Bailey handling, animation
2016-03-31 19:38:43 -04:00
f51653b7a5
WIP(world-boss): partial build
2016-03-31 17:29:21 -04:00
3089658cc7
Merge branch 'develop' into api-v3
2016-03-30 23:40:00 +02:00
4fa8c6dfbd
chore(news): Bailey 2016-03-30
2016-03-30 15:39:12 -04: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
17b02f2867
fix(news): missing promo
2016-03-23 15:47:22 -04:00
ba1cc67654
chore(news): fill out remaining Bailey
2016-03-23 15:36:24 -04:00
f7027b5cf3
feat(event): subscriber items 2016-03
2016-03-23 15:36:24 -04:00
86516b5e20
Update presskit
2016-03-22 08:41:02 -05: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
b4b0d7e89c
chore(news): mobile updates Bailey
2016-03-17 00:09:42 -04:00
3f16cd4fbf
refactor: Adjust stat allocation modal
2016-03-16 22:07:00 -05:00
a639038a41
Move stat allocation to a mixin to avoid code duplication
2016-03-16 22:07:00 -05:00
952d9ec929
Quick allocation of attribute points from level-up modal
...
Resolves #6720 .
2016-03-16 22:06:54 -05:00
a0f65f8b25
emojis now properly displayed in challenge won modal
2016-03-16 20:12:52 -05:00
ae92a98037
challenge title on challenge winner's profile supports markdown w/o emojis
2016-03-16 20:12:49 -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
a9e0a4dfaf
chore(news): announce badges and Spring Plot
2016-03-15 15:42:15 -04:00
beb86ea4bd
Merge branch 'khipkin/party-badges' into develop
...
Conflicts:
common/dist/sprites/spritesmith-main-10.png
common/dist/sprites/spritesmith-main-11.png
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.png
2016-03-15 14:57:38 -04:00
c02082a200
Merge branch 'develop' into api-v3
2016-03-12 16:00:24 +01:00
d608fdb437
fix(news): Pfeffernusse typo
2016-03-10 16:59:39 -06:00
fbdbd8e006
Merge branch 'develop' into api-v3
2016-03-10 18:30:09 +01:00
d153df7805
feat(content): snail pet quest WIP
2016-03-09 15:34:57 -05:00
fe178a62d9
move party up/on achievs about beast/mount achievs on profile
2016-03-08 21:03:57 -05:00
2ade78fc34
show party up/on achievs on user's profile achievements section
2016-03-08 20:57:19 -05:00
d2d3b9deab
award party {up,on} achiev when party reaches {2,4} members
2016-03-08 20:55:18 -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
Blade Barringer