Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,193 Commits 64 Branches 1,256 Tags
e966de7bf0fd0f4eecff7ace286d4863565bbd7b
Commit Graph

9193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer aca7a039c4 Updated crystal armor 2014-12-29 22:51:06 -06:00
Blade Barringer e2e3b3944b Compiled hydra pet and css. Closes #272 2014-12-29 22:41:08 -06:00
Blade Barringer a80e0322ee Updated hydra pet to use standard pet dimensions 2014-12-29 22:19:24 -06:00
Blade Barringer c7c35e4d64 Merge pull request #420 from crookedneighbor/octo-fix 
Octo fix
 2014-12-29 22:13:24 -06:00
Blade Barringer 63ddd819f7 Compiled spritesheet for octopi 2014-12-29 22:10:11 -06:00
Blade Barringer 2a3f2504f0 Updated image sprites for octopi 2014-12-29 22:07:21 -06:00
Blade Barringer 953302c008 Corrected type 2014-12-29 21:54:13 -06:00
Blade Barringer 5279a81033 Again, user needs to have hp = 0 for revive function to work correctly 2014-12-29 21:46:41 -06:00
Blade Barringer a4d68431d4 User must have 0 HP for revive function to work 2014-12-29 21:40:35 -06:00
Blade Barringer f9c5b3b0ae Updated quest test to only check on item drops if item drops exist (Basi 
list was causing it to fail)
 2014-12-29 21:23:30 -06:00
Sabe Jones d8cfc1dd4b WIP(NYE): New Year's cards 2014-12-29 20:58:28 -06:00
Sabe Jones 9e74d94e48 WIP(NYE): New Year's Cards 2014-12-29 20:57:12 -06:00
Blade Barringer 33e5802333 Added image to stripe checkout 2014-12-29 20:35:07 -06:00
Blade Barringer ffa8072800 Made name field HabitRPG so sms will be correct. Uncomented description 
and put the old name field
 2014-12-29 20:31:59 -06:00
Sabe Jones c14285dbd9 feat(NYE): Image resources 2014-12-29 20:17:47 -06:00
Sabe Jones 53fff0dbc6 feat(seasonal): Implement Snowball 
Adds the snowball from Winter 2014 to the Seasonal Shop.
 2014-12-29 19:40:11 -06:00
Sabe Jones f7d45c951e feat(seasonal): Implement snowball 
Minor refactoring of special spell purchasing, and turns snowball into Gold- instead of Gem-purchasable.
 2014-12-29 19:38:43 -06:00
Blade Barringer 4eca27f19e Corrected class name closes #4434 2014-12-29 19:15:51 -06:00
Blade Barringer 0ddbbc93a3 Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop 2014-12-29 18:33:14 -06:00
Blade Barringer ae8542eaf1 Removed extraneous console logs left while testing 2014-12-29 15:50:44 -06:00
Blade Barringer efba545147 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-12-29 15:44:06 -06:00
Blade Barringer b3025c36b1 Fixed checklist not advancing to next input. Closes #4430 2014-12-29 15:43:20 -06:00
Matteo Pagliazzi 756fa83418 fix(date): typo 2014-12-29 22:26:12 +01:00
Matteo Pagliazzi cb13b5ac26 fix(date): add YYYY/MM/DD format 2014-12-29 22:16:58 +01:00
Matteo Pagliazzi 3105b61cb5 Merge branch 'Verabird-dateformat' into develop 2014-12-29 21:24:44 +01:00
Matteo Pagliazzi e93754e50b Merge pull request #414 from Verabird/dateformat 
Dateformat
 2014-12-29 21:23:29 +01:00
Matteo Pagliazzi 4a37bec652 fix(pr): indentation and simplify 2014-12-29 21:21:54 +01:00
Blade Barringer 4e1b298a42 Corrected spelling error in comment 2014-12-29 14:16:25 -06:00
Matteo Pagliazzi 752161b284 Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat 2014-12-29 21:09:04 +01:00
Verabird 195f7832d0 Change valorousPresence to utilize diminishing returns. Keep results at 200 str the same 2014-12-29 13:57:11 -05:00
Blade Barringer 760381041f Added transparent class to gem purchasing if zero gems are available for purchase 2014-12-29 11:18:01 -06:00
Melissa Mcewen 8bdc0d55b9 Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:53:15 -06:00
Melissa Mcewen c4e62fc79b Private Message (PM / DM) textbox is too small #4425 2014-12-28 23:51:37 -06:00
Melissa Mcewen f8cdcd2e75 Inconsistent alignment of Gem prices in Seasonal Shop #4434 2014-12-28 23:35:47 -06:00
Alice Harris 1ff19efac5 Merge pull request #4431 from andyzinsser/develop 
Fix #4396 - Duplicate class tour dialogs
 2014-12-28 12:07:47 +10:00
Andy Zinsser 1a4455550d Remove duplicate equipment-tab classes 2014-12-27 17:49:58 -08:00
Negue a082e88b5d Filter Array only once and one time binding - closes #4429 2014-12-27 23:26:30 +01:00
Matteo Pagliazzi 85f4a2884a add some more debugging for cron 2014-12-27 12:56:54 +01:00
Blade Barringer 2bb1e5cf7f Merge branch 'confirm-delete' into develop 2014-12-26 21:04:48 -06:00
Blade Barringer 695c463b40 Added confirmation dialog before deleting message 2014-12-26 21:04:22 -06:00
Blade Barringer 72d4bf2bf5 Merge pull request #4423 from andyzinsser/fix-no-food-text-color 
Add muted class when no food is in inventory
 2014-12-26 20:47:15 -06:00
Alice Harris ba9a10f688 Merge pull request #408 from sbreiler/develop 
Fix #4296 (Subscription "Update Card" message is cut off)
 2014-12-27 12:46:32 +10:00
Andy Zinsser db6f52e4b5 Add muted class when no food is in inventory 2014-12-26 18:31:21 -08:00
Alice Harris af7e68259d Merge pull request #4404 from sbreiler/develop 
Fix #4296 (Subscription "Update Card" message is cut off)
 2014-12-27 12:29:04 +10:00
Blade Barringer ffbd3c703a Merge pull request #4411 from crookedneighbor/seasonal-shop-indication-if-purchased 
Added trasnparent class to seasonal items already owned
 2014-12-26 16:35:53 -06:00
Alice Harris 5e168c41ce Merge pull request #305 from Alys/deathGear-Sep10 
prevent off-class items and free items being lost on death
 2014-12-27 08:31:50 +10:00
Alice Harris 9d8a234fe1 update dist/habitrpg-shared.js 2014-12-27 08:02:14 +10:00
Alice Harris 7d74f36466 improve code for user.items.gear.owned.toObject as lefnire suggested in https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55528155 2014-12-27 07:28:06 +10:00
Alice Harris 71269a762f reinsert comment that was accidentally removed 2014-12-27 07:28:06 +10:00
Alice Harris 8678e10958 improve iteration over all owned items to correctly handle mogoose toObject - ref https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55469925 2014-12-27 07:28:06 +10:00