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
Victor Piousbox
4655e5061a
api-v3 password reset
2016-03-17 14:47:22 -07: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
219ec01ce9
port shared.ops.allocate
2016-03-15 18:41:23 +01:00
Matteo Pagliazzi
b2b4340ee3
change response for shared.ops.sleep, save user in POST /user/sleep and add integration tests for it
2016-03-15 17:05:07 +01:00
Matteo Pagliazzi
490c6a9ae1
wip(shared): port sleep op
2016-03-15 16:33:44 +01:00
Matteo Pagliazzi
f55df39fb7
Merge branch 'develop' into api-v3
2016-03-13 23:19:04 +01:00
Matteo Pagliazzi
e506864e00
Merge pull request #6877 from HabitRPG/v3-adapt-shared
...
Make shared code ready for API v3
2016-03-13 23:13:00 +01:00
Matteo Pagliazzi
70df1137a0
fix statsComputed getter
2016-03-13 22:39:14 +01:00
Matteo Pagliazzi
8e3284a4e3
wip(shared): adapt to v3
2016-03-13 22:26:32 +01:00
Victor Piousbox
0b25720232
cleanup
2016-03-13 14:01:53 -07:00
Matteo Pagliazzi
b948fc031f
fix typo in common code
2016-03-13 21:12:19 +01:00
Victor Piousbox
c14f0c4247
update username, password
2016-03-13 10:42:59 -07:00
Matteo Pagliazzi
c02082a200
Merge branch 'develop' into api-v3
2016-03-12 16:00:24 +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
fbdbd8e006
Merge branch 'develop' into api-v3
2016-03-10 18:30:09 +01: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
Blade Barringer
3fa9d17ad4
Merge branch 'develop' into api-v3
2016-03-08 19:25:50 -06: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
Matteo Pagliazzi
393a26e51a
fix typo: reroll -> rebirth
2016-03-08 18:02:23 +01:00
Matteo Pagliazzi
a351cb5f4e
change references to imported libs
2016-03-08 17:49:18 +01:00
Matteo Pagliazzi
5a2daabada
remove all changes from eslint --fix
2016-03-08 17:45:14 +01:00
Matteo Pagliazzi
eeebe4c342
wip: split shared ops
2016-03-07 23:02:42 +01:00
