Commit Graph

16866 Commits

Author SHA1 Message Date
Mateus Etto fabaaa6d92 Merge branch 'develop' into party-chat-translations 2018-03-12 22:35:13 +09:00
Mateus Etto 854696728a Fix message when boss don't attack 2018-03-12 21:50:23 +09:00
Mateus Etto 314926cc06 Hard coded messages now using i18n strings 2018-03-12 21:45:41 +09:00
Mateus Etto 68fa834946 spellName -> spell; grammar fix 2018-03-12 21:08:20 +09:00
SabreCat 8d1b1ff794 chore(npm): update package lock 2018-03-09 21:22:25 +00:00
SabreCat 70500d7c98 Merge branch 'release' into develop 2018-03-09 21:18:56 +00:00
Travis 35849ebdd7 Fixing items sort by number in the market. (#10108)
fixes #10093
2018-03-09 15:17:26 -06:00
Matteo Pagliazzi 1332fd68b0 Mongoose 5 (#9870)
* mongoose 5: remove unused autoinc, remove promise option (it uses native promises now)

* remove mongodb package

* remove mongoskin

* migrate migration away from mongoskin

* fix mongoose hooks

* fix _updateUserWithRetries

* try without next

* remove init

* update sinon

* fix some integration tests

* fix remaining tests

* fix error message

* fix error message

* fix error message

* another fix

* fix mongoose options

* remove greenkeeper exception
2018-03-09 15:13:58 -06:00
Travis f9a47b1420 Update user pinned items on purchases. (#10085)
fixes #10049
2018-03-09 15:11:42 -06:00
Sabe Jones 090c571f3e 4.29.8 v4.29.8 2018-03-09 21:04:14 +00:00
Dexx Mandele 07b3824c4c Stop market background from covering sign (#10067) 2018-03-09 14:59:45 -06:00
Sabe Jones 1bf3736198 chore(i18n): update locales 2018-03-09 20:58:12 +00:00
Travis 92fa6805eb fix: Quest collected items displayed multiple times. (#10111)
fixes #10065
2018-03-09 14:56:59 -06:00
SabreCat d5efa7b2b0 fix(event): clean up more Valentine's content 2018-03-09 20:45:12 +00:00
Dexx Mandele f64b34318f Set warrior as default for the choose class pop-up (#10084) 2018-03-09 14:40:53 -06:00
Sabe Jones 5e13a9c503 4.29.7 v4.29.7 2018-03-09 03:31:53 +00:00
Sabe Jones b27aec855c chore(event): end Cupid Potions 2018-03-09 03:31:39 +00:00
Sabe Jones fe61c0f29e Merge branch 'release' into develop 2018-03-08 21:43:35 +00:00
Sabe Jones 2db3ac7bd3 4.29.6 v4.29.6 2018-03-08 21:42:52 +00:00
SabreCat 201ec0e865 fix(world-boss): add achievement badge, correct mount positioning 2018-03-08 21:37:17 +00:00
Sabe Jones a0253cf289 chore(i18n): update locales 2018-03-08 19:41:22 +00:00
SabreCat 5256569bac fix(world-boss): remove notification 2018-03-08 19:37:27 +00:00
Sabe Jones 5f0b957dc2 fix(logging): only start Stackimpact in prod (#10112) 2018-03-08 13:12:45 -06:00
Sabe Jones 16524d4464 4.29.5 v4.29.5 2018-03-08 18:39:00 +00:00
SabreCat 63a11c6c28 chore(event): end Valentines/Dysheartener 2018-03-08 18:37:32 +00:00
Sabe Jones 37650ca674 Merge branch 'release' into develop 2018-03-08 00:30:37 +00:00
Sabe Jones b5dfa54052 4.29.4 v4.29.4 2018-03-08 00:30:20 +00:00
SabreCat 2e7deffb69 fix(user): no more birthday 2018-03-08 00:29:00 +00:00
Sabe Jones b4dab2e13c Merge branch 'release' into develop 2018-03-07 22:53:09 +00:00
Sabe Jones 535c41dba8 4.29.3 v4.29.3 2018-03-07 22:52:45 +00:00
Sabe Jones 7357fb0528 chore(i18n): update locales 2018-03-07 22:49:33 +00:00
Keith Holliday 49e67fa87c Added stackimpact (#10109) 2018-03-07 16:46:50 -06:00
Sabe Jones b4ca425562 4.29.2 v4.29.2 2018-03-06 22:03:34 +00:00
Sabe Jones deba726afa chore(i18n): update locales 2018-03-06 22:00:31 +00:00
SabreCat 2abf0f4900 feat(content): Hug a Bug Quest Bundle 2018-03-06 21:56:01 +00:00
Sabe Jones b827b17481 Don't include seasonal class gear in classless category (#10047)
* fix(market): don't include seasonal class gear in classless category

* refactor(shops): use standard indexOf check
2018-03-06 11:03:49 -06:00
Sabe Jones 27ef187e66 Merge branch 'release' into develop 2018-03-05 20:59:17 +00:00
Sabe Jones 0c3b4bba51 4.29.1 v4.29.1 2018-03-05 20:58:50 +00:00
Sabe Jones 09948ba319 chore(i18n): update locales 2018-03-05 20:58:16 +00:00
SabreCat da50d2f495 feat(world-boss): third Rage Strike support 2018-03-05 20:46:22 +00:00
Keith Holliday 9c9b67aa9d Keys kennel fixes (#9848)
* Show keys to pets immediately

* Ensured keys to pets dissapear after use

* Added resdirect to stable after purchase

* Added mount check and updated keys to mounts and to both

* Added api calls

* Added check for beastmaster progress

* Added mount check for release mounts. Added pets and mount check to release both

* Added actions

* Added catch to common tests

* Added beast count and reload

* Removed extra console log
2018-03-02 15:30:11 -06:00
Keith Holliday 7cff331800 Removed uri for client side oauth (#10058)
* Removed uri for client side oauth

* Fixed lint
2018-03-02 14:07:15 -07:00
Keith Holliday e7bc505b88 Modal popup fixes (#10080)
* Added validation for modal stack

* Lint fixes
2018-03-02 12:43:22 -07:00
Mateus Etto 09440d5adf Merge branch 'develop' into party-chat-translations 2018-03-02 19:28:41 +09:00
Sabe Jones 716393cf91 4.29.0 v4.29.0 2018-03-01 23:31:00 +00:00
Sabe Jones fe102aedd3 chore(i18n): update locales 2018-03-01 23:29:59 +00:00
SabreCat cf7fc8d578 Merge branch 'develop' into release 2018-03-01 23:23:57 +00:00
SabreCat b39a5be2d1 chore(sprites): compile 2018-03-01 23:23:36 +00:00
SabreCat 45a1ad501e feat(content): Backgrounds and Armoire 2018/03 2018-03-01 23:23:00 +00:00
Keith Holliday 2959f0afab Removed modify inventory because the Content is causing Garbage Collection issues (#10075) 2018-03-01 08:24:46 -07:00