Commit graph

748 commits

Author SHA1 Message Date
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
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
Luveluen
779a75e448 Update rebirth.json
history -> verlauf du-Du
2014-02-08 17:47:33 +01:00
Luveluen
da7f2ebfb9 Update quests.json
minor fixes
2014-02-08 17:44:54 +01:00
Luveluen
732310325d Update pets.json
several fixes, "drops" ...
2014-02-08 17:42:02 +01:00
Luveluen
b9baad9526 Update npc.json
fixed some mistakes. du-Du
2014-02-08 17:38:34 +01:00
Matteo Pagliazzi
6104767711 fix(css): gems alignment and remove unused code 2014-02-08 17:35:43 +01:00
Luveluen
4454bcf092 Update limited.json
even hier du-Du
2014-02-08 17:27:35 +01:00
Luveluen
41c6d8f441 Update groups.json
"Can't like your own message" ... ...
typos and du-Du
2014-02-08 17:26:50 +01:00
Luveluen
ea297a70f3 Update generic.json
typos
2014-02-08 17:21:05 +01:00
Luveluen
63a1ebae67 Update front.json
typos, du->Du
2014-02-08 17:18:48 +01:00
Luveluen
018eb251b9 Update contrib.json
typos, corrections.
2014-02-08 17:13:07 +01:00
Luveluen
9097d8f4a9 Update character.json
typos; du -> Du (I need to set autocorrect on this...)
2014-02-08 17:07:04 +01:00
Luveluen
34d0346758 Update challenge.json
review:
vocabulary changes, fixed typos.
2014-02-08 16:53:29 +01:00
Matteo Pagliazzi
0aa4d2829e fix(typo): german locale typos 2014-02-08 16:11:21 +01:00
Matteo Pagliazzi
9977d0efa6 fix(typo) 2014-02-08 16:05:43 +01:00
Matteo Pagliazzi
50c13fccb6 fix(typo) 2014-02-08 16:02:00 +01:00
Matteo Pagliazzi
8c3965c775 chore(merge): merge german locale 2014-02-08 15:18:25 +01:00
Tyler Renelle
d21834ad69 Merge pull request #130 from lorian/stealth-balance
Stealth balance
2014-02-07 23:03:15 -07:00
Luveluen
6ffbf205fc Update generic.json
tweaked for recent edits of the english version.

commit 619d254cc0
commit 63f691b00d

February 7th, 20:30 UTC.
2014-02-07 21:30:42 +01:00
Luveluen
ffa7f410c4 Update character.json 2014-02-07 21:26:55 +01:00
Tyler Renelle
7ace7b49b1 fix(critical-hammer): add 40x40 shop icon 2014-02-07 12:31:58 -07:00
Tyler Renelle
6a5df319ed feat(critical-hammer): add Critical Hammer of Bug-Crushing 2014-02-07 11:48:06 -07:00
Matteo Pagliazzi
9eb5f2667d Merge pull request #131 from Sinza-/develop
Add files for translation
2014-02-07 18:55:06 +01:00
Tyler Renelle
63f691b00d feat(premium): add mystery-item present box. Doesn't do anything yet,
will add logic later this month
2014-02-07 10:53:08 -07:00
Tyler Renelle
619d254cc0 feat(rainbow-hair): add rainbow hair colors 2014-02-07 09:45:10 -07:00
Tyler Renelle
b458828b22 refactor(errors): refactor the way errors, offline, & queued ops are handled 2014-02-06 20:18:19 -07:00
Luveluen
c339573957 Create tasks.json 2014-02-07 03:21:47 +01:00
Luveluen
63a3d5e179 Create subscriber.json 2014-02-07 03:21:25 +01:00
Luveluen
503149b6da Create settings.json 2014-02-07 03:20:59 +01:00
Luveluen
80710fbe2a Create rebirth.json 2014-02-07 03:20:34 +01:00
Luveluen
8596f9a8a1 Create quests.json 2014-02-07 03:20:11 +01:00
Luveluen
00237711ac Create pets.json 2014-02-07 03:19:47 +01:00
Luveluen
049c9d33e7 Create npc.json 2014-02-07 03:19:15 +01:00