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
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
d63cc4da8f
merge cron-fix
2015-01-06 08:55:48 +01:00
285ff6228c
fix(backgrounds): Frigid, not Snowy, Peak
2015-01-05 16:41:23 -06:00
0bfc5b37c0
feat(backgrounds): January backgrounds
2015-01-05 16:36:11 -06:00
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
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
5d6da27a70
Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg
2015-01-04 16:10:30 -06:00
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
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
571cc9ed1d
change ngModel to text
2015-01-01 20:31:21 +01:00
f900e6451c
add remove-watch and use-timeout attribute to the markdown directive
2015-01-01 18:20:33 +01:00
439f72cb91
Separated out the check for nyeRecieved and pushing to the array
2014-12-31 18:35:59 -06:00
a7dd2dbd74
add canOwn code to nye2014 hat
2014-12-31 16:25:12 +10:00
8fabcc4ffd
Merge pull request #425 from SabreCat/nye
...
New Year's event features
2014-12-30 22:17:23 -06:00
dd3ec20e5e
feat(NYE): Silly Party Hat
2014-12-30 21:20:07 -06:00
5fc001e4f6
feat(google-discount): add google discount
2014-12-30 20:05:51 -07:00
11beb14e14
fix(NYE): t undefined
2014-12-30 20:42:32 -06:00
e7388822f1
fix(NYE): Card to self exploit
2014-12-30 20:33:45 -06:00
5623fb0078
fix(NYE): I18N shop text
2014-12-30 20:14:56 -06:00
dd13727765
feat(NYE): New Year's cards
2014-12-30 19:58:40 -06:00
7facfd1b84
Changed armorSpecialSkiText to armorSpecialSkiNotes for the notes
2014-12-30 22:28:46 +05:30
9e74d94e48
WIP(NYE): New Year's Cards
2014-12-29 20:57:12 -06:00
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
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
71269a762f
reinsert comment that was accidentally removed
2014-12-27 07:28:06 +10:00
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
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
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
d7f9760c0f
fix typo so that Ryan doesn't make pointed comments at me
2014-12-27 07:28:05 +10:00
87f51913d0
prevent off-class items and free items being lost on death
2014-12-27 07:28:05 +10:00
6c8f9e39b6
fix(event): Mystery typo
2014-12-25 18:05:04 -06:00
9471393776
feat(event): 2014 Mystery Items
2014-12-25 16:08:06 -06:00
41f4ab7b8a
feat(event): Implement Seasonal Shop
2014-12-25 14:58:25 -06:00
8ec9f79188
feat(event): Winter Wonderland 2015 gear
2014-12-21 12:37:37 -06:00
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
7fd4cebbdc
fix(quest): Penguin corrections
...
Fix missing egg item and line breaks in quest text
2014-12-09 20:44:10 -06:00
d25455fa5a
feat(quest): Implement Penguin pet quest
2014-12-09 20:21:20 -06:00
3de86f35cb
fix(plans): attempted fix for: Cast to number failed for value "NaN" at
...
path "purchased.plan.consecutive.count", see https://github.com/HabitRPG/habitrpg/issues/4317
2014-12-06 12:49:19 -07:00
2018cc84ab
fix(gem-cap) use customerId in gem purchase
2014-12-05 15:11:27 -07:00
6ac6f4d476
fix(plans): fix conversion cap
2014-12-03 20:24:35 -07:00
9e64bc3788
fix(plans): move plan reset up for people in inn
2014-12-03 20:16:33 -07:00
9d3e6c71fe
fix(plans): possible safe-check of gemcapextra cc @Sabrecat
2014-12-03 20:03:40 -07:00
3dd775235d
fix(): remove some logs
2014-12-03 19:05:54 -07:00
bf7e1e66ed
feat(plans): time traveler - by full sets
2014-12-03 15:24:08 -07:00
d81badde69
feat(plans): add time traveler - buy individual mystery items
2014-12-03 15:24:08 -07:00
76be625f6d
feat(plans): add consecutive-month benefits for subscribers
2014-12-03 15:24:08 -07:00
4d8a9c5287
feat(backgrounds): December purchasables
2014-11-30 22:54:37 -06:00
703451d452
fix(mystery): typo
2014-11-30 14:11:49 -07:00
5ee9f4904a
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
locales/en/gear.json
2014-11-29 08:26:23 -07:00
Alice Harris