Commit Graph

1200 Commits

Author SHA1 Message Date
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
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
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
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
Tyler Renelle dd0c2127d6 Merge pull request #247 from Alys/optOut
make it clearer that you can choose a class later
2014-07-13 11:44:42 -06:00
Matteo Pagliazzi 3cfce27755 chore(i18n): update locales 2014-07-13 18:02:17 +02:00
Matteo Pagliazzi 8a822f6538 fix(i18n): add strings 2014-07-13 18:00:15 +02:00
Alice Harris adacd25ba6 put content.coffee and habitrpg-shared.js back the way they're meant to be 2014-07-13 16:28:42 +10:00
Alice Harris cd874c2d68 make it really obvious that you can choose a class later 2014-07-13 16:07:07 +10:00
Alice Harris 964d1a640c allow quest progress from attack skills BEFORE quest starts
Currently, if you do Brutal Smash or Burst of Flames BEFORE you start a quest, they do NOT damage the quest boss if you start the quest later in the day (this is the opposite of how tasks work). This also means that if you are not on a boss or collection quest, then those skills can't damage the World Boss. I think this is counterintuitive and I think users are expecting those skills to act on Drag'on even when they are not on a quest.

This change causes damage from the skills to be treated just like damage from tasks - it's applied to quests started later that day and to Drag'on.

THIS HAS NOT BEEN TESTED. Sorry. :( I have broken my VM temporarily.
2014-07-13 15:44:05 +10:00
Alice Harris 0c2a9a4b24 allow quest progress from attack skills BEFORE quest starts
Currently, if you do Brutal Smash or Burst of Flames BEFORE you start a quest, they do NOT damage the quest boss if you start the quest later in the day (this is the opposite of how tasks work). This also means that if you are not on a boss or collection quest, then those skills can't damage the World Boss. I think this is counterintuitive.

This change causes damage from the skills to be treated just like damage from tasks - it's applied to quests started later that day and to Drag'on.

THIS HAS NOT BEEN TESTED. Sorry. :( I have broken my VM temporarily.
2014-07-13 15:44:05 +10:00
Sabe Jones 424cf1a5bf fix(event-gear): Correct headgear costs
Previously, all seasonal event helms except Winter were priced as third-tier instead of fourth-tier headgear. Now Spring and Summer headgear costs 60, same as penultimate class headgear and Winter headgear.
2014-07-12 10:29:48 -05:00
Matteo Pagliazzi 214facaa93 feat(directives): move directive to be used in mobile from habitrpg 2014-07-12 15:53:06 +02:00
Tyler Renelle 44af90bae7 fix(dilatory): update completion wording 2014-07-10 13:04:24 -06:00
Tyler Renelle 595b8f28a0 Merge pull request #246 from Alys/patch-1
fix Reset documentation for latest code change
2014-07-08 17:54:52 -06:00
Alice Harris 50709906f5 fix Reset documentation for latest code change
https://github.com/HabitRPG/habitrpg/issues/3349#issuecomment-48257764
2014-07-09 09:41:41 +10:00
Matteo Pagliazzi 5f0226bb68 chore(i18n): update locales 2014-07-08 12:19:02 +02:00
Tyler Renelle 5cd0039171 fix(reset): don't remove special gear on reset #3349 2014-07-07 19:06:48 -06:00
Tyler Renelle 92600c925f Merge pull request #245 from Alys/moreWarnings
improve Reset Account warning - fixes https://github.com/HabitRPG/habitrpg/issues/3349 (also adds API Token warning)
2014-07-07 15:07:43 -06:00
Tyler Renelle 9e85a886ba feat(quests): seahorse quest 2014-07-07 14:56:47 -06:00
Alice Harris b88ff077ca improve Reset Account warning (#3349), add password warning to API Token 2014-07-05 16:05:55 +10:00
Matteo Pagliazzi f4510e8382 chore(i18n): update locales 2014-07-04 12:01:02 +02:00
Tyler Renelle 3a83ca1770 feat(gaymerx): gaymerx special gear 2014-07-02 16:53:13 -06:00
Tyler Renelle 6e46b7670c feat(backgrounds): add Set2 bgs 2014-07-02 16:33:21 -06:00
Tyler Renelle 8a7ac32500 Merge pull request #243 from Alys/silver
add silver explanation to on-hover message
2014-07-01 16:39:48 -06:00
Alice Harris 1498f8200c add silver explanation to on-hover message 2014-07-02 06:58:40 +10:00
Tyler Renelle 90b7532a4e Merge pull request #241 from Alys/clearCompleted
explain what clearCompleted does and label button more clearly
2014-07-01 10:14:15 -06:00
Tyler Renelle dc67918dda Merge pull request #242 from thepeopleseason/rage_update
Clarify Rage Tool Tip
2014-07-01 09:46:46 -06:00