Commit Graph

9193 Commits

Author SHA1 Message Date
Alice Harris 24833de3a7 Merge pull request #3834 from Alys/develop
de-aryanize default avatar https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-03 14:19:05 +10:00
Alice Harris 2c013ca73a de-aryanize default avatar https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 13:20:51 +10:00
Alice Harris a44272c7c8 Merge pull request #268 from Alys/defaultAvatar
rename Head section, add title for new Hairstyle subsection
2014-08-03 08:22:35 +10:00
Jeremy Lee 09dd0663e7 rename Head section, add title for new Hairstyle subsection https://github.com/HabitRPG/habitrpg/issues/1529 2014-08-03 08:18:17 +10:00
Joby Walker 7e059fe496 Fetch each member to get correct data
_group.members is an array of IDs not the user objects.  Fetch each one
to test.
2014-08-02 14:20:42 -07:00
Joby Walker 937920c5a5 Pets are set to 5 not true. 2014-08-02 14:19:30 -07:00
Joby Walker a8c64a4524 Use explicit get for 'quest'
Quest is currently set to null when quests end. Mongoose wraps the value
in an object so the test will fail.
2014-08-02 14:18:39 -07:00
Matteo Pagliazzi d1860c3ffc chore(i18n): update locales 2014-08-02 10:29:09 +02:00
Alice Harris 8dafc72b7d Merge pull request #249 from Alys/questWarning
change quest warning to match current behaviour
2014-08-02 13:10:08 +10:00
Alice Harris 46dbb0b78a Merge pull request #3799 from Alys/avatarNameContribColour
apply contributor tier color to avatar name - fixes https://github.com/HabitRPG/habitrpg/issues/3735
2014-08-02 13:08:20 +10:00
Alice Harris 2c70c25028 Merge pull request #3792 from Alys/showMoreBackground
show more avatar background (remove Lvl, hide avatar name)
2014-08-02 13:06:07 +10:00
Alice Harris bb9899b7ce Merge pull request #266 from Alys/modsColours
remove redundant message in Tavern now that mod names are styled
2014-08-02 12:57:39 +10:00
Alice Harris 140c75760a Merge pull request #3825 from Alys/modsColours
add correct styling to moderator names in message above Tavern chat
2014-08-02 12:56:08 +10:00
Alice Harris d574e99ef4 Merge pull request #3826 from Alys/playerTiers
split Player Tiers table into entries for individual tiers
2014-08-02 12:55:03 +10:00
Alice Harris ba42b3e805 Merge pull request #267 from Alys/playerTiers
add texts for new moderator/guardian level, and "staff" and "tier"
2014-08-02 12:54:18 +10:00
Jeremy Lee 26741773c9 split Player Tiers table into entries for individual tiers; partially implement new moderator and staff tiers (still invisible to users) 2014-08-02 10:46:16 +10:00
Jeremy Lee ddb669834b add texts for new mdoerator/guardian level, and related stuff 2014-08-02 10:45:16 +10:00
Jeremy Lee 1acbde6e3a remove redundant color message now that correct styling is on moderator names above Tavern chat 2014-08-02 07:29:16 +10:00
Jeremy Lee 79bd088589 add correct styling to moderator names in message above Tavern chat 2014-08-02 07:28:29 +10:00
Tyler Renelle 42dc537f6d Merge pull request #258 from jobywalker/candycane-perception
Candy Cane text boosts Perception not Strength
2014-08-01 15:26:23 -06:00
Alice Harris 2a28b208d9 Merge pull request #254 from Alys/chillingFrostDailiesHurt
explain that Chilling Frost does not stop dailies from hurting you - fixes https://github.com/HabitRPG/habitrpg/issues/3795
2014-08-02 07:04:45 +10:00
deilann 0da3654bf5 Merge pull request #264 from jobywalker/fix-freeRebirth-assignment
Fix assignment in freeRebirth test
2014-08-01 13:28:11 -07:00
Joby Walker aa4bd944c9 Fix assignment in freeRebirth test 2014-08-01 13:20:13 -07:00
Tyler Renelle b3fd859cad chore(npcs): back to normal npcs 2014-08-01 14:07:01 -06:00
deilann 326952538d Merge pull request #263 from jobywalker/fix-no-value-quest-ok
Fix: OK for unpurchaseable quest to have no value
2014-08-01 13:00:58 -07:00
deilann a590969078 Merge pull request #262 from jobywalker/fix-freeRebirth
Fix freeRebirth flag
2014-08-01 13:00:39 -07:00
Tyler Renelle 04f1459cca bailey(dilatory): forgot announcement on drag'on defeat 2014-08-01 13:44:43 -06:00
Joby Walker a2d851db23 Fix: OK for unpurchaseable quest to have no value
Changing test to only check that a quest has value if it is "canBuy=true".
This (with PR#262) should fix the last test error on habitrpg-shared.
2014-08-01 10:19:19 -07:00
Joby Walker 24e0f705b2 Fix freeRebirth flag
Coffee is assuming the negation (!) applies to the AND of the two tests
should be just !user.flags.freeRebirth = true.  Fixes 4 test errors.
2014-08-01 01:35:07 -07:00
Alice Harris 4d6562b86b Merge pull request #261 from Alys/modsColours
change description of colors used for moderators and staff
2014-08-01 18:16:39 +10:00
Alice Harris 095472fb92 change description of colors used for moderators and staff 2014-08-01 18:13:27 +10:00
Tyler Renelle 3d440fac8f Merge pull request #260 from jobywalker/fix-user-reset
Fix User Reset
2014-07-31 22:27:46 -06:00
Joby Walker 6a4897b27f Fix User Reset
5cd0039 added regression where reset on new user would fail because user.items.gear.owned is undefined
This patch allows tests to get *much* further than before
2014-07-31 20:56:00 -07:00
Tyler Renelle 050b6fc1f4 chore(spritesmith): bump sheets from 4 to 6, fixes for android 2.3 - may
for other users too
2014-07-31 20:27:04 -06:00
Tyler Renelle 0bd3743392 feat(box): 2014-07-31 17:39:19 -06:00
Tyler Renelle 38f64c71c2 bailey(august): 2014-07-31 17:37:18 -06:00
Tyler Renelle 745d330ce7 fix(bower): pin angular @beta-11, that ~ was upgrading to beta-17 which
doesn't play well with jQuery right now
2014-07-31 16:28:40 -06:00
Collin Styles 0b01ff2201 Don't display chart if history is empty. 2014-07-31 14:56:52 -07:00
Tyler Renelle ec39634458 fix(spritesmith): split spritesheets in to multiple files to remove the
blurry iOS issue. Fixes
https://github.com/HabitRPG/habitrpg/issues/2510, see
http://goo.gl/IwxdI4 . Note, this commit isn't smart/dynamic, there's
commented-out code for handling dynamic splitting, but I couldn't get it
working - static 4 sheets for now
2014-07-31 15:44:22 -06:00
3onyc 2d2c2d27a1 Change newPassSent to reflect 'Reset Password' not failing on non-existent email 2014-07-31 22:38:31 +02:00
Joby Walker 28838d6a1c Candy Cane text boosts Perception not Strength 2014-07-31 13:11:35 -07:00
Tyler Renelle e10c04c9bc feat(contribs): start for #3801, update to new badge colors 2014-07-31 12:10:24 -06:00
Tyler Renelle 072881f986 Merge pull request #3793 from Alys/backgroundOrder
display backgrounds in reverse chronological order (most recent at top)
2014-07-30 23:08:12 -06:00
Tyler Renelle 0811f3ddc8 Merge branch 'lemoness-develop' into develop 2014-07-30 17:18:03 -06:00
Tyler Renelle 9efda1d955 fix(bailey): small tweaks to 7/31 (spacing, remove project files) 2014-07-30 17:17:51 -06:00
Lemoness 983aaf9682 7/31 Bailey Announcement 2014-07-30 16:08:55 -07:00
Lemoness 4f5b450b38 Bailey reminder - 7/31 2014-07-30 15:55:17 -07:00
Tyler Renelle da87767c48 grunt(store-icons): re: #257 (before I forget) 2014-07-29 15:31:28 -06:00
Tyler Renelle 8381ebb5e5 Merge pull request #257 from lemoness/develop
Summer Outfit Icons
2014-07-29 15:26:46 -06:00
Lemoness 92396ca1b9 Summer Outfit Icons
Creates uniform 2px icons for Summer Event Outfits
2014-07-29 14:23:01 -07:00