Commit Graph

1618 Commits

Author SHA1 Message Date
Marcelo Sizer 8d41c44ad7 Fix version conflict 2014-01-26 17:37:54 -02:00
Marcelo Sizer 8f4016d669 Split main.json 2014-01-26 17:30:41 -02:00
Matteo Pagliazzi 2eb7ea5e91 Merge pull request #2550 from HabitRPG/paglias/translations-refactoring
Refactor translations
2014-01-24 13:53:46 -08:00
Matteo Pagliazzi 5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Cole Gleason 0c935f9c9a Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-01-24 15:29:17 -06:00
Cole Gleason 626da5681f fix(party): Round boss health up instead of to nearest integer
If the boss has something like 0.2 HP it shows as 0 which is confusing
to the user. Let's round up instead.

Fixes #2504.
2014-01-24 15:27:30 -06:00
Matteo Pagliazzi d107db7013 refactor(translations) 2014-01-24 21:27:06 +01:00
Matteo Pagliazzi 8e99186e9c refactor(translations): achievements 2014-01-24 20:07:02 +01:00
Matteo Pagliazzi a9095f3464 fix(translations): remove translations for privacy & terms 2014-01-24 17:38:21 +01:00
Marcelo Sizer ed71522131 Fix version conflict 2014-01-24 07:28:30 -02:00
Marcelo Sizer fe99bca10f Fix spacing errors #2536 2014-01-23 21:58:38 -02:00
Matteo Pagliazzi 13a7cc9d55 improve(translations): merge pr and lots of fixes 2014-01-23 17:02:16 +01:00
Matteo Pagliazzi 50953ddf81 Merge pull request #2525 from Sinza-/develop
Replace a line for env.t
2014-01-23 06:01:06 -08:00
Luveluen 6f3229c679 Update tavern.jade 2014-01-23 10:16:32 +01:00
Luveluen 669789df67 Update index.jade 2014-01-23 09:45:34 +01:00
Luveluen 50f992b63c Update hall.jade 2014-01-23 09:43:17 +01:00
Luveluen ab84219835 Update group.jade 2014-01-23 09:40:31 +01:00
Luveluen ed180692e3 Update create-group.jade 2014-01-23 09:36:32 +01:00
Luveluen 6fb88ee1b5 Update chat-message.jade 2014-01-23 09:35:18 +01:00
Luveluen 34fe364fea Update chat-box.jade 2014-01-23 09:33:41 +01:00
Luveluen 2282e36bac Update challenges.jade 2014-01-23 09:31:33 +01:00
Tyler Renelle 9fa4521739 feat(challenges): add angular-ui-select2 for simpler find/select
challenge winner.
2014-01-22 23:22:21 -08:00
Tyler Renelle ae0d758d8f feat(challenges): add button for csv export 2014-01-22 23:22:21 -08:00
Sabe Jones d3f4a561fd docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
Requires commit 667a426 on habitrpg-shared. Adds a line to the Rebirth modal informing users that limited edition gear can be repurchased after Rebirth. Removed a line from the top of the modal to make room, preventing scrolling at ordinary resolutions--I'm open to suggestions if we think that line is crucial.
2014-01-22 20:45:04 -06:00
Sabe Jones d782fc6b6a fix(stats): Better layout for attribute point allocation 2014-01-22 20:34:03 -06:00
Marcelo Sizer 4d834c5c2b Replace a line for env.t 2014-01-22 22:37:09 -02:00
Luveluen 077e23519c Update avatar.jade 2014-01-23 00:24:15 +01:00
Luveluen c4a230d73c Update avatar.jade 2014-01-23 00:19:42 +01:00
Luveluen 0fb8ec9a8b Update tavern.jade
line 68 and following after confirmation
2014-01-23 00:04:17 +01:00
Luveluen 13503986fb Update index.jade
line 39
2014-01-22 23:43:58 +01:00
Luveluen 9f56426472 Update hall.jade
line 47!
2014-01-22 23:34:06 +01:00
Luveluen 098247233f Update group.jade
line 133 problem
2014-01-22 23:21:19 +01:00
Luveluen 39eb590299 Update create-group.jade 2014-01-22 22:51:57 +01:00
Luveluen 7540f6acc9 Update challenges.jade 2014-01-22 22:16:54 +01:00
Luveluen 11a558cd20 Update challenge-box.jade 2014-01-22 21:42:48 +01:00
Matteo Pagliazzi c51c9ad03b improve(translation): merge @Sinza- pr 2014-01-22 19:51:30 +01:00
Marcelo Sizer ef97abf1bf Fix diverging older version 2014-01-22 16:16:19 -02:00
Marcelo Sizer bb13f37525 Fix identation 2014-01-22 16:07:04 -02:00
Marcelo Sizer 6ada7f300f Replace hard-coded strings for env.t on views/shared/modals folder 2014-01-22 16:04:28 -02:00
Matteo Pagliazzi 5a03409e33 Revert "improve(translations): translated shared/modals/achievements"
This reverts commit 090c28a35b.
2014-01-22 17:38:19 +01:00
Matteo Pagliazzi eec6ead971 Revert "improve(translations): translate death modal"
This reverts commit 50333026b6.
2014-01-22 17:34:54 +01:00
Matteo Pagliazzi 50333026b6 improve(translations): translate death modal 2014-01-22 17:18:35 +01:00
Matteo Pagliazzi 090c28a35b improve(translations): translated shared/modals/achievements 2014-01-22 17:08:12 +01:00
Matteo Pagliazzi a6c67f1781 fix(translations): merge @luveluen pull request, fix some syntax 2014-01-22 16:09:32 +01:00
Luveluen 4f07ab39b0 Update inventory.jade 2014-01-22 12:10:51 +01:00
Sabe Jones 5ddf09fe13 fix(settings): reintroduce space between captions and help bubbles stripped during localization 2014-01-21 19:52:04 -06:00
Tyler Renelle f16654d235 feat(quests): add canBuy so we can exclude certain items from the
market (if you can only find them on quest-drop, etc). This isn't the
prettiest, change?
2014-01-21 14:44:53 -08:00
Tyler Renelle e48c7277f8 fix(quests): list multiple rewards in dialog 2014-01-21 14:12:09 -08:00
Luveluen 8b97438607 Update stable.jade 2014-01-20 19:44:33 +01:00
Luveluen e47afa8965 Update stable.jade 2014-01-20 19:41:17 +01:00