Matteo Pagliazzi
d5d13477d7
wip user controllers: local login method
2015-11-18 18:02:35 +01:00
Blade Barringer
e6a5d08150
Merge branch 'develop' into api-v3
2015-11-16 17:34:30 -06:00
Sabe Jones
c352a30d4e
chore(news): Bailey 2015-11-16
...
Also sprite recompile to incorporate sticker promo image.
2015-11-16 17:26:44 -05:00
Matteo Pagliazzi
879ec97408
fix some requires
2015-11-13 17:41:18 +01:00
Blade Barringer
efd0e2333e
Merge pull request #6200 from gauthamchandra/feature/quick-checkout-from-dailies
...
User can now check out of inn from tasks page
2015-11-11 20:49:35 -06:00
Blade Barringer
c5445dc426
Merge branch 'develop' into api-v3
2015-11-11 19:42:39 -06:00
Sabe Jones
83b61f9aa3
Merge branch 'develop' into sabrecat/pet-201511
...
Conflicts:
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-11-11 18:36:25 -05:00
Sabe Jones
b32ab5a587
chore(news): Pet quest Bailey
...
Also adds one missing sprite asset for the quest.
2015-11-11 18:31:22 -05:00
Sabe Jones
eba2ac386e
feat(pets): November quest
...
Fully functional commit. Missing only Bailey and the quest scroll sprite.
2015-11-11 17:23:16 -05:00
Sabe Jones
eed4207c6d
Merge branch 'develop' into sabrecat/more-modals
...
Conflicts:
common/dist/sprites/spritesmith-largeSprites-0.png
common/locales/en/front.json
2015-11-09 16:24:17 -05:00
Gautham Chandra
b9b2536478
User can now check out of inn from tasks page
...
Fixes #5651
2015-11-07 18:32:19 -05:00
Matteo Pagliazzi
0834f8eeea
disable api v2 and related tests to enable changes to models
2015-11-07 15:51:26 +01:00
Sabe Jones
164309e050
feat(sharing): Streak Achievement
2015-11-06 16:54:23 -05:00
Sabe Jones
bb55a74f48
chore(news): iOS update Bailey
...
Also fixes the color of the iOS app icon and codes it more intelligently.
2015-11-05 11:48:51 -05:00
Sabe Jones
e74c83be2e
feat(content): November backgrounds and Armoire
2015-11-02 17:28:20 -05:00
Sabe Jones
2cb4e80019
chore(event): End Fall Festival
2015-11-02 12:55:48 -05:00
Sabe Jones
68660b3043
Merge pull request #6140 from HabitRPG/sabrecat/habitoween
...
WIP: Habitoween
2015-10-30 14:46:44 -05:00
Sabe Jones
dca0d7c3f3
fix(event): Keep NPCs burnt out
2015-10-30 15:36:17 -04:00
Blade Barringer
724bc6e861
Compiled css for sprites
2015-10-30 10:10:12 -05:00
Sabe Jones
27d1e9c788
feat(event): Habitoween
...
Swaps out basic fall costume NPCs for their Halloween versions. Removes "broken" NPC sprites not needed after World Boss.
2015-10-29 14:15:18 -04:00
Sabe Jones
2df6df2bee
Merge pull request #6091 from HabitRPG/sabrecat/mystery-201510
...
October 2015 Subscriber Items
2015-10-26 15:04:43 -05:00
Blade Barringer
fb30a7b03b
Compile sprites.
2015-10-24 20:14:30 -05:00
Sabe Jones
2582d0b7c7
fix(sprites): Flip goblin tail
...
The Goblin Tail slightly breaks from convention for items (it's 12px wider than most), but that allows it to remain visible and well composed when the avatar is riding a mount.
2015-10-23 16:33:58 -04:00
Sabe Jones
392889c7da
feat(mystery): October 2015 subscriber set
2015-10-23 15:45:43 -04:00
Sabe Jones
5fbd6814b0
fix(pets): Realign frog sprites
...
Also adds a note about the To-Do sorting fix to the Bailey announcement
2015-10-20 18:55:57 -04:00
Sabe Jones
0a6d9fa23a
WIP(pets): Frog quest
2015-10-19 23:12:24 -04:00
Sabe Jones
dcf17b5505
feat(event): Jack-O'-Lantern mounts
2015-10-12 14:49:12 -04:00
Blade Barringer
d873848f81
Commit missing file
2015-10-08 17:37:10 -05:00
Blade Barringer
0ccf07a4e0
Compile sprites
2015-10-08 17:32:34 -05:00
Sabe Jones
1d4536fc47
fix(sprites): Remove errant blob
2015-10-08 10:59:44 -05:00
Sabe Jones
aba3908170
chore(gulp): Compile sprites
2015-10-07 15:15:21 -04:00
Sabe Jones
0d7a57d176
Merge branch 'develop' into sabrecat/world-boss
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
Sabe Jones
56419aee25
feat(content): October 2015 backgrounds
2015-10-02 16:13:11 -04:00
Blade Barringer
be3decf859
Merge branch 'develop' into refactor-content
2015-10-01 21:20:04 -05:00
Sabe Jones
5349bc7312
chore(gulp): Compile sprites
2015-10-01 14:27:21 -05:00
Sabe Jones
f4c18bb7f3
chore(gulp): Compile sprites
2015-10-01 14:11:22 -05:00
Blade Barringer
5c0a0e1d18
Compile css
2015-09-29 17:30:08 -05:00
Blade Barringer
2d862593ae
Compile sprites
2015-09-28 08:50:20 -05:00
Sabe Jones
6d6f0f597b
feat(world-boss): Dry run
2015-09-24 15:39:16 -04:00
Sabe Jones
009c92b532
feat(content): September sub items and customizations
2015-09-23 15:23:42 -04:00
Sabe Jones
3e8a3ee5f4
feat(event): Fall Festival 2015
2015-09-18 15:19:59 -04:00
Blade Barringer
1df4cf81dd
compile sprites using gulp
2015-09-12 11:22:15 -05:00
Sabe Jones
41b4d497f7
Merge branch 'develop' into sabrecat/pet-201509
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-09-08 13:25:10 -05:00
Sabe Jones
6f85fcfde2
Merge branch 'develop' into sabrecat/party-page
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-09-01 13:40:20 -05:00
Sabe Jones
daf3a2d2bc
feat(pets): Horse sprites
2015-09-01 12:07:21 -05:00
Sabe Jones
c0a47130e4
chore(content): Compile sprites
2015-08-31 15:54:08 -05:00
Blade Barringer
a0040d736f
Merge branch 'develop' into sabrecat/party-page
2015-08-28 23:06:00 -05:00
Sabe Jones
9e45017faa
Merge branch 'develop' into sabrecat/onboarding-tweaks
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith2.css
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-08-28 13:24:10 -05:00
Sabe Jones
f308116c54
feat(tutorial): Moar avatars
2015-08-28 11:48:30 -05:00
Blade Barringer
15a6929b44
Merge branch 'develop' into sabrecat/party-page
2015-08-28 08:41:57 -05:00
