380265731f
feat(world-boss): Exhaust Ian's text
2015-10-14 21:02:59 -04:00
e88030e15f
Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
...
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
825b316ba8
fix(analytics): Cap progressUp
...
Previously, users could cron with enormous quest progress values, and this would be logged to the cron event in Analytics. However, for the purposes of damaging world bosses, quest progress is capped at 900. Given that progressUp is primarily used to predict world boss damage, this commit now caps progressUp in analytics at 900 as well.
2015-10-13 14:27:16 -04:00
30de99b700
adjust world bosses FAQ answer
2015-10-13 06:49:07 +10:00
dcf17b5505
feat(event): Jack-O'-Lantern mounts
2015-10-12 14:49:12 -04:00
02133600ce
Add ios question to content
2015-10-12 07:40:31 -05:00
ece3e0d0aa
add FAQ item for World Bosses
2015-10-12 21:26:59 +10:00
20415da586
Merge pull request #6018 from dcecile/develop
...
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
4044b0cb64
fix(world-boss): Update mechanics explanation
2015-10-08 18:48:13 -04:00
60cc428b81
chore(i18n): update locales
2015-10-08 17:42:10 -05:00
d873848f81
Commit missing file
2015-10-08 17:37:10 -05:00
0ccf07a4e0
Compile sprites
2015-10-08 17:32:34 -05:00
ccd77090f4
Fix css template for sprites
2015-10-08 17:31:32 -05:00
58801f5025
fix(world-boss): Don't repeat explanation
2015-10-08 13:17:49 -04:00
291a135fe1
Merge pull request #6023 from HabitRPG/sabrecat/world-boss
...
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
1d4536fc47
fix(sprites): Remove errant blob
2015-10-08 10:59:44 -05:00
aba3908170
chore(gulp): Compile sprites
2015-10-07 15:15:21 -04:00
22284bbc24
Issue #2606 - Verify/fix indices during sortTask
...
Because the 'sortTask' operation uses a 'from' index and a 'to'
index as parameters, the server needs to check if these indices
are valid before performing the client's request. If the task ID
doesn't match the task at the 'from' index, then it's clear that
the client was looking at a preened list of todos (everything except
more-than-3-days-old-non-quest completed tasks). In that case, try
to recalculate the indices before continuing.
2015-10-06 21:24:34 -04:00
51355f7eea
fix(quest-eggs): Short-circuit canBuy
...
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
2015-10-06 16:56:17 -04:00
d27fb9dba2
WIP(world-boss): Rage and rewards
...
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
3ca836a81c
fix(world-boss): Pass test
...
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
2015-10-05 17:18:44 -04:00
f6abcc0ddf
WIP(world-boss): Initial stats outlay
...
Also quest reward sprites, groundwork for world damage, and partial content build.
2015-10-05 16:59:19 -04:00
0d7a57d176
Merge branch 'develop' into sabrecat/world-boss
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
dd53383ec6
Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510
...
October 2015 backgrounds
2015-10-05 11:29:44 -05:00
f035dfd8b9
fix "Advanced Options in tasks start collapsed" when "Open new tasks in edit mode" is on - fixes https://github.com/HabitRPG/habitrpg/issues/5981
2015-10-05 19:37:53 +10:00
393cc71309
Correct gold purchasable quests
2015-10-03 09:21:15 -05:00
36d7c59a0c
Add backgrounds to content file
2015-10-03 06:49:14 -05:00
6dbfbeec81
Merge branch 'develop' into HabitRPG-sabrecat/backgrounds-201510
2015-10-03 06:40:50 -05:00
928e8478f7
Add coffeescript back in
2015-10-03 06:39:10 -05:00
655d8de7c8
chore(i18n): update locales
2015-10-02 22:28:12 -05:00
7a9bdfc9bf
Correct base sets
2015-10-02 22:26:51 -05:00
56419aee25
feat(content): October 2015 backgrounds
2015-10-02 16:13:11 -04:00
36cbca380e
Corrected order of backgrounds
2015-10-02 14:45:06 -05:00
bf7d6dddcc
chore(i18n): update locales
2015-10-02 11:41:57 -05:00
c6c159a44c
Add midnight shield back in
2015-10-02 11:40:42 -05:00
eb5e77cbb2
Fix locales for healAll
2015-10-02 10:34:54 -05:00
97ad1a8bb2
chore(i18n): update locales
2015-10-02 10:31:27 -05:00
339ab9e507
correct key to use mispelled version :/
2015-10-02 10:11:20 -05:00
5a7662db09
Merge pull request #5976 from crookedneighbor/refactor-content
...
Refactor Content Files
2015-10-02 08:55:10 -05:00
17eff9ed84
Issue #5928 - Replaced 'link' with actual URL in faq.json
2015-10-02 08:56:25 -04:00
e07a99dc27
Export premium pets and mounts
2015-10-02 04:01:14 -05:00
54c5741fca
chore(i18n): update locales
2015-10-01 22:44:53 -05:00
4d682214c1
Merge pull request #5996 from Gondulf/develop
...
Issue #5978 - Corrected grammar in gear.jason
2015-10-01 22:40:43 -05:00
4df9299e25
Reverted change to the stirring stick description
2015-10-01 23:25:27 -04:00
d43242884f
Issue #5978 - Corrected grammar in gear.jason
2015-10-01 23:09:24 -04:00
be3decf859
Merge branch 'develop' into refactor-content
2015-10-01 21:20:04 -05:00
a7fe29e04e
Add comment to quest block
2015-10-01 17:26:21 -05:00
22c69c7e2f
fix(magic-potions): Correct potion list merge
2015-10-01 16:53:11 -04:00
5349bc7312
chore(gulp): Compile sprites
2015-10-01 14:27:21 -05:00
fc46023561
feat(armoire): October content
...
(cherry picked from commit 2b2a85838dbc4539d41e6e2d508374b0960238d6)
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith-main-3.png
common/dist/sprites/spritesmith-main-4.css
common/dist/sprites/spritesmith-main-4.png
common/dist/sprites/spritesmith-main-5.css
common/dist/sprites/spritesmith-main-5.png
common/dist/sprites/spritesmith-main-6.css
common/dist/sprites/spritesmith-main-6.png
common/dist/sprites/spritesmith-main-7.css
common/dist/sprites/spritesmith-main-7.png
common/dist/sprites/spritesmith-main-8.css
common/dist/sprites/spritesmith-main-8.png
common/dist/sprites/spritesmith-main-9.css
common/dist/sprites/spritesmith-main-9.png
2015-10-01 14:21:01 -05:00
Sabe Jones