Commit Graph

555 Commits

Author SHA1 Message Date
Blade Barringer b71f68ef32 Merge branch 'develop' into equipment-refactor-merge-into-develop 2015-07-11 15:55:53 -05:00
Blade Barringer dccc10aa4d Refactor 2015-07-11 15:05:58 -05:00
Blade Barringer ba13f2d9aa Add locale strings 2015-07-11 15:05:32 -05:00
Alys ef496525a1 change white "Report" button to red "Report Violation" button in chat message flag modal 2015-07-11 21:23:39 +10:00
Blade Barringer 305414e152 Merge pull request #5553 from Lokeh/Lokeh/maxHealth
maxHealth refactor
2015-07-11 00:18:15 -05:00
Arbixal 48b520509c fixes https://github.com/HabitRPG/habitrpg/issues/5555 2015-07-11 00:15:55 -05:00
Matteo Pagliazzi 5e8baf6c92 chore(i18n): update locales 2015-07-10 15:45:58 +02:00
Sabe Jones d5f97b2781 chore(news): Derby Day Bailey 2015-07-09 14:24:22 -05:00
Sabe Jones 6cc0a08dc2 feat(event): Derby Day pet quest 2015-07-09 12:57:43 -05:00
Sabe Jones 46543f9072 feat(event): Derby Day mount 2015-07-08 16:07:37 -05:00
Sabe Jones 3dd2493fed chore(news): iOS release Bailey 2015-07-07 13:27:19 -05:00
Matteo Pagliazzi fa8e2785bd chore(i18n): update locales 2015-07-06 22:11:26 +02:00
Matteo Pagliazzi 1618534785 chore(i18n): update locales 2015-07-05 20:51:08 +02:00
Alys d7084ce0c8 remove unnecessary default for dailyTask.startDate (website/src/models/task.js gives default); give user's timezone to their task startDate values (possible solution for https://github.com/HabitRPG/habitrpg/issues/5395 https://github.com/HabitRPG/habitrpg/issues/5510 https://github.com/HabitRPG/habitrpg/issues/5549) 2015-07-05 19:22:10 +10:00
Will 4027c99959 maxHealth added to shared scripts 2015-07-03 22:22:28 -07:00
Blade Barringer e924157fdf Merge pull request #5508 from Alys/trivial-difficulty
add Trivial difficulty/priority setting to task Advanced Options
2015-07-03 10:08:46 -05:00
Matteo Pagliazzi f6480faf22 chore(i18n): update locales 2015-07-03 10:49:35 +02:00
Sabe Jones fb81c79b78 feat(analytics): Invite Friends experiment
Disables the prior landing page Google Experiment and begins a new one involving the placement and captioning of the button for inviting friends to the user's party.
2015-07-02 16:13:22 -05:00
Blade Barringer 4d7a3afc93 Merge branch 'LionC-develop' into develop 2015-07-02 07:58:59 -05:00
Blade Barringer 4bcff71859 Adjust login modal
* Rename loginForm
* Use larger buttons for logging in or registering
* Use fully translated placeholder text
2015-07-02 07:58:11 -05:00
Blade Barringer fe7642e33a Add find the cub art
Closes #5545
2015-07-01 20:19:46 -05:00
Blade Barringer ba85487b29 Correct naming of backgrounds 2015-07-01 19:50:49 -05:00
Sabe Jones d248b74569 fix(event): Splash visual tweaks 2015-07-01 14:21:37 -05:00
Sabe Jones 25dd82ffa0 feat(event): Summer Splash cont'd
Summer backgrounds, the Seafoam transformation item, and announcements for same.
2015-07-01 13:11:53 -05:00
Alys eeb9793eb8 Merge pull request #5526 from Alys/cron-fix-yet-again-2015-06-30
make api.shouldDo use the day being checked as the default date instead of today
2015-07-01 13:17:01 +10:00
Sabe Jones 46a7591492 Merge branch 'release-june-30th-2015' into develop 2015-06-30 13:39:51 -05:00
Matteo Pagliazzi cca3e8bfdf chore(i18n): update locales 2015-06-30 17:59:11 +02:00
Alys 2cd34b0f6e make api.shouldDo use the day being checked as the default date instead of today - fixes https://github.com/HabitRPG/habitrpg/issues/5521 2015-06-30 14:28:00 +10:00
Blade Barringer 4304e56e70 Merge pull request #5511 from Alys/use-costume-explanation-2015-06-28
make costume option more noticeable and understandable
2015-06-29 19:25:44 -05:00
Blade Barringer 547523c8f7 Merge branch 'crookedneighbor-blade-refactor-clone-challenges' into release-june-30th-2015 2015-06-29 17:56:42 -05:00
Matteo Pagliazzi 2f48534342 chore(i18n): update locales 2015-06-29 18:14:46 +02:00
Alys a946f2b5a5 rename "show more/less" locale keys to be generic; change to those keys for Use Costume text and Custom Day Start text; move Use Costume "show less" link to bottom of section 2015-06-29 21:49:54 +10:00
sablecliff c8dd666939 Implemented changes as suggested by @crookedneighbour
Should be passing all tests now.
2015-06-29 18:11:12 +10:00
Alys a4e9e5dbfc replace Gokul Theme audio files with new versions https://github.com/HabitRPG/habitrpg/pull/5407#issuecomment-116251843 2015-06-29 13:16:14 +10:00
Alys 11396d4756 make costume option more noticeable and understandable - fixes https://github.com/HabitRPG/habitrpg/issues/5204 2015-06-28 19:40:39 +10:00
Alys 122920975d add Trivial difficulty/priority setting to task Advanced Options (also remove whitespace at ends of lines) 2015-06-28 14:41:02 +10:00
Blade Barringer 2dd7894a2c Merge branch 'image-min' into develop 2015-06-27 16:41:24 -05:00
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
Blade Barringer 7aa2bb0db5 Chore(compile sprites) 2015-06-27 16:24:12 -05: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
Matteo Pagliazzi fd11b054eb chore(i18n): update locales 2015-06-26 18:17:14 +02:00
sablecliff 96a3653620 Now includes the refactoring into different files.
Currently there a multiple ways to create the string being shown.
This will be changed upon the decision of which is prefered.
I personally prefer the first method, which uses a function inside the
object being created in content.coffee
2015-06-26 19:33:39 +10:00
Andy Martin 0fb911016a shrink spritesmith images to reduce page load 2015-06-25 22:25:14 -06:00
Sabe Jones 335acd276c fix(sprites): Reposition snorkely things 2015-06-25 15:08:26 -05: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
Matteo Pagliazzi 7f0b826943 chore(i18n): update locales 2015-06-25 11:51:48 +02: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