Commit Graph

354 Commits

Author SHA1 Message Date
GihHubSphinx fe2e0618b8 Make Invite-friends-to-group dialog translatable
UI strings of the dialog of invitation to the group made translatable
2015-05-23 02:44:32 +05:00
GihHubSphinx 2440b312a2 Made two lines translatable
Addressing #10 and #11 in the OP of
https://github.com/HabitRPG/habitrpg/issues/4522

* "Send gift" (in the form that pops up when you click on username
label)
* "Invite Friends" button (in "Members" section in guilds and party)
2015-05-21 17:12:16 +05:00
SabreCat 13faf8d0c7 feat(pets): Sheep Quest 2015-05-20 20:45:18 -07:00
SabreCat 2b72050827 fix(accessories): Buyback for ears
Fixes #5236.
2015-05-20 13:10:05 -07:00
Blade Barringer bd76b762e6 Merge pull request #5212 from HabitRPG/negue-WIP-Push-notifications
Negue wip push notifications
2015-05-18 11:14:53 -05:00
Blade Barringer 46c426856d Correct text 2015-05-17 10:06:40 -05:00
Matteo Pagliazzi dcc48ea7f7 chore(i18n): update locales 2015-05-17 16:07:18 +02:00
Matteo Pagliazzi d6547682be chore(i18n): update locales 2015-05-17 15:54:18 +02:00
Blade Barringer 43cb46d83d Merge pull request #5174 from agentx999/skills_clickontask
added "click on task" to necessary skill descriptions
2015-05-16 23:08:11 -05:00
Blade Barringer da20a493c6 Merge branch 'hairlessbear-level_100_attribute_message' into develop 2015-05-16 22:50:57 -05:00
Blade Barringer bc967dd850 Adjust wording of attribute points warning 2015-05-16 22:50:24 -05:00
hairlessbear 52d869b195 Fixed issue #5203 2015-05-16 16:52:58 -04:00
Blade Barringer d7ce151500 Add translatable strings 2015-05-14 21:56:16 -05:00
Alys d6e1d765da adjust Inn message when user is already Resting - https://github.com/HabitRPG/habitrpg/issues/5128#issuecomment-99233779 2015-05-14 08:13:13 +10:00
Sabe Jones 89d1d63b24 Merge pull request #5198 from SabreCat/pet-skins
Pet Skins and Ears
2015-05-13 15:44:23 -05:00
Sabe Jones 84b333e5c1 fix(unlocks): Handle undefined/null balance 2015-05-13 15:34:23 -05:00
Sabe Jones 6e27b7af9d fix(purchases): Handle undefined/null balance 2015-05-13 15:15:40 -05:00
Matteo Pagliazzi b639896ae6 chore(i18n): update locales 2015-05-13 19:47:59 +02:00
Sabe Jones 35ff90b4d3 Merge remote-tracking branch 'origin/new_inn_behavior_PR' into pet-skins 2015-05-13 12:12:57 -05:00
Sabe Jones 2b8414766b chore(grunt): compile sprites 2015-05-13 11:19:33 -05:00
Sabe Jones 29109051d7 feat(customize): Animal skins and ears
Implements a base-pet-themed set of avatar skins and head accessories, the latter of which has additional handling for the user to purchase them from the Avatar Customization page.
2015-05-13 11:19:08 -05:00
Blade Barringer dca45d7845 Enable new inn behavior 2015-05-13 08:44:08 -05:00
Alys 2ac763cc50 add message about Resting in the Inn to top of Dailies column when preferences.sleep is true 2015-05-13 16:56:52 +10:00
Negue 1cc07129f1 Merge branch 'develop' into pushNotifications2
Conflicts:
	test/api.mocha.coffee
2015-05-10 22:01:41 +02:00
Blade Barringer c123ca6a42 Correct casing of translatable string 2015-05-10 09:13:05 -05:00
GihHubSphinx 6c5d9f3a6c Tried to make line translatable
Tried to make the "Only group leader can create challenges" line in the
guild creation dialog translatable
2015-05-10 08:59:43 -05:00
Alys 1dec4ba7a6 allow MP gained for Habits and Dailies to be increased when a critical hit occurs (crits are triggered in addPoints) 2015-05-10 18:17:17 +10:00
Blade Barringer 71c65c7a73 change coupon route in angular router to promo 2015-05-08 21:24:57 -05:00
Blade Barringer 1bfc82c636 Merge branch 'develop' into NotGonnaGitUs-develop 2015-05-08 21:02:09 -05:00
agentx999 84979b137d Update spells.json
modified Backstab, Brutal Smash, Burst of Flames, and Pickpocket descriptions
2015-05-08 18:32:18 -07:00
Negue 90edb7719f Merge branch 'develop' into pushNotifications2 2015-05-08 23:21:18 +02:00
NotGonnaGitUs ef0b96e5e4 Changed promo code text. 2015-05-08 10:33:26 +05:30
negue e628dba5e8 Merge pull request #5087 from negue/copyMessageTodo
copy chat messages as todo
2015-05-07 22:21:42 +02:00
Sabe Jones 040e6e0a41 chore(grunt):compile sprites 2015-05-06 19:53:08 -05:00
Sabe Jones 00db42b6c0 feat(backgrounds): May BGs 2015-05-06 19:41:54 -05:00
Matteo Pagliazzi a91b544830 typo 2015-05-06 16:18:14 +02:00
Matteo Pagliazzi a1fb1468ba chore(i18n): update locales 2015-05-05 19:52:20 +02:00
Tyler Renelle a090fed10b feat(analytics): "motivate yourself" 3 variants @lemoness 2015-05-04 15:31:00 -04:00
Blade Barringer 41a6818ea8 Revert inn text 2015-05-03 20:21:53 -05:00
Matteo Pagliazzi 0454938303 chore(i18n): update locales 2015-05-03 21:24:53 +02:00
NotGonnaGitUs a45390321e Patched translation fixes and added a few phrases to locales. 2015-05-03 23:41:42 +05:30
Blade Barringer b408f016fd Merge pull request #5119 from NotGonnaGitUs/develop
Made front page translatable
2015-05-03 09:43:43 -05:00
Blade Barringer e09d4f3a91 Commented out new dailies behavior 2015-05-03 08:21:29 -05:00
NotGonnaGitUs 4d5ec83234 Removed objects not used anywhere by env.t function. 2015-05-03 14:33:46 +05:30
Blade Barringer 68aedda3bb Merge branch 'develop' into hairlessbear-cron_dailies_fix 2015-05-02 22:10:58 -05:00
Blade Barringer c81d321366 Checklists should reset even when resting in the inn 2015-05-02 22:10:26 -05:00
NotGonnaGitUs 0fc068ea93 Removed objects not used by front.jade, footer.jade or login-modale.jade 2015-05-02 20:02:20 +05:30
Blade Barringer cad47dc2c0 Fixes #5123 2015-05-02 09:28:55 -05:00
Blade Barringer ace1d2a9e2 Update sprites with shading - @lemoness 2015-05-02 09:26:11 -05:00
NotGonnaGitUs 21f470cd5a Removed objects not used front.jade or shared/footer.jade 2015-05-02 17:42:38 +05:30