Commit Graph

11739 Commits

Author SHA1 Message Date
Sabe Jones 5bfea172ee fix(notifications): Don't double-modal
Corrects behavior of the Notifications controller so that it skips showing the generic levelup modal if it's going to display the quest scroll version.
2015-10-13 17:01:07 -04:00
Sabe Jones 6505824cb6 feat(modals): Levelup modal
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04: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 5eacba54b8 feat(modals): Slim scroll notif
Establishes a new template for modal notifications, to be used across the app including a number of new notifications.
2015-10-13 14:20:51 -04:00
Alys 30de99b700 adjust world bosses FAQ answer 2015-10-13 06:49:07 +10:00
Sabe Jones dcf17b5505 feat(event): Jack-O'-Lantern mounts 2015-10-12 14:49:12 -04:00
Phillip Thelen caa7d4a220 store iOS tutorial steps 2015-10-12 16:34:07 +02:00
Blade Barringer 02133600ce Add ios question to content 2015-10-12 07:40:31 -05:00
Alys ece3e0d0aa add FAQ item for World Bosses 2015-10-12 21:26:59 +10:00
Matteo Pagliazzi a4b1c6cf64 Merge pull request #6033 from vIiRuS/patch-4
Add iOS smart app banner
2015-10-10 14:30:08 +02:00
Phillip Thelen 87012f6a7c Add iOS start app banner 2015-10-10 13:52:53 +02:00
Sabe Jones f00bbd9652 feat(modals): Small style scroll award 2015-10-09 15:39:36 -04:00
Sabe Jones b775b8f399 feat(modals): Simplified scroll drop
Conflicts:
	website/views/shared/modals/quests.jade
2015-10-09 14:07:54 -04: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
Blade Barringer 2cc4d65d78 Allow disabling logger in non-prod for testing 2015-10-08 22:42:09 -05:00
Sabe Jones 4044b0cb64 fix(world-boss): Update mechanics explanation 2015-10-08 18:48:13 -04:00
Blade Barringer 60cc428b81 chore(i18n): update locales 2015-10-08 17:42:10 -05:00
Blade Barringer d873848f81 Commit missing file 2015-10-08 17:37:10 -05:00
Blade Barringer 0ccf07a4e0 Compile sprites 2015-10-08 17:32:34 -05:00
Blade Barringer ccd77090f4 Fix css template for sprites 2015-10-08 17:31:32 -05:00
Sabe Jones 58801f5025 fix(world-boss): Don't repeat explanation 2015-10-08 13:17:49 -04: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
Sabe Jones 1d4536fc47 fix(sprites): Remove errant blob 2015-10-08 10:59:44 -05:00
Sabe Jones c45736fc6f Merge pull request #6024 from crookedneighbor/fix_world_dmg
Fix world dmg
2015-10-08 10:19:38 -05:00
Blade Barringer 36d471ddff Correct module exports 2015-10-08 08:42:42 -05:00
Blade Barringer 5e10b8f4c9 Correct assinging of tavernQuest object when boss damage is calculated 2015-10-08 08:32:40 -05:00
Blade Barringer 9e88d17a78 Adjust tavern export to send over only quest object 2015-10-08 07:45:25 -05:00
Thrashmandicoot 40ea62344b Add bold to item output when selling item 2015-10-07 20:11:07 -07:00
Thrashmandicoot a1328bc837 Add bolding to item name 2015-10-07 20:10:27 -07:00
Thrashmandicoot 7c16197ec9 Refactor market to display eggs properly, wip 2015-10-07 19:19:56 -07:00
Thrashmandicoot 04550a3346 Add btn-sell to increase width of market button to container 2015-10-07 19:18:54 -07:00
Thrashmandicoot 921cb3ca5d Add displayXForGold keys, refactor sell egg for gold 2015-10-07 19:17:13 -07:00
Sabe Jones aba3908170 chore(gulp): Compile sprites 2015-10-07 15:15:21 -04:00
Thrashmandicoot dadf1d5b0b Add divider between sell button and text for market 2015-10-07 11:52:47 -07: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
ahstro 76fcbfc19f Toggle chevron direction
When editing a task, there are some expandable options available with a
chevron next to them (e.g. 'Tags' and 'Advanced Options'). This commit
makes the chevrons' directions toggle based on whether the related
option is expanded or collapsed, up and down respectively.
2015-10-05 22:17:28 +02: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 c462e65942 typo 2015-10-04 13:34:51 +01:00
Ricardo Mendes f29f3a6b0e typo 2015-10-04 13:34:22 +01:00
Blade Barringer 2683b2b0a0 Use var to declare mongoose 2015-10-03 20:55:28 -05:00
Blade Barringer 62b15c4f48 Simplify background tests 2015-10-03 11:54:58 -05:00
Blade Barringer cc579b97a3 Increase converage around egg content 2015-10-03 11:42:23 -05:00
Blade Barringer 04d3bf0f19 Refactor faq tests 2015-10-03 11:19:27 -05:00
Blade Barringer b82123e1a2 Update food tests 2015-10-03 11:11:16 -05:00