Commit Graph

9193 Commits

Author SHA1 Message Date
Matteo Pagliazzi e7682a14f6 fix(i18n): use strings 2014-06-07 14:26:11 +02:00
Tyler Renelle 38a2c8d0f4 Merge pull request #3535 from OverloadUT/fix-spells-mana-check
API rejects spell cast if not enough mana
2014-06-06 15:56:34 -06:00
Tyler Renelle 09392aca24 fix(IE): Remove comment triggering quirks mode in IE, fixes #3550 2014-06-06 14:00:47 -06:00
Tyler Renelle 5d2399015e Merge pull request #222 from Alys/equip-fix2
show "unequipped" message instead of "equipped" when taking off gear
2014-06-06 13:58:06 -06:00
Tyler Renelle a5d3fb1907 Merge pull request #3563 from bountysource-support/patch-1
Add Bountysource badge to README
2014-06-06 08:48:35 -06:00
Tyler Renelle 4aa938dfd9 chore(bailey): june mystery item, earthquake thingy 2014-06-05 22:59:06 -06:00
Tyler Renelle 1b6bf43367 feat(mystery): june gift box 2014-06-05 22:55:24 -06:00
benmanley 9cd42524ec refactor(filters.styl): minor layout changes 2014-06-05 16:19:22 +01:00
benmanley 5b689b38df refactor(avatar.styl): add text shadow to lvl label 2014-06-05 16:19:22 +01:00
benmanley 57eb80f9db refactor(.hero-stats): restyle status meters
Add text to icons to clarify purpose of each bar
Tidy up tooltip behaviour
Aesthetic changes
2014-06-05 16:19:22 +01:00
bountysource-support 03fafce007 Add Bountysource badge to README
Because you have some open bounties, we thought you might want to display this badge in your README!
2014-06-04 16:26:08 -07:00
Tyler Renelle 5a73923d0a Merge pull request #3540 from vIiRuS/patch-1
Update API Parameter documentation for Equip call
2014-06-04 14:56:28 -04:00
Tyler Renelle f4022f692a Merge pull request #3190 from denis-sokolov/jshintrc
feat(jshint): add initial config
2014-06-04 14:44:38 -04:00
deilann f290840995 Merge pull request #3554 from Gaelan/dry_routes
DRY up src/routes/pages.js.
2014-06-03 23:29:03 -07:00
Denis Sokolov c26d51ed5e chore(migrations): cleanup unused json library, added in 999669a2, not removed in cbe23f638a 2014-06-04 15:26:28 +09:00
Bob Example 1b3521e3b3 DRY up src/routes/pages.js. 2014-06-01 23:03:33 -07:00
Matteo Pagliazzi 3013cbe654 chore(i18n): update locales and add british english 2014-05-29 18:21:29 +02:00
Matteo Pagliazzi f10b9cbfc6 feat(i18n): support british english 2014-05-29 18:20:40 +02:00
Matteo Pagliazzi 8c0b815653 chore(i18n): add strings and update locales 2014-05-28 18:10:25 +02:00
Matteo Pagliazzi df8eb107cd fix(i18n): use strings 2014-05-28 18:07:25 +02:00
Matteo Pagliazzi 5ffabd3633 chore(i18n): update locales 2014-05-28 17:51:44 +02:00
deilann 44a53f3839 improve(settings): add warning to API page
https://github.com/HabitRPG/habitrpg/issues/3049
2014-05-27 22:35:02 -07:00
Phillip Thelen d86f3caeaa Update API Parameter documentation for Equip call
the function that is called actually expects different values than specified in the documentation.

This is related to #3525.
The API itself works, it just does no validation of the input and the documentation is wrong, which is why I used it wrong.

Having some kind of validation would probably still a good idea.
2014-05-27 23:54:58 +02:00
deilann 103a0c895b improve(donations): remove reference to developers
Should reduce confusion about where gems money is going, especially if a dev fundraiser will be started.
2014-05-26 22:14:17 -07:00
Alice Harris 9f084e1ac4 show "unequipped" message instead of "equipped" when taking off gear 2014-05-27 12:08:15 +10:00
Greg Laabs 1bcc31683b Update spell cast test to ensure user has mana 2014-05-26 13:15:55 -07:00
Greg Laabs 6b7925b227 API rejects spell cast if not enough mana
Fix #3493 “API does not validate if user has enough mana”
2014-05-26 09:28:23 -07:00
Matteo Pagliazzi b2ef756443 Merge pull request #3527 from OverloadUT/locale.ignore.system.files
Translation loader now ignores non-directories
2014-05-26 17:27:48 +02:00
Greg Laabs 11595caeb5 Only load .json files from locale directories
This opens up the possibility of putting READMEs or what have you
inside locale directories, and will avoid problems if system files or
folders end up in the locales.
2014-05-26 08:18:48 -07:00
Greg Laabs 84e1223809 Locale loader now ignores non-directories
Locales must be stored in directories and the code previously crashed
if there were any unexpected files in the locale folder. Now the code
simply ignores all non-directories.
2014-05-25 09:13:23 -07:00
Greg Laabs 49772bb571 Translation loader now ignores system files
I was having an issue with habitrpg failing to load when OSX created a
.DS_Store file in the locales directory. This code fixes that by
ignoring all hidden files (files that start with “.”)
2014-05-24 18:04:32 -07:00
Matteo Pagliazzi 506156f625 chore(i18n): update locales 2014-05-24 16:04:58 +02:00
Greg Laabs 04034dbdf1 Hide task control buttons during editing 2014-05-23 19:54:32 -07:00
Tyler Renelle 29be5d6e3e feat(mystery): may 2014 mystery item 2014-05-23 00:34:32 +02:00
Tyler Renelle cfd2c427e8 feat(mystery): add 05/2014 mystery item 2014-05-23 00:33:39 +02:00
Tyler Renelle c72cbb014e Merge pull request #3467 from dmonllao/ignore-vim-tmp
chore(nodemon): ignore Vim temp files
2014-05-22 15:59:03 -06:00
Tyler Renelle 4c6fea4fd5 Merge pull request #3511 from thepeopleseason/vagrant_update_140520
fix(vagrant): explicitly call bower install
2014-05-22 15:55:04 -06:00
Tyler Renelle 73b8128af9 fix(accessories): add body accessory to user model, fixes https://github.com/HabitRPG/habitrpg/issues/3346 2014-05-22 23:23:30 +02:00
Tyler Renelle c441ae418b fix(accessories): add body accessory to user model, fixes #3346 2014-05-22 23:23:26 +02:00
Tyler Renelle 082ec6fe1d Merge pull request #221 from Alys/fix
fix #3513 - if contrib level is NaN, use 0
2014-05-22 02:26:48 -06:00
Alice Harris c09e06e73a fix #3513 - if contrib level is NaN, use 0
Fixes (I hope) https://github.com/HabitRPG/habitrpg/issues/3513. NOTE that private code will need to be edited too - ref https://github.com/HabitRPG/habitrpg-shared/commit/f49ed5436c60d6b135909a3c8714347d99499701
2014-05-22 16:25:08 +10:00
James Hsiao bbd14bd47c fix(vagrant): explicitly call bower install 2014-05-21 23:11:19 -04:00
deilann c879f46c07 Merge pull request #3507 from yafinee/no_bubble_if_mount
#3054 - When feeding/saddling, ineligible pets should not get the green ...
2014-05-21 13:40:10 -07:00
Yafinee ff612555ea #3054 - When feeding/saddling, ineligible pets should not get the green bubble 2014-05-21 19:54:20 +00:00
Tyler Renelle 25ce644915 feat(mystery): 0 GP mystery items @deilann 2014-05-21 08:49:51 -06:00
Tyler Renelle 912f2152a1 chore(grunt): grunt 2014-05-21 08:29:35 -06:00
Matteo Pagliazzi ff5bddff24 fix(i18n): update broken code inside translations 2014-05-20 17:20:05 +02:00
Matteo Pagliazzi 3ca2d012c1 chore(i18n): update locales 2014-05-20 16:48:42 +02:00
Sabe Jones 365993870a fix(text): The Potion that gives Health...
...is a Health Potion.
2014-05-19 19:00:37 -05:00
Sabe Jones f49ed5436c feat(drops): Tweak contrib bonuses
At @deilann's request, divide the drop chance bonus for contributor levels in half and add a +1/level contributor bonus (subject to the subscription multiplier once implemented in private code) to drop cap.
2014-05-18 22:42:31 -05:00