Commit Graph

780 Commits

Author SHA1 Message Date
Tyler Renelle e9eced2e17 chore(i18n): update challenge wording, fixes #132 2014-02-20 16:45:01 -08:00
Tyler Renelle 9d0ae594a1 Merge pull request #158 from thepeopleseason/github-habitrpg-2832
Updated subscription text to include Mystery Item monthly perk.
2014-02-20 11:23:14 -08:00
Hsiao, James (CMG-Atlanta) 9bb9349eb8 added mysteryItem entries for subscription page 2014-02-20 11:22:50 -05:00
Sabe Jones a88c96b68b fix(pets): Saddle is not edible
Textual tweak for Market and Pets tab
2014-02-19 19:45:30 -06:00
Matteo Pagliazzi e999c940f7 fix(i18n): add string and remove old one 2014-02-18 20:30:35 +01:00
Matteo Pagliazzi 815927a485 chore(i18n): upload Russian locale and update Italian and Polish 2014-02-18 20:08:04 +01:00
Tyler Renelle b03c377294 feat(valentine): remove valentine event 2014-02-18 11:20:31 -07:00
Matteo Pagliazzi e731abb7b6 chore(i18n): pull translations from transifex 2014-02-16 19:18:40 +01:00
Matteo Pagliazzi 8650dc9256 xhore(i18n): add new strings 2014-02-16 14:51:15 +01:00
Matteo Pagliazzi d3c1a70619 chore(i18n): add portuguese, italian and polish locales 2014-02-15 16:20:30 +01:00
Tyler Renelle 20387bf21c chore(grunt): grunt 2014-02-14 19:50:53 -07:00
Tyler Renelle 5704b7e818 Merge pull request #148 from tmas/develop
Added attribute associations for stock items
2014-02-14 18:50:28 -07:00
Matteo Pagliazzi 68b3976b4e chore(i18n): update german locale 2014-02-14 20:09:32 +01:00
Matteo Pagliazzi 1a2ce9d63e chore(i18n): add missing strings 2014-02-14 18:34:55 +01:00
Sabe Jones 28a744248c fix(feeding): "article" already includes a space 2014-02-14 08:07:34 -06:00
Tyler Renelle 07eef7c723 chore(grunt): bailey valentine 2014-02-13 23:29:55 -07:00
Tyler Renelle a6b2191927 fix(valentine): what? cards aren't getting added to array first time,
only 2nd+. Maybe an issue with markModified?
2014-02-13 23:09:00 -07:00
Tyler Renelle 608b829d7e feat(valentine): valentine event 2014-02-13 18:20:12 -07:00
Sabe Jones 33fbc5716b fix(Saddle): Tweak wording 2014-02-12 20:10:07 -06:00
Sabe Jones 3138c0aee5 fix(spells): Capitalization error 2014-02-12 20:08:45 -06:00
Sabe Jones be9ad4db84 fix(feeding): Even better phrasing
chump commit to start a GitHub streak, don't judge me
2014-02-12 18:54:24 -06:00
Matteo Pagliazzi e22f26058e chore(i18n): update german locale 2014-02-12 21:06:54 +01:00
Matteo Pagliazzi 9ded62c09e Merge pull request #149 from HabitRPG/paglias/optimizations
Optimizations
2014-02-12 19:20:56 +01:00
Matteo Pagliazzi 0807deb120 fix(typo): active account to active subscription 2014-02-12 19:20:06 +01:00
Matteo Pagliazzi 207d88757d fix(spritesmith): upload spritesmith 2014-02-12 15:59:08 +01:00
Matteo Pagliazzi ecedb7b547 chore(i18n): update german 2014-02-12 15:58:32 +01:00
Matteo Pagliazzi cddf513359 refactor(grunt): spritesmith cached on server, do not add timestamp to name, remove unused coins icons 2014-02-12 15:11:45 +01:00
Matteo Pagliazzi 5c01dbce74 chore(i18n): update german locale removing old strings not updated 2014-02-12 10:05:05 +01:00
Sabe Jones c0c7095343 Fix typo/phrasing on pet feeding confirmation 2014-02-11 19:59:37 -06:00
Tyler Renelle 1b2bcc4683 feat(event-tracking): track purchases 2014-02-11 17:48:44 -07:00
Matteo Pagliazzi df8a7a9b6e chore(translations): remove all the non translated languages and use the version from transifex for english and german 2014-02-11 21:40:58 +01:00
Matteo Pagliazzi 65545e4eba chore(i18n): german, remove spaces at the beginning and the at the end 2014-02-11 19:56:11 +01:00
Matteo Pagliazzi 8170ac746f chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:35 +01:00
Thomas Lord bbd9dec8b3 Added attribute associations for stock items
Taking stairs is strength-based, reading is intelligence-based, etc.
2014-02-10 21:21:38 -05:00
deilann 3cffc5ac02 Merge pull request #147 from chmac/patch-1
Typo correction
2014-02-10 17:35:48 -08:00
Callum Macdonald caa2593edb Typo correction
This might be a matter of personal taste, but as a native English speaker (albeit a Scottish one) the flow of this sentence doesn't work. Reward you / damage you. In game terminology, maybe it makes sense, but in life terminology, it doesn't. You won't damage me unless you hack my email, kill my cat, or whatever. Reward / penalize are more usual antonyms.
2014-02-11 01:32:46 +00:00
Matteo Pagliazzi a5467fc931 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-shared into develop 2014-02-09 17:18:22 +01:00
Matteo Pagliazzi a8c8b50039 chore(i18n): add base arabic and swedish 2014-02-09 17:16:53 +01:00
Matteo Pagliazzi e7e294333a Merge pull request #140 from luveluen/develop
Update pets.json
2014-02-09 13:03:03 +01:00
Luveluen 757bfa7356 Update pets.json
3 entries added c39d2a8a13
2014-02-09 13:01:11 +01:00
Matteo Pagliazzi 20ed1c3c58 chore(translations): update files 2014-02-09 11:26:34 +01:00
Cole Gleason a2d01e73aa Merge pull request #138 from lorian/beastmaster-count
Fixes beastmaster to not count gryphons
2014-02-08 22:31:50 -06:00
Lorian 914400e159 Simplified run instructions for mocha test. 2014-02-08 20:19:01 -08:00
Lorian 82b58a7435 dropEggs and questEggs now automatically make the full content.eggs list; no manual duplication required. 2014-02-08 20:14:50 -08:00
Lorian 04b73c4058 Added unit tests for proper mount counting and beastmaster achievement, and extended unit tests for proper pet counting. 2014-02-08 17:24:04 -08:00
Lorian c39d2a8a13 Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts. 2014-02-08 16:56:07 -08:00
Matteo Pagliazzi 2882959f96 Merge pull request #135 from luveluen/develop
Spelling and Vocabulary
2014-02-08 19:33:43 +01:00
Luveluen 7a6f501866 Update tasks.json
fixes "Du"
2014-02-08 18:00:18 +01:00
Luveluen 58bb717dc3 Update subscriber.json
fixes
2014-02-08 17:57:24 +01:00
Luveluen e942744948 Update settings.json
"verlauf" "Du"
2014-02-08 17:52:04 +01:00