Commit Graph

148 Commits

Author SHA1 Message Date
Alys eceae75631 Merge pull request #5482 from Alys/startDate-fix-2015-06-25
Refactor api.shouldDo and fix https://github.com/HabitRPG/habitrpg/issues/5395
2015-06-28 07:31:04 +10:00
Alys d7a203ccc2 set all daily repeat code and tests to use true/false instead of 1/0 for consistency with DailySchema; comment-out unused default Daily repeat code 2015-06-27 20:06:04 +10:00
Sabe Jones 775f903c3d feat(events): Limited edition
Summer Splash skins and June mystery item. Also announces the Gokul sound theme.
2015-06-25 11:19:01 -05:00
Alys 51fb278438 stop changing the task's actual Start Date, move related task Start Date code tothe same place, adjust comments 2015-06-25 12:19:27 +10:00
Alys 9b8b7af7d5 replace api.numDaysApart (not used elsewhere and new to the EveryXDays code) with moment#diff 2015-06-25 12:19:26 +10:00
Alys e7e82a2aed keep startDate as a moment(), fix check for Start Date in future (ignore time, don't do incorrect CDS conversion), add comments 2015-06-25 12:19:26 +10:00
Alys 266055c0d4 rename 'day' variable to 'startOfDayWithCDSTime' (more verbose, sorry, but clearer) 2015-06-25 12:19:26 +10:00
Alys 99bc09fb25 move dayOfWeekNum to correct scope and improve comment 2015-06-25 12:19:26 +10:00
Alys f6cdc57228 move dailyTask.repeat error handling to correct location; add dailyTask.everyX error handling (might not be needed) 2015-06-25 12:19:26 +10:00
Alys bacd35b895 refactor shouldDo check for Daily's startDate being in the future 2015-06-25 12:19:26 +10:00
Sabe Jones c3b4950314 Merge branch 'sabrecat/summer-splash' into develop 2015-06-20 23:08:03 -05:00
Sabe Jones 3641bea441 feat(event): Summer Splash 2015
Summer seasonal event for 2015, including festive NPC graphics, the summer edition of the Seasonal Shop, and new class equipment available in Rewards.
2015-06-20 23:07:14 -05:00
Blade Barringer 96162b37bd Merge pull request #5433 from gisikw/ultimate-gear-fix
Ultimate gear fix
2015-06-20 17:34:47 -05:00
Alys 6eac1174a2 sort eligibleEquipment before choosing random item from Enchaned Armoire - possible partial fix for https://github.com/HabitRPG/habitrpg/issues/5376#issuecomment-111799217 2015-06-20 20:22:27 +10:00
Kevin Gisi f32305458a Fix armoire edge case 2015-06-20 01:58:54 -04:00
Sabe Jones f6fafc5b6d WIP(event): Summer Splash 2015 2015-06-19 10:42:20 -05:00
Sabe Jones ad7e5a6dc9 feat(pets): Cuttlefishies 2015-06-17 17:26:36 -05:00
Blade Barringer ecb2544cdc Merge pull request #5396 from hairlessbear/remove_freeRebirth
Removed 'freeRebirth' from user model and everywhere else in codebase
2015-06-15 08:00:18 -05:00
GihHubSphinx 232888212a Rewording translation string error message
Making error message about inaccurate translation match the UI link to
Report a Bug.

Addressing https://github.com/HabitRPG/habitrpg/issues/5405 to m
2015-06-15 01:42:47 +05:00
hairlessbear 4bf1b94c1d Removed 'freeRebirth' from user model and all uses in codebase 2015-06-13 14:18:03 -04:00
hairlessbear 2504b06026 Removed user.achievements.ultimateGear checks from orb of rebirth logic (fixes #5352) 2015-06-12 17:17:50 -04:00
Blade Barringer 54681e36b5 Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-11 19:47:46 -05:00
Blade Barringer ed43bec8cd Allow default tasks to not have notes 2015-06-10 08:49:26 -05:00
Blade Barringer 1d18f53a67 Merge branch 'develop' into blade-Finish_weeklies_pr
Added Sabe's novalidate change to adding a new task
2015-06-10 07:53:37 -05:00
Blade Barringer ca72b9a9e1 Merge branch 'chimericdream-issues/4838' into develop 2015-06-09 12:45:22 -05:00
Sabe Jones fe9666d5ee fix(achievements): Never strip Ultimate Gear
Fixes #5369.
2015-06-09 10:47:59 -05:00
Bill Parrott 05286d1e8f use correct http status code 2015-06-09 08:55:06 -05:00
Bill Parrott 9cbc21d798 check for duplicate task ID when adding a new task 2015-06-09 08:55:06 -05:00
Alys e5b8c5c4e0 use a different random seed for starting Armoire randomness than for sub-choices within it to prevent bug that gives only some foods 2015-06-08 21:15:51 +10:00
Blade Barringer 164a26616e Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-05 17:35:16 -05:00
Sabe Jones 804cced3ff chore(various): News and sprites
Also tweaks the drop probability of equipment from 70% to 60%.
2015-06-05 10:22:22 -05:00
Sabe Jones 95bb5be22a Merge branch 'develop' into armoire
Conflicts:
	common/dist/sprites/habitrpg-shared.css
	common/dist/sprites/spritesmith0.css
	common/dist/sprites/spritesmith0.png
	common/dist/sprites/spritesmith1.css
	common/dist/sprites/spritesmith1.png
	common/dist/sprites/spritesmith2.css
	common/dist/sprites/spritesmith2.png
	common/dist/sprites/spritesmith3.css
	common/dist/sprites/spritesmith3.png
	common/dist/sprites/spritesmith4.css
	common/dist/sprites/spritesmith4.png
	common/dist/sprites/spritesmith5.css
	common/dist/sprites/spritesmith5.png
	common/dist/sprites/spritesmith6.css
	common/dist/sprites/spritesmith6.png
2015-06-04 15:49:06 -05:00
Sabe Jones 20859b83ef feat(Armoire): Improved counter
The popover counter of remaining Equipment in the Armoire now counts down immediately instead of requiring a browser refresh. A modal announces when the last item has been found. Also includes several fixes to the Ultimate Gear migration.
2015-06-04 15:45:55 -05:00
Sabe Jones 6074774e14 feat(backgrounds): June BGs 2015-06-04 11:30:25 -05:00
Blade Barringer 705e0dce71 Calculate days since task start with start of day 2015-06-04 08:25:06 -05:00
Sabe Jones 09d32390f9 feat(Armoire): Item counter
Implements a counter for how many pieces of equipment remain to be found in the Armoire, including tests for same.
2015-06-03 16:48:11 -05:00
Sabe Jones 97ae243c40 fix(Armoire): Fixes
Armoire items are now breakable on character death, and can be purchased back directly from Rewards after death or Rebirth. Corrected string token on Costume area. Images show up correctly on Armoire drop notifications.
2015-06-03 12:50:57 -05:00
Sabe Jones af3ee8cfcd feat(Armoire): Updates from feedback
Adds images to Armoire drop notifications, refreshes the Rewards column when the Armoire is enabled, adds Armoire items to Costume customization, and introduces a migration for granting the new style Ultimate Gear achievement to those who have already earned it.
2015-06-03 11:58:30 -05:00
Blade Barringer 7adde1d1dd Merge branch 'develop' into blade-Finish_weeklies_pr 2015-06-03 07:41:09 -05:00
Sabe Jones c90f7e2c34 feat(Armoire): WIP 2015-06-02 17:42:14 -05:00
Sabe Jones 766f3b6057 Merge pull request #5307 from HabitRPG/tutorial
Tutorial overhaul
2015-05-31 13:58:12 -07:00
Blade Barringer 719ae1c89d Add missing ?; common tests pass 2015-05-30 23:10:44 -05:00
Sabe Jones 726a8f1acb feat(analytics): Mixpanel implementation WIP 2015-05-29 16:22:35 -05:00
Sabe Jones 6af7342693 feat(tour): Revised intro tutorial 2015-05-29 14:03:42 -05:00
Blade Barringer 8b347bca8b Remove everyX check from weeklies; Change UI of frequency selection; Prep for monthlies in UI 2015-05-26 17:59:11 -05:00
Sabe Jones 3098cacf03 feat(subscriber): May Mystery Items 2015-05-25 21:03:13 -05:00
Blade Barringer cfd2f7003b Merge branch 'develop' into fallenpanda1-improved_dailies 2015-05-23 08:44:56 -05:00
Allen Pan 90dd078a6a Fixed bug where we were using moment.startOf instead of api.startOfDay in shouldDo. 2015-05-23 02:29:06 -07:00
Allen Pan 56f0e3ae4a Removed unnecessary TODOs. 2015-05-22 22:18:17 -07:00
Blade Barringer 664bf491d2 Adjust fallenPanda's PR
* Use enum for frequency in task model
* Adjust ui of task selection
* Correct check for hasStarted
* Remove semicolons
* Set default start day to today
* Correct perfect day and resting in inn tests to have dailies with start dates of a week ago
* Add tests for dailies/weeklies functionality
2015-05-22 22:14:58 -07:00