Commit graph

  • 055f8b2e79 Merge branch 'crookedneighbor-fix-tests' into develop Matteo Pagliazzi 2014-12-30 11:43:42 +0100
  • 0e266f917e fix(tests) Matteo Pagliazzi 2014-12-30 11:43:25 +0100
  • d054d4418b Merge branch 'fix-tests' of git://github.com/crookedneighbor/habitrpg-shared into crookedneighbor-fix-tests Matteo Pagliazzi 2014-12-30 11:31:47 +0100
  • 627a9af3b9 Compiled css and images for cyrstal armor (shop). Closes #180 Blade Barringer 2014-12-29 23:04:30 -0600
  • aca7a039c4 Updated crystal armor Blade Barringer 2014-12-29 22:51:06 -0600
  • e2e3b3944b Compiled hydra pet and css. Closes #272 Blade Barringer 2014-12-29 22:41:08 -0600
  • a80e0322ee Updated hydra pet to use standard pet dimensions Blade Barringer 2014-12-29 22:19:24 -0600
  • c7c35e4d64 Merge pull request #420 from crookedneighbor/octo-fix Blade Barringer 2014-12-29 22:13:24 -0600
  • 63ddd819f7 Compiled spritesheet for octopi Blade Barringer 2014-12-29 22:10:11 -0600
  • 2a3f2504f0 Updated image sprites for octopi Blade Barringer 2014-12-29 22:07:21 -0600
  • 953302c008 Corrected type Blade Barringer 2014-12-29 21:54:13 -0600
  • 5279a81033 Again, user needs to have hp = 0 for revive function to work correctly Blade Barringer 2014-12-29 21:46:41 -0600
  • a4d68431d4 User must have 0 HP for revive function to work Blade Barringer 2014-12-29 21:40:35 -0600
  • f9c5b3b0ae Updated quest test to only check on item drops if item drops exist (Basi list was causing it to fail) Blade Barringer 2014-12-29 21:23:30 -0600
  • d8cfc1dd4b WIP(NYE): New Year's cards Sabe Jones 2014-12-29 20:58:28 -0600
  • 9e74d94e48 WIP(NYE): New Year's Cards Sabe Jones 2014-12-29 20:57:12 -0600
  • 33e5802333 Added image to stripe checkout Blade Barringer 2014-12-29 20:35:07 -0600
  • ffa8072800 Made name field HabitRPG so sms will be correct. Uncomented description and put the old name field Blade Barringer 2014-12-29 20:31:59 -0600
  • c14285dbd9 feat(NYE): Image resources Sabe Jones 2014-12-29 20:17:47 -0600
  • 53fff0dbc6 feat(seasonal): Implement Snowball Sabe Jones 2014-12-27 11:49:51 -0600
  • f7d45c951e feat(seasonal): Implement snowball Sabe Jones 2014-12-27 11:48:22 -0600
  • 4eca27f19e Corrected class name closes #4434 Blade Barringer 2014-12-29 19:15:51 -0600
  • 0ddbbc93a3 Merge branch 'develop' of https://github.com/melissamcewen/habitrpg into melissamcewen-develop Blade Barringer 2014-12-29 18:33:14 -0600
  • ae8542eaf1 Removed extraneous console logs left while testing Blade Barringer 2014-12-29 15:50:44 -0600
  • efba545147 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Blade Barringer 2014-12-29 15:44:06 -0600
  • b3025c36b1 Fixed checklist not advancing to next input. Closes #4430 Blade Barringer 2014-12-29 15:43:20 -0600
  • 756fa83418 fix(date): typo Matteo Pagliazzi 2014-12-29 22:26:12 +0100
  • cb13b5ac26 fix(date): add YYYY/MM/DD format Matteo Pagliazzi 2014-12-29 22:16:58 +0100
  • 3105b61cb5 Merge branch 'Verabird-dateformat' into develop Matteo Pagliazzi 2014-12-29 21:24:44 +0100
  • e93754e50b Merge pull request #414 from Verabird/dateformat Matteo Pagliazzi 2014-12-29 21:23:29 +0100
  • 4a37bec652 fix(pr): indentation and simplify Matteo Pagliazzi 2014-12-29 21:21:54 +0100
  • 4e1b298a42 Corrected spelling error in comment Blade Barringer 2014-12-29 14:16:25 -0600
  • 752161b284 Merge branch 'dateformat' of git://github.com/Verabird/habitrpg into Verabird-dateformat Matteo Pagliazzi 2014-12-29 21:09:04 +0100
  • 195f7832d0 Change valorousPresence to utilize diminishing returns. Keep results at 200 str the same Verabird 2014-12-29 13:10:39 -0500
  • 760381041f Added transparent class to gem purchasing if zero gems are available for purchase Blade Barringer 2014-12-29 11:18:01 -0600
  • 8bdc0d55b9 Private Message (PM / DM) textbox is too small #4425 Melissa Mcewen 2014-12-28 23:53:15 -0600
  • c4e62fc79b Private Message (PM / DM) textbox is too small #4425 Melissa Mcewen 2014-12-28 23:51:37 -0600
  • f8cdcd2e75 Inconsistent alignment of Gem prices in Seasonal Shop #4434 Melissa Mcewen 2014-12-28 23:35:47 -0600
  • 1ff19efac5 Merge pull request #4431 from andyzinsser/develop Alice Harris 2014-12-28 12:07:47 +1000
  • 1a4455550d Remove duplicate equipment-tab classes Andy Zinsser 2014-12-27 17:49:58 -0800
  • a082e88b5d Filter Array only once and one time binding - closes #4429 Negue 2014-12-27 23:26:30 +0100
  • 85f4a2884a add some more debugging for cron Matteo Pagliazzi 2014-12-27 12:56:54 +0100
  • 2bb1e5cf7f Merge branch 'confirm-delete' into develop Blade Barringer 2014-12-26 21:04:48 -0600
  • 695c463b40 Added confirmation dialog before deleting message Blade Barringer 2014-12-26 21:04:22 -0600
  • 72d4bf2bf5 Merge pull request #4423 from andyzinsser/fix-no-food-text-color Blade Barringer 2014-12-26 20:47:15 -0600
  • ba9a10f688 Merge pull request #408 from sbreiler/develop Alice Harris 2014-12-27 12:46:32 +1000
  • db6f52e4b5 Add muted class when no food is in inventory Andy Zinsser 2014-12-26 18:31:21 -0800
  • af7e68259d Merge pull request #4404 from sbreiler/develop Alice Harris 2014-12-27 12:29:04 +1000
  • ffbd3c703a Merge pull request #4411 from crookedneighbor/seasonal-shop-indication-if-purchased Blade Barringer 2014-12-26 16:35:53 -0600
  • 5e168c41ce Merge pull request #305 from Alys/deathGear-Sep10 Alice Harris 2014-12-27 08:31:50 +1000
  • 9d8a234fe1 update dist/habitrpg-shared.js Alice Harris 2014-12-27 08:02:14 +1000
  • 7d74f36466 improve code for user.items.gear.owned.toObject as lefnire suggested in https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55528155 Alice Harris 2014-11-01 14:05:35 +1000
  • 71269a762f reinsert comment that was accidentally removed Alice Harris 2014-09-14 09:13:03 +1000
  • 8678e10958 improve iteration over all owned items to correctly handle mogoose toObject - ref https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55469925 Alice Harris 2014-09-14 03:19:25 +1000
  • 27ef50fe26 fix typo in comment characters - sorry for commit spam Alice Harris 2014-09-12 12:14:56 +1000
  • ac233a2b04 update death "doesn't break unbreakables" test to match the new code behaviour Alice Harris 2014-09-12 12:04:55 +1000
  • 0391d1afc4 add mostly pointless comment to trigger a new Travis build test since the last one didn't do what I wanted :) Alice Harris 2014-09-12 11:48:37 +1000
  • abc2f59b57 allow the free weapon_warrior_0 equipment to be lost on death so that new players can experience equipment loss Alice Harris 2014-09-12 10:59:28 +1000
  • d7f9760c0f fix typo so that Ryan doesn't make pointed comments at me Alice Harris 2014-09-10 14:13:25 +1000
  • 87f51913d0 prevent off-class items and free items being lost on death Alice Harris 2014-09-10 14:06:01 +1000
  • 9b10081117 Removed useless comment in task.jade Verabird 2014-12-26 16:07:54 -0500
  • 058e506d13 Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 Alice Harris 2014-12-27 07:05:52 +1000
  • 2de3e65043 Fix merge conflicts with test values Verabird 2014-12-26 16:00:45 -0500
  • 8852ad61b2 Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed Verabird 2014-12-26 15:51:34 -0500
  • 7297429888 Make it possible to choose between MM/dd and dd/MM date format Verabird 2014-12-24 22:18:50 -0500
  • e391fc04f0 Add variables for medium-length date display Verabird 2014-12-22 22:23:11 -0500
  • 13be267efb added variable for date display and checking line ending issue Verabird 2014-12-22 15:19:53 -0500
  • baa528fe7b Add dateFormat phrase for translation Verabird 2014-12-26 15:47:39 -0500
  • a3f0d4dea5 Add default values for shortdate and mediumdate formats Verabird 2014-12-22 22:39:21 -0500
  • 971ea8a495 chore(i18n): update locales Matteo Pagliazzi 2014-12-26 11:33:21 +0100
  • f5a0bd6903 Added trasnparent class to seasonal items already owned Blade Barringer 2014-12-25 21:32:07 -0600
  • 33ed0794b9 Remove the onClick action of this file is included in the Buy Gems popup Lucy Davies 2014-12-26 01:06:30 +0000
  • c65fe65d4e Remove the + icon if this file is included in the Buy Gems popup Lucy Davies 2014-12-26 00:19:02 +0000
  • d29971695e Define the variable to control display of the + icon and the onClick functionality Lucy Davies 2014-12-26 00:17:03 +0000
  • 2cac24ebe9 chore(grunt): grunt full Sabe Jones 2014-12-25 18:09:29 -0600
  • 37db763fc2 fix(event): Mystery sprite error Sabe Jones 2014-12-25 18:08:14 -0600
  • 6c8f9e39b6 fix(event): Mystery typo Sabe Jones 2014-12-25 18:05:04 -0600
  • 620fcd1144 Merge pull request #413 from SabreCat/seasonal Sabe Jones 2014-12-25 17:48:12 -0600
  • a1eb4bfa5b Merge pull request #4408 from SabreCat/seasonal Sabe Jones 2014-12-25 17:47:50 -0600
  • 9d279b7a77 chore(grunt): grunt full Sabe Jones 2014-12-25 17:43:31 -0600
  • 1b4843ff58 fix(event): Better quest text placement Sabe Jones 2014-12-25 17:42:09 -0600
  • f4c582eb24 fix(event): quest syntax Sabe Jones 2014-12-25 17:40:49 -0600
  • 597793e3ca feat(event): Quests and Bailey Sabe Jones 2014-12-25 17:36:16 -0600
  • 6d4d9451a5 feat(event): Mystery migration Sabe Jones 2014-12-25 17:09:06 -0600
  • 5836436b7b Merge pull request #404 from Alys/develop Alice Harris 2014-12-26 08:26:20 +1000
  • 9471393776 feat(event): 2014 Mystery Items Sabe Jones 2014-12-25 16:08:06 -0600
  • 1c90886548 fix(event): Better shop flow Sabe Jones 2014-12-25 15:52:26 -0600
  • 41f4ab7b8a feat(event): Implement Seasonal Shop Sabe Jones 2014-12-25 14:58:25 -0600
  • 6fcf6b7d05 Merge pull request #412 from lacrimae/develop Alice Harris 2014-12-26 06:47:14 +1000
  • 93119d7eab ... and the quote I missed :P lacrimae 2014-12-25 21:41:11 +0100
  • 772994c8a0 Restored missing quote lacrimae 2014-12-25 21:40:24 +0100
  • 0e28f04c90 feat(event): Implement Seasonal Shop Sabe Jones 2014-12-25 14:33:11 -0600
  • aeceb70b54 Merge pull request #411 from lacrimae/develop Blade Barringer 2014-12-25 08:35:06 -0600
  • 17233ef5df Corrected wording lacrimae 2014-12-25 15:21:29 +0100
  • 03f12a3718 Make it possible to choose between MM/dd and dd/MM date format Verabird 2014-12-24 22:18:50 -0500
  • a8459c2f96 Changing button to a element fixed the delete on enter problem Blade Barringer 2014-12-24 11:17:05 -0600
  • 0339bdf43f Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop Blade Barringer 2014-12-24 09:02:20 -0600
  • fdcc22bde9 Closes #4361 Blade Barringer 2014-12-24 09:02:03 -0600
  • 118ba88d3d fix(tasks): improve UI consistency and layout benmanley 2014-12-24 09:53:32 +0000
  • 8cf3cd66cc fix(avatar): prevent avatar from obscuring name benmanley 2014-12-24 09:52:50 +0000