Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages

This commit is contained in:
Amin Arria
2015-10-19 12:14:38 -04:30
30 changed files with 1950 additions and 1792 deletions

View File

@@ -39,8 +39,10 @@ script(type='text/ng-template', id='modals/showQuest.html')
+questInfo
hr
div(class="#{env.worldDmg.quests ? 'npc_ian_broken' : 'npc_ian'}").pull-left
p=env.t('questSend')
p=env.t('questWarning')
p(ng-if='!env.worldDmg.quests')=env.t('questSend')
p(ng-if='!env.worldDmg.quests')=env.t('questWarning')
p(ng-if='env.worldDmg.quests')=env.t('questSendBroken')
p(ng-if='env.worldDmg.quests')=env.t('questWarningBroken')
.modal-footer
button.btn.btn-default(ng-click='closeQuest(); $close()')=env.t('cancel')
button.btn.btn-primary(ng-click='questInit()')