Commit Graph

415 Commits

Author SHA1 Message Date
Sabe Jones 6b3fcd3d11 fix(content): Correct stats for Royal Robes
...in newtype content file
2015-11-02 17:34:59 -05:00
Sabe Jones 510080325d fix(content): Correct missing Armoire items
...in newstyle content files
2015-11-02 17:33:03 -05:00
Sabe Jones e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05:00
Sabe Jones 2cb4e80019 chore(event): End Fall Festival 2015-11-02 12:55:48 -05:00
Sabe Jones 9227dd89be fix(event): Extend festival one day 2015-11-01 13:27:36 -06:00
Alys fa060bf6cd revert a commit that went live prematurely when I was distracted - sorry for commit spam 2015-10-31 19:26:05 +09:00
Alys 8f21fb2419 set lastCron to current moment if the user's timezone has changed when they authenticate 2015-10-31 18:34:35 +09:00
Alys 154fcb4f8c make daysMissed have a negative value for a lastCron in the future so that setting your PC time backwards doesn't trigger cron 2015-10-31 13:00:42 +10:00
Alys 34c51fc710 revert recent cron change (better code incoming; what WAS I thinking) 2015-10-31 10:59:41 +10:00
Alys 161069cfec prevent cron running if the lastCron date is in the future 2015-10-31 04:12:43 +10:00
Blade Barringer dd09633d31 Merge branch 'locks-auto-equip' into develop 2015-10-29 12:25:18 -05:00
Blade Barringer 6ff904bd5a Merge branch 'develop' into czan-develop 2015-10-29 08:40:03 -05:00
Matteo Pagliazzi 01373882c6 make error notification persistent, change text and make it translatable 2015-10-28 19:42:26 +01:00
Carlo Zancanaro 4d6bd38648 Add GET routes for /user/tags and /user/tags/{id}
An operation that is useful for tools to be able to do is to list a
user's tags without having to pull down the entire user object (which is
likely significantly larger than the tags). This commit adds a route to
GET /user/tags, to get a list of the user's tags, as well as a GET
/user/tags/{id} to get the details of a particular tag.

This commit also includes tests for the two new routes.
2015-10-27 13:49:17 +11:00
Sabe Jones 392889c7da feat(mystery): October 2015 subscriber set 2015-10-23 15:45:43 -04:00
Sabe Jones 0a6d9fa23a WIP(pets): Frog quest 2015-10-19 23:12:24 -04:00
Ricardo Mendes 5e3f46d786 Checks user auto-equip preference in buy function 2015-10-19 05:52:46 +00:00
Blade Barringer dbc9c5a48c Merge pull request #6008 from locks/patch-1
Typo in comment string
2015-10-18 15:29:29 -05:00
Sabe Jones e88030e15f Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
Sabe Jones 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
Sabe Jones dcf17b5505 feat(event): Jack-O'-Lantern mounts 2015-10-12 14:49:12 -04:00
Blade Barringer 02133600ce Add ios question to content 2015-10-12 07:40:31 -05:00
Alys 20415da586 Merge pull request #6018 from dcecile/develop
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
Sabe Jones 291a135fe1 Merge pull request #6023 from HabitRPG/sabrecat/world-boss
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
Dan Cecile 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
Sabe Jones 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
Sabe Jones d27fb9dba2 WIP(world-boss): Rage and rewards
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
Sabe Jones 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
Sabe Jones 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
Sabe Jones 0d7a57d176 Merge branch 'develop' into sabrecat/world-boss
Conflicts:
	common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
Sabe Jones dd53383ec6 Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510
October 2015 backgrounds
2015-10-05 11:29:44 -05:00
Alys 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
Ricardo Mendes f29f3a6b0e typo 2015-10-04 13:34:22 +01:00
Blade Barringer 393cc71309 Correct gold purchasable quests 2015-10-03 09:21:15 -05:00
Blade Barringer 36d7c59a0c Add backgrounds to content file 2015-10-03 06:49:14 -05:00
Blade Barringer 6dbfbeec81 Merge branch 'develop' into HabitRPG-sabrecat/backgrounds-201510 2015-10-03 06:40:50 -05:00
Blade Barringer 928e8478f7 Add coffeescript back in 2015-10-03 06:39:10 -05:00
Blade Barringer 7a9bdfc9bf Correct base sets 2015-10-02 22:26:51 -05:00
Sabe Jones 56419aee25 feat(content): October 2015 backgrounds 2015-10-02 16:13:11 -04:00
Blade Barringer 36cbca380e Corrected order of backgrounds 2015-10-02 14:45:06 -05:00
Blade Barringer c6c159a44c Add midnight shield back in 2015-10-02 11:40:42 -05:00
Blade Barringer eb5e77cbb2 Fix locales for healAll 2015-10-02 10:34:54 -05:00
Blade Barringer 339ab9e507 correct key to use mispelled version :/ 2015-10-02 10:11:20 -05:00
Blade Barringer e07a99dc27 Export premium pets and mounts 2015-10-02 04:01:14 -05:00
Blade Barringer be3decf859 Merge branch 'develop' into refactor-content 2015-10-01 21:20:04 -05:00
Blade Barringer a7fe29e04e Add comment to quest block 2015-10-01 17:26:21 -05:00
Sabe Jones 22c69c7e2f fix(magic-potions): Correct potion list merge 2015-10-01 16:53:11 -04:00
Sabe Jones 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 233211adc9 Merge pull request #5962 from HabitRPG/sabrecat/magic-potions
Magic Potions!
2015-10-01 14:04:14 -05:00
Sabe Jones 3d38777ec8 fix(content): Correctly generate api.hatchingPotions 2015-10-01 14:54:52 -04:00