Commit graph

4247 commits

Author SHA1 Message Date
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
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
Tyler Renelle
6878596cb4 Merge branch 'lefnire/spells' into develop 2014-01-22 00:32:29 -08:00
Tyler Renelle
32dc651bfb Revert "feat(cheating) prevent +habit spamming with a 10s timer"
This reverts commit ad4ca6655a.
2014-01-22 00:29:55 -08:00
Tyler Renelle
47bd6dcb79 fix(spells): more $rootScope spell-casting bug fixes 2014-01-22 00:27:55 -08:00
Tyler Renelle
e0646bb98d fix(spells): add some spells tests, don't send up body to spell paths 2014-01-22 00:16:52 -08:00
Tyler Renelle
c6f7ab8a5c fix(spells): some $rootScope.applying action fixes so cast-ending is
immediate instead of waiting on response. Also, slim down party
population to the essentials to avoid RequestEntityTooLarge
2014-01-21 23:04:01 -08:00
Tyler Renelle
17d60b45ff Merge pull request #2512 from colegleason/version-error
chore(VersionError): add debug code to emails showing completed ops
2014-01-21 22:57:01 -08:00
Cole Gleason
187ea1c739 chore(VersionError): add debug code to emails showing completed ops
This adds a field to the email if there is an error on batchUpdate. This
field contains all the attempted operations. So the last item in the
list would be the operation that we encountered the error at. @lefnire,
mind taking a look at this and pushing if you feel comfortable with
adding more to the emails?
2014-01-22 00:50:14 -06: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
9e69d7959f feat(quests): add level requirement for quests 2014-01-21 17:46:17 -08:00
Tyler Renelle
990c3aa762 test(quests): make sure other members get drop 2014-01-21 15:59:53 -08:00
Tyler Renelle
f478d10c20 fix(quests): bug fix to multi-drop 2014-01-21 15:08:11 -08: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
Tyler Renelle
d9e5725ee1 feat(quests): allow quests to drop multiple items 2014-01-21 13:13:15 -08:00
Tyler Renelle
f71d6957e8 test(quests): test quest drops 2014-01-21 13:07:33 -08:00
Tyler Renelle
18e98abfa1 test(quests): ensure non-questers don't get hurty by boss on cron #2249 2014-01-21 12:45:18 -08:00
Tyler Renelle
07bca1f265 test(quests): start adding quests/bosses quests. Unfortunately it failes because it() is parallel, but Im trying to have each it() setup for the next. Gotta figure somethign out 2014-01-21 09:51:38 -08:00
Tyler Renelle
4efd0f5ed8 fix(bosses): don't reset progress.up when starting a new quest. We want
to be able to carry over damage from the same day a boss battle begins,
even if the dailies were completed before battle-start. Fixes #2168
2014-01-20 16:40:48 -08:00
Tyler Renelle
19dba81603 Merge pull request #2476 from djuretic/travis_status
Add Travis build status to readme
2014-01-20 15:28:12 -08:00
Tyler Renelle
1cd5e994cc Merge pull request #2491 from HabitRPG/sabe/tweak
fix(nodemon): ignore CHANGELOG.md on watch
2014-01-20 15:27:28 -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
Luveluen
c85e3a2107 Update inventory.jade 2014-01-20 19:23:49 +01:00
Luveluen
18eeafafc8 Update inventory.jade 2014-01-20 19:07:50 +01:00
Luveluen
06132f8a48 Update inventory.jade 2014-01-20 18:55:29 +01:00