8f90d154a0
Merge remote-tracking branch 'upstream/develop' into mountmaster
...
Conflicts:
dist/habitrpg-shared.css
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
2015-01-08 11:30:53 -06: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
5d6da27a70
Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg
2015-01-04 16:10:30 -06:00
c0f51379e7
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster
...
Conflicts:
dist/habitrpg-shared.js
2015-01-01 16:25:56 -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
439f72cb91
Separated out the check for nyeRecieved and pushing to the array
2014-12-31 18:35:59 -06:00
a5a7d22ce4
Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster
2014-12-31 13:17:21 -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
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
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
8ec9f79188
feat(event): Winter Wonderland 2015 gear
2014-12-21 12:37:37 -06:00
324077566b
Merge branch 'mountmaster' of https://github.com/taldin/habitrpg-shared into taldin-mountmaster
...
Conflicts:
script/content.coffee
2014-12-11 08:31:19 -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
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
645327b9b0
feat(event): Thanksgiving updates
2014-11-26 19:33:01 -06:00
22cddb1086
feat(mystery): mystery 201411
2014-11-24 19:34:47 -07:00
9ececc9565
feat(quest): Implement Owl quest
2014-11-18 20:23:27 -06:00
000eefc695
feat(quest): add owl to egg types
2014-11-18 19:49:33 -06:00
dacaf41d63
fix(MMM): typo
2014-11-18 16:39:42 -08:00
e477f6482d
Shouldn't get Noble Tunic from Knight Quest
...
Fixed getting both Jean Chalard's Noble Tunic and Mustelaine's Offhand
Morning Star. Removed the line awarding the Tunic (armor_special2).
2014-11-17 17:50:22 -08:00
bc59db2c4d
Fix rebuying Mustelaine's Morningstar after death
...
Modifies script\content.coffee.
2014-11-17 16:53:09 -08:00
d74f9d7a47
fix(goldenknight): add shop img for shield_special_goldenknight and fix
...
translation issues, fixes https://github.com/HabitRPG/habitrpg/issues/4249
2014-11-17 12:14:14 -08:00
cbd436a867
fix(invite-friends): canbuy->canBuy typo
2014-11-13 17:53:09 -07:00
9bb40d6a96
feat(invite-friends): add basilist quest
2014-11-12 19:23:43 -07:00
97a9ecf1f4
feat(quests): goldeknight auto-drops at 40
2014-11-11 21:04:21 -07:00
73bdc0dbaf
feat(quests): golden knight chain
2014-11-11 20:59:31 -07:00
c53e6a23cf
feat(backgrounds): add new backgrounds
2014-11-04 19:45:42 -07:00
1151002dd6
feat(fall): disable candy drops
2014-11-02 17:02:09 -07:00
77d92b84dc
added mountmaster support
...
pets: added language support - needs to be commuted to other languages'
content.coffee - added api.mounts and api.questmounts index.coffee -
revised api.countMounts to remove quest mounts from the list
2014-10-30 12:35:14 -07:00
d6b41fd63f
fix(mystery): typo
2014-10-24 20:37:50 -06:00
3c249725af
feat(mystery): mystery items 2014-10
2014-10-24 20:32:40 -06:00
bffce00a24
Fix possible bug when losing Jean Chalard's tunic
...
Can't buy back armor_special_2 without being a backer. Other legendary
quest items have this extra code.
2014-10-24 13:24:09 -07:00
d3ca101dd8
feat(quests): add moonstone chain, lvl drop at 60
2014-10-23 10:33:20 -06:00
Blade Barringer