Commit graph

1224 commits

Author SHA1 Message Date
Phillip Thelen
766f663b02 Add skin images with sleeping eyes and make ZZZ more visible 2014-08-03 20:33:21 +02:00
Matteo Pagliazzi
3356f45f50 chore(i18n): update locales 2014-08-03 15:30:06 +02: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
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
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
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
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
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
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
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
Joby Walker
28838d6a1c Candy Cane text boosts Perception not Strength 2014-07-31 13:11:35 -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
Tyler Renelle
603da697c1 Merge pull request #256 from lemoness/develop
Snowball and June Item Icons
2014-07-29 14:40:39 -06:00
Lemoness
982b29b443 Snowball and June Item Icon
Changes to a consistent 2x to avoid resizing issues
2014-07-29 13:36:24 -07:00
Alice Harris
c8f45b8be6 explains that Chilling Frost does not stop dailies from hurting you 2014-07-29 13:01:17 +10:00
Tyler Renelle
2fb4d2652d Merge pull request #253 from lemoness/develop
gaymerx helm icon 2x
2014-07-28 16:06:04 -06:00
Lemoness
dfacae9b3f gaymerx helm icon 2x
gaymerx helm icon 2x
2014-07-28 15:04:49 -07:00
Tyler Renelle
8f6673a19b Merge pull request #252 from lemoness/develop
test - icon gaymerx armor
2014-07-28 16:02:58 -06:00
Lemoness
0711b2ee85 test - icon gaymerx armor
test - icon gaymerx armor
2014-07-28 15:00:00 -07:00
Matteo Pagliazzi
4f5f479dc8 chore(i18n): update locales 2014-07-28 16:03:15 +02:00
Tyler Renelle
75eb860650 feat(mystery): july mystery items 2014-07-24 19:40:27 -06:00
Alice Harris
9d5ac44e6a change quest warning to match current behaviour 2014-07-22 11:26:00 +10:00
Tyler Renelle
5a03c6f7ce Merge pull request #248 from Omnomnobot/patch-2
Fixed a typo (chose --> choose)
2014-07-21 13:07:08 -06:00
Omnomnobot
695832f62c Fixed a typo (chose --> choose) 2014-07-21 16:08:17 +02:00
Tyler Renelle
9c50eb8b06 Merge pull request #226 from 3onyc/feature/username-change
Implement "Change username" feature
2014-07-19 16:48:24 -06:00
Tyler Renelle
327a337a26 Merge pull request #234 from HabitRPG/sabe/crits
feat(crits): Make crit hits boost MP
2014-07-18 16:59:02 -06:00
Tyler Renelle
c96ef70428 feat(dilatory): add dilatory achievement 2014-07-17 18:36:50 -06:00
Tyler Renelle
f1db2bf1d5 refactor(dotSet): move dotSet & dotGet to exports 2014-07-17 12:55:45 -06:00
Tyler Renelle
b449387cc0 fix(dilatory): add honey https://twitter.com/ogbajoj/status/489515513148497920 2014-07-16 15:50:42 -06:00
Tyler Renelle
4cb79c6fff fix(dilatory): update rewards: 0gp, 0xp, food drops 2014-07-16 13:24:06 -06:00
Matteo Pagliazzi
f3da3e0283 chore(i18n): update locales 2014-07-16 15:16:21 +02:00
Tyler Renelle
9f0e6607c5 chore(grunt): run grunt for summer gear prices, fixes https://github.com/HabitRPG/habitrpg/issues/3727 2014-07-14 20:01:26 -06:00