Blade Barringer
5bd436f3c8
fix: Change all instances of spookDust -> spookySparkles
2016-05-20 09:17:44 -05:00
Blade Barringer
42bc4bdd3d
fix: Correct spelling of healAll skill
...
fix: Correct sprite name of healAll skill
2016-05-20 09:17:16 -05:00
Blade Barringer
7ac67315e6
Merge branch 'develop' into api-v3
2016-05-17 15:50:31 -05:00
Matteo Pagliazzi
d293b2d6ee
v3 client: fix ability to send cards
2016-05-17 17:35:49 +02:00
Sabe Jones
beb4a0d8bb
feat(content): May 2016 pet quest ( #7310 )
2016-05-16 15:18:51 -05:00
Matteo Pagliazzi
ad03cc8f9a
Merge branch 'api-v3' of github.com:HabitRPG/habitrpg into api-v3
2016-05-16 12:55:14 +02:00
Matteo Pagliazzi
ba1628427e
v3: fix stealth casting
2016-05-16 11:38:22 +02:00
Blade Barringer
21203c3f2e
feat: Add modify inventory debug menu
2016-05-15 16:07:30 -05:00
Matteo Pagliazzi
199732539f
chore(): rename website/src -> website/server and website/public -> website/client ( #7199 )
2016-05-13 15:35:12 +02:00
Matteo Pagliazzi
a947afa5c6
Merge branch 'develop' into api-v3
2016-05-11 14:36:58 +02:00
Sabe Jones
7f11e766c3
Sabrecat/glasses chairs ( #7182 )
...
* feat(customization): new chairs, eyeglass sprites
* feat(avatar): finish glasses implementation
* fix(test): include glasses in base equipment
2016-05-10 16:07:46 -05:00
Sabe Jones
d5b3bbfaad
Sabrecat/armoire 201605 ( #7142 )
...
* feat(content): May BGs and Armoire
* chore(news): Bailey 20160503
2016-05-03 15:20:00 -05:00
Sabe Jones
166a37d53f
chore(event): end Spring Fling 2016
2016-05-02 01:36:03 +00:00
Matteo Pagliazzi
f69a566178
Merge branch 'develop' into api-v3
2016-04-30 16:49:44 +02:00
Sabe Jones
7bc89aa55c
fix(sprites): updateabee
2016-04-27 17:14:49 +00:00
Sabe Jones
974896ce7b
feat(events): April Mystery and Floral Potions ( #7107 )
...
* feat(events): April Mystery and Floral Potions
Also reorganizes the spritesmith folders for mounts so that head, body, and icon sprites are in separate folders.
2016-04-25 14:17:31 -05:00
Matteo Pagliazzi
f44dbbbd71
Merge branch 'develop' into api-v3
2016-04-19 12:16:22 +02:00
Sabe Jones
62f44771af
fix(stable): rename Bumblebees throughout code
2016-04-18 21:02:24 +00:00
Blade Barringer
1a64886f7d
Merge branch 'develop' into api-v3
2016-04-15 08:04:46 -05:00
Sabe Jones
7bb6f968b4
feat(content): Pet Quest 2016-04 ( #7071 )
...
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
2016-04-13 12:15:38 -05:00
Blade Barringer
8a42a3a51e
Merge branch 'develop' into api-v3
2016-04-08 21:31:41 -05:00
Sabe Jones
1f6eef0082
Sabrecat/armoire 201604
...
* WIP(content): add sprites
* feat(content): Armoire and Backgrounds 2016-04
2016-04-05 15:30:01 -05:00
Matteo Pagliazzi
c5f17b4011
Merge branch 'develop' into api-v3
2016-04-01 11:50:41 +02:00
Sabe Jones
a07aed331c
fix(world-boss): add chat message, Bailey handling, animation
2016-03-31 19:38:43 -04:00
Sabe Jones
f51653b7a5
WIP(world-boss): partial build
2016-03-31 17:29:21 -04:00
Matteo Pagliazzi
3089658cc7
Merge branch 'develop' into api-v3
2016-03-30 23:40:00 +02:00
Blade Barringer
a9d227b490
Merge branch 'develop' into wheelchair
2016-03-28 21:12:52 -05:00
Matteo Pagliazzi
d89d1e50dd
Merge branch 'develop' into api-v3
2016-03-25 15:58:04 +01: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
Matteo Pagliazzi
0bde9e2df2
Merge branch 'develop' into api-v3
2016-03-21 23:03:28 +01: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
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
146810a3e9
feat: Add set property to content
2016-03-15 19:41:19 -05:00
Matteo Pagliazzi
8e3284a4e3
wip(shared): adapt to v3
2016-03-13 22:26:32 +01:00
Matteo Pagliazzi
fbdbd8e006
Merge branch 'develop' into api-v3
2016-03-10 18:30:09 +01:00
Sabe Jones
d153df7805
feat(content): snail pet quest WIP
2016-03-09 15:34:57 -05:00
Blade Barringer
3fa9d17ad4
Merge branch 'develop' into api-v3
2016-03-08 19:25:50 -06:00
Blade Barringer
155cd6c626
fix: Correct how faq module is exported
2016-03-08 11:59:45 -06:00
Blade Barringer
4cd0428f0a
Merge branch 'develop' into api-v3
2016-03-04 12:16:22 -06:00
Blade Barringer
511b003ec5
Merge pull request #6811 from crookedneighbor/upgrade_babel
...
chore: upgrade babel to v6
2016-03-04 08:36:08 -06:00
Matteo Pagliazzi
d85c64705e
Merge branch 'develop' into api-v3
2016-03-03 21:15:16 +01:00
Blade Barringer
0406142e0e
chore: upgrade babel to v6
2016-03-02 21:36:27 -06:00
Alys
c3107ad3fb
improve commenting style
2016-03-03 13:35:55 +10:00
Matteo Pagliazzi
80f791c86b
add tests, move CustomError to common, fix casting
2016-03-03 00:16:28 +01:00
