Sabe Jones
def6b6cd5c
chore(gulp): compile sprites
2016-03-31 17:20:30 -05:00
Sabe Jones
f51653b7a5
WIP(world-boss): partial build
2016-03-31 17:29:21 -04:00
Sabe Jones
95fa91522a
Merge pull request #6955 from HabitRPG/wheelchair
...
Wheelchair
2016-03-30 14:25:12 -05:00
Alys
ae9e6fbe30
allow cron to record user's current timezone offset in preferences.timezoneOffsetAtLastCron (initial stage of cron timezone fix for https://github.com/HabitRPG/habitrpg/issues/3806 )
2016-03-29 22:34:23 +10:00
Blade Barringer
a9d227b490
Merge branch 'develop' into wheelchair
2016-03-28 21:12:52 -05:00
Blade Barringer
6552f04b0c
chore(i18n): update locales
2016-03-28 09:58:32 -05:00
Blade Barringer
cd6adf2421
fix: correct wheelchair spelling
2016-03-24 21:31:20 -05:00
Blade Barringer
2d55a2a31d
chore: compile sprites
2016-03-24 07:57:57 -05:00
Blade Barringer
c88f2ce580
refactor: Use resized version of wheelchair for selection
2016-03-24 07:57:57 -05:00
Nick Bunn
0f9cf57613
feat: Add wheelchair to avatar customization
2016-03-24 07:57:13 -05:00
Sabe Jones
be159adf77
fix(event): pastel skin, not hair
2016-03-23 15:36:24 -04:00
Sabe Jones
1286b6fbee
fix(event): make spring hair/skin available server side
2016-03-23 15:36:24 -04:00
Sabe Jones
f7027b5cf3
feat(event): subscriber items 2016-03
2016-03-23 15:36:24 -04:00
Blade Barringer
9b9722a7b4
chore(i18n): update locales
2016-03-22 17:40:42 -05:00
Bleu
521195ab95
fix: Unify html in translation strings
...
Closes #6859
2016-03-22 17:34:29 -05:00
Blade Barringer
92ac703ecc
chore(i18n): update locales
2016-03-22 08:31:14 -05:00
Kaitlin Hipkin
9f0704aa94
modal explaining new class gear is now class-agnostic
2016-03-18 23:23:12 -04:00
Sabe Jones
8447259016
Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
...
Spring Fling 2016
2016-03-18 16:08:46 -05:00
Sabe Jones
b5f91a657f
feat(event): Spring Fling complete
2016-03-18 16:56:16 -04:00
Blade Barringer
cd6ab23106
Merge pull request #6900 from doyler/develop
...
Note about weekly progress update (fixes #6884 )
2016-03-18 07:37:32 -05:00
Sabe Jones
10a8476aaf
WIP(event): Spring Fling cont'd
2016-03-17 13:10:05 -04:00
Sabe Jones
4effa79e17
WIP(event): Spring Fling partial
2016-03-17 13:04:12 -04:00
Blade Barringer
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
Alys
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
Blade Barringer
3f16cd4fbf
refactor: Adjust stat allocation modal
2016-03-16 22:07:00 -05:00
Josh Holland
952d9ec929
Quick allocation of attribute points from level-up modal
...
Resolves #6720 .
2016-03-16 22:06:54 -05:00
Blade Barringer
a150dbc9ca
chore(i18n): update locales
2016-03-16 20:32:15 -05:00
doyler
51f3008a20
Note about weekly progress update ( fixes #6884 )
2016-03-16 22:11:01 +01:00
Blade Barringer
be0bcad24b
chore(i18n): update locales
2016-03-15 19:51:47 -05:00
Blade Barringer
1c811dbc82
refactor: Extract orderBy equipment button into mixin
2016-03-15 19:41:24 -05:00
Blade Barringer
146810a3e9
feat: Add set property to content
2016-03-15 19:41:19 -05:00
Matt Harrington
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
Sabe Jones
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
Matteo Pagliazzi
b948fc031f
fix typo in common code
2016-03-13 21:12:19 +01:00
Matteo Pagliazzi
6fa23ae49f
make sure to clone drop so original properties do not change
2016-03-11 19:11:46 +01:00
Kaitlin Hipkin
997fe155e2
fix blurry upscale of achievement-partyUp img
2016-03-10 20:49:54 -05:00
Sabe Jones
d28219e90d
fix(content): Pfeffernusse typo, again
2016-03-10 17:35:36 -06:00
Matteo Pagliazzi
05676d834e
remove git conflict data
2016-03-10 17:13:13 +01:00
Matteo Pagliazzi
c39967767c
Merge branch 'develop' into split-shared
2016-03-10 17:00:59 +01:00
Sabe Jones
2a5011b648
fix(content): don't be clever with quest names
2016-03-09 16:57:43 -06:00
Sabe Jones
d92614844a
Merge pull request #6849 from HabitRPG/sabrecat/pets-201603
...
Pet quest March 2016
2016-03-09 15:11:14 -06:00
Sabe Jones
cc53e6e9dc
Merge pull request #6733 from vIiRuS/mobileStorage
...
Store data for next mobile update
2016-03-09 14:56:15 -06:00
Sabe Jones
45b8dbc1a6
feat(content): snails complete
2016-03-09 15:55:22 -05:00
Sabe Jones
d153df7805
feat(content): snail pet quest WIP
2016-03-09 15:34:57 -05:00
Kaitlin Hipkin
b0fe5f4081
add 2x party up/on achieve images and recompile spritesheets
2016-03-09 12:43:54 -05:00
Kaitlin Hipkin
6642a8e131
add party up/on achiev images and recompile spritesheets
2016-03-09 12:02:43 -05:00
Kaitlin Hipkin
167eb8973a
add strings for new partyUp and partyOn achievs
2016-03-08 20:45:33 -05:00
Matteo Pagliazzi
986bfd8035
split remaining utilities from shared
2016-03-08 19:35:02 +01:00
Blade Barringer
155cd6c626
fix: Correct how faq module is exported
2016-03-08 11:59:45 -06:00
Matteo Pagliazzi
bb6f0f4252
split user.fns
2016-03-08 18:58:39 +01:00
