Blade Barringer
42e1020c60
Added back in showCompleted=false to display tags
2015-01-19 18:50:54 -06:00
Alice Harris
da1a11b62d
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
2015-01-19 17:53:48 +10:00
Tyler Renelle
81bdb2481c
refactor(services): move to a single "habitrpg" module for services /
...
directives / filters
2015-01-17 18:42:01 -07:00
Tyler Renelle
dbeb6f8c1e
refactor(config): add mobile
2015-01-16 18:31:37 -07:00
Tyler Renelle
6b6802a27a
refactor(config): move httpInterceptor from website/app.js to
...
habitrpg-shared/config.js. Will merge in mobile soon
2015-01-16 16:48:35 -07:00
Matteo Pagliazzi
c301bd3e89
fix(console): remove console.log
2015-01-16 17:46:47 +01:00
Matteo Pagliazzi
4a22b1dc57
fix(sync): fix for when data is null, ie. server offline
2015-01-16 17:33:15 +01:00
Matteo Pagliazzi
1f1cd750cb
chore(i18n): update locales
2015-01-16 17:16:48 +01:00
Sabe Jones
c260362d96
feat(quest): T-Rex pet
...
Implements two new Quests, and the "tyrannosaur" pets included as rewards for same.
2015-01-15 15:45:56 -06:00
Matteo Pagliazzi
ce1c0d9008
Merge pull request #438 from crookedneighbor/prevent-type-changing
...
Prevent type changing
2015-01-14 19:41:44 +01:00
Blade Barringer
a805b4f0c9
Brought in lefnire's change so type cannot be changed on updateTask
2015-01-13 20:17:36 -06:00
Sabe Jones
4e50c43da2
fix(world-boss): Scale based on current HP
2015-01-13 13:19:38 -06:00
Sabe Jones
a2be1bc472
fix(world-boss): Bit stronger healing
2015-01-13 12:00:06 -06:00
Sabe Jones
480b4e2764
feat(world-boss): Healing on rage
2015-01-13 11:50:15 -06:00
Alice Harris
27dab4ae4e
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
Conflicts:
dist/habitrpg-shared.js
2015-01-11 14:18:37 +10:00
Sabe Jones
fde64b0bdf
feat(event): World Boss
...
Implements the 2015 Winter Wonderland world boss: the Abominable Stressbeast of Stoïkalm!
2015-01-08 15:24:26 -06:00
Matteo Pagliazzi
d63cc4da8f
merge cron-fix
2015-01-06 08:55:48 +01:00
Sabe Jones
285ff6228c
fix(backgrounds): Frigid, not Snowy, Peak
2015-01-05 16:41:23 -06:00
Sabe Jones
0bfc5b37c0
feat(backgrounds): January backgrounds
2015-01-05 16:36:11 -06:00
negue
1bdacffe96
Merge pull request #428 from negue/markdownDirective
...
add remove-watch and use-timeout attribute to the markdown directive
2015-01-05 22:11:38 +01:00
Brandon Reid
15eb64c7d2
Fixed cron dayStart option.
...
Wrote test cases to verify fix.
Fixed test cases that were incorrect.
2015-01-05 19:20:21 +01:00
Blade Barringer
5d6da27a70
Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg
2015-01-04 16:10:30 -06:00
Melissa Mcewen
aa6abeecaa
Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varibles to other spells
2015-01-01 14:47:04 -06:00
Melissa Mcewen
4a30363bc7
Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varible to spell
2015-01-01 14:30:30 -06:00
Negue
571cc9ed1d
change ngModel to text
2015-01-01 20:31:21 +01:00
Negue
f900e6451c
add remove-watch and use-timeout attribute to the markdown directive
2015-01-01 18:20:33 +01:00
Blade Barringer
439f72cb91
Separated out the check for nyeRecieved and pushing to the array
2014-12-31 18:35:59 -06:00
Alice Harris
a7dd2dbd74
add canOwn code to nye2014 hat
2014-12-31 16:25:12 +10:00
Sabe Jones
8fabcc4ffd
Merge pull request #425 from SabreCat/nye
...
New Year's event features
2014-12-30 22:17:23 -06:00
Sabe Jones
dd3ec20e5e
feat(NYE): Silly Party Hat
2014-12-30 21:20:07 -06:00
Tyler Renelle
5fc001e4f6
feat(google-discount): add google discount
2014-12-30 20:05:51 -07:00
Sabe Jones
11beb14e14
fix(NYE): t undefined
2014-12-30 20:42:32 -06:00
Sabe Jones
e7388822f1
fix(NYE): Card to self exploit
2014-12-30 20:33:45 -06:00
Sabe Jones
5623fb0078
fix(NYE): I18N shop text
2014-12-30 20:14:56 -06:00
Sabe Jones
dd13727765
feat(NYE): New Year's cards
2014-12-30 19:58:40 -06:00
Shared
7facfd1b84
Changed armorSpecialSkiText to armorSpecialSkiNotes for the notes
2014-12-30 22:28:46 +05:30
Sabe Jones
9e74d94e48
WIP(NYE): New Year's Cards
2014-12-29 20:57:12 -06:00
Sabe Jones
f7d45c951e
feat(seasonal): Implement snowball
...
Minor refactoring of special spell purchasing, and turns snowball into Gold- instead of Gem-purchasable.
2014-12-29 19:38:43 -06:00
Alice Harris
7d74f36466
improve code for user.items.gear.owned.toObject as lefnire suggested in https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55528155
2014-12-27 07:28:06 +10:00
Alice Harris
71269a762f
reinsert comment that was accidentally removed
2014-12-27 07:28:06 +10:00
Alice Harris
8678e10958
improve iteration over all owned items to correctly handle mogoose toObject - ref https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55469925
2014-12-27 07:28:06 +10:00
Alice Harris
0391d1afc4
add mostly pointless comment to trigger a new Travis build test since the last one didn't do what I wanted :)
2014-12-27 07:28:05 +10:00
Alice Harris
abc2f59b57
allow the free weapon_warrior_0 equipment to be lost on death so that new players can experience equipment loss
2014-12-27 07:28:05 +10:00
Alice Harris
d7f9760c0f
fix typo so that Ryan doesn't make pointed comments at me
2014-12-27 07:28:05 +10:00
Alice Harris
87f51913d0
prevent off-class items and free items being lost on death
2014-12-27 07:28:05 +10:00
Sabe Jones
6c8f9e39b6
fix(event): Mystery typo
2014-12-25 18:05:04 -06:00
Sabe Jones
9471393776
feat(event): 2014 Mystery Items
2014-12-25 16:08:06 -06:00
Sabe Jones
41f4ab7b8a
feat(event): Implement Seasonal Shop
2014-12-25 14:58:25 -06:00
Sabe Jones
8ec9f79188
feat(event): Winter Wonderland 2015 gear
2014-12-21 12:37:37 -06:00
Ben Lind
e1d44cc54f
HabitRPG/habitrpg#3260 Buttonless habit full width
...
When the user has neither a plus nor a minus button on
one of their habits, the habit’s title will now span the entire
width of the task div instead of having a gap to the left.
2014-12-18 14:01:31 -06:00
