Commit graph

  • 4edbb8bf3d pets: rename everything "food" to "hatcing potions" (since we may be adding food in the near future) Tyler Renelle 2013-03-27 11:24:06 -0700
  • 6520bfb789 pets: rename shaners Item_HatchingPotion to Pet_HatchingPotion to fit previous architecture, add some placeholders for the un-finished potions. got them working Tyler Renelle 2013-03-27 00:20:33 -0700
  • db2a210007 Merge pull request #735 from Shaners/pets Tyler Renelle 2013-03-26 23:53:28 -0700
  • 1055f687cd Merge branch 'develop' Tyler Renelle 2013-03-26 23:48:42 -0700
  • 18ccf816ec crit fix: freeze lodash version Tyler Renelle 2013-03-26 23:47:51 -0700
  • 5d38962151 crit fix: freeze lodash version Tyler Renelle 2013-03-26 23:47:51 -0700
  • 2cb5fed3fc egg and mount image update Shane Lister 2013-03-26 23:28:20 -0700
  • ea1be5f346 Merge branch 'pets' into patch-3 Shane Lister 2013-03-26 23:20:13 -0700
  • ca66c658d7 Update PetEggs.css Shane Lister 2013-03-26 22:52:45 -0700
  • 32f07afd7a pets: move pets down a bit Tyler Renelle 2013-03-26 22:37:19 -0700
  • f95a537894 pets: move inventory.styl out of items.styl Tyler Renelle 2013-03-26 22:35:51 -0700
  • 63f1a73d91 pets: re-price items based on rarity Tyler Renelle 2013-03-26 22:22:13 -0700
  • 0253815625 pets: rename food to hatching powder Tyler Renelle 2013-03-26 22:21:46 -0700
  • 903f2b17c6 pets: bug where everyone shows main user's pet Tyler Renelle 2013-03-26 22:15:52 -0700
  • bf7fe8ff53 pets: migration working, but still don't understand why some users already have pets as new structure not old Tyler Renelle 2013-03-26 22:14:47 -0700
  • 3340ee767d pets: @WIP add migration script from old to new system (not working) Tyler Renelle 2013-03-26 19:38:03 -0700
  • 77f697446c pets: revert back to market as top-level tab Tyler Renelle 2013-03-26 18:57:58 -0700
  • eec551b230 pets: small cleanup Tyler Renelle 2013-03-26 18:52:18 -0700
  • 8ce1945001 pets: pull @Shaners updated sprites with wolf-base Tyler Renelle 2013-03-26 18:29:16 -0700
  • 3b0f882d49 pets: temporary notification taht pet hatched until we can get around that model.emit('bulkUpdate') causing modal redraw (bringing user back to avatar tab) Tyler Renelle 2013-03-26 18:24:12 -0700
  • fb0117c71e pets: implement drop daily limit (2 for now) Tyler Renelle 2013-03-26 18:21:17 -0700
  • 42292be251 pets: show which egg was dropped on unlocking drops Tyler Renelle 2013-03-26 17:58:44 -0700
  • f6b2c08a60 Merge branch 'develop' into pets Tyler Renelle 2013-03-26 17:54:31 -0700
  • 456c4eba62 Merge branch 'develop' Tyler Renelle 2013-03-26 14:54:35 -0700
  • 76512eef46 parties: bunch of bug fixes. enable parties by default, just notify them at lvl 3 if they haven't started using it. Show a bell-icon notification in user, reset dom properly after invitation Tyler Renelle 2013-03-26 14:54:14 -0700
  • 80fd4f192c code cleanup: some indentation & {{}} where live-binds aren't required Tyler Renelle 2013-03-26 12:55:47 -0700
  • 77e696554a bug: popovers where being attached to ".main-avatar" which was changed to ".main-herobox" in the redesign Tyler Renelle 2013-03-26 12:54:34 -0700
  • b95fd4a053 Merge pull request #731 from Shaners/patch-1 Tyler Renelle 2013-03-26 11:28:56 -0700
  • 6f6626b4f5 Merge pull request #732 from Shaners/patch-2 Tyler Renelle 2013-03-26 11:28:10 -0700
  • 79ead2cdff Update pet_sprites.css Shane Lister 2013-03-26 09:40:01 -0700
  • 2f38286716 Update Mounts.css Shane Lister 2013-03-26 09:31:42 -0700
  • 48e96df07b Update Mounts.css Shane Lister 2013-03-26 09:06:07 -0700
  • 7f74a6752a Update pet_sprites.css Shane Lister 2013-03-26 08:56:50 -0700
  • 6b0aad01f7 Merge pull request #7 from lefnire/pets Shane Lister 2013-03-26 08:04:07 -0700
  • 5fc9fdb418 Merge pull request #6 from lefnire/develop Shane Lister 2013-03-26 08:00:59 -0700
  • 9145bc7c99 Merge pull request #5 from lefnire/master Shane Lister 2013-03-26 07:59:47 -0700
  • 124409bfc5 Merge pull request #715 from switz/translations Tyler Renelle 2013-03-25 18:42:53 -0700
  • 58ba7cf4f3 Merge branch 'develop' Tyler Renelle 2013-03-25 17:43:48 -0700
  • f7937ffb1b add forum link to footer Tyler Renelle 2013-03-25 17:43:34 -0700
  • 01f2bfeab7 remove FAQ page, redirect to http://community.habitrpg.com/faq-page Tyler Renelle 2013-03-25 17:41:25 -0700
  • b2f0ee58c8 pets: move market into inventory as sub-tab Tyler Renelle 2013-03-25 17:01:16 -0700
  • 64e421d529 pets: add eggs to market, move from rewards tab to avatar modal Tyler Renelle 2013-03-25 14:41:41 -0700
  • 307bcb8a38 Merge branch 'develop' Tyler Renelle 2013-03-25 14:20:01 -0700
  • 8f993ba6d4 pets: take task reddness into account when calculating chance drop Tyler Renelle 2013-03-25 14:12:43 -0700
  • 62892bdc9b remove more unecessary imgs Tyler Renelle 2013-03-25 14:02:55 -0700
  • afb8dcbf83 pets: adjust so eggs = 40%, food = 60% Tyler Renelle 2013-03-25 14:01:31 -0700
  • 3eb0093626 pets: implement food-type rarity in item drops Tyler Renelle 2013-03-25 13:57:56 -0700
  • 19dd153e31 Merge pull request #726 from zakkain/develop Zachary Kain 2013-03-25 13:03:55 -0700
  • 0f49ec3ebc fix 697 remove level from top of herobox Zachary Kain 2013-03-25 16:03:13 -0400
  • c5c6629419 pets: add base food Tyler Renelle 2013-03-25 12:42:38 -0600
  • e8848ba0ad pets: fix to not being able to select pet right after hatching Tyler Renelle 2013-03-25 12:00:23 -0600
  • 4af56b998f pets: some better default inventory/stable layout Tyler Renelle 2013-03-25 11:50:32 -0600
  • 007e9bd339 pets: bug fix for can't feed pet Tyler Renelle 2013-03-25 10:42:17 -0600
  • ae53675014 pets: move inventory into <menus> Tyler Renelle 2013-03-25 10:18:28 -0600
  • 102c693d7c pets: show specific egg in inventory Tyler Renelle 2013-03-25 09:51:41 -0600
  • 7a5a4819e6 pets: bug fix - user.remove(path, idx, count) was wiping the whole eggs/food arrays on page refresh, using array.splice & user.set('items.food', splicedFood), etc Tyler Renelle 2013-03-25 09:42:30 -0600
  • b32c6aead0 Merge remote-tracking branch 'switz/inventory' into pets Tyler Renelle 2013-03-25 09:31:27 -0600
  • f34df36152 pets: alert & return if they already own that pet Tyler Renelle 2013-03-25 09:31:12 -0600
  • 258086e4e8 Merge pull request #723 from zakkain/develop Tyler Renelle 2013-03-25 08:05:43 -0700
  • 5102b7fc51 Merge branch 'develop' into pets Tyler Renelle 2013-03-25 08:58:15 -0600
  • b038b74534 checkbox shenanigans fix. Zachary Kain 2013-03-25 10:05:44 -0400
  • 8107200105 i18n implemented Daniel Saewitz 2013-03-23 16:03:12 -0400
  • f8dd7430a5 Merge branch 'develop' Tyler Renelle 2013-03-23 10:07:35 -0600
  • 52d419a823 add min-width fix to hero-stats being squishd on smalls screens. @zakkain feel free to change, just wanted a quick-fix Tyler Renelle 2013-03-23 10:07:26 -0600
  • 6575fe4fa3 Merge pull request #2 from lefnire/pets Daniel Saewitz 2013-03-23 08:50:54 -0700
  • b013460809 Merge branch 'develop' Tyler Renelle 2013-03-23 08:44:09 -0600
  • cdcf7aa3b2 temp fix to undo being hidden Tyler Renelle 2013-03-23 08:22:05 -0600
  • 43d89599ca add habitrpg-github to extensions (thanks @ruddfawcett!) Tyler Renelle 2013-03-23 08:15:39 -0600
  • 68bc02af72 pets: fix bug that food not getting added to Tyler Renelle 2013-03-23 00:09:05 -0600
  • 3c75caffd8 Merge branch 'develop' into pets Tyler Renelle 2013-03-22 23:50:41 -0600
  • e7fe8f40a7 move backer mount into backer/ Tyler Renelle 2013-03-22 23:41:22 -0600
  • 7ab4abad60 adding in as much currently-designed, unused pixel art that I could find into public/img/unprocessed Tyler Renelle 2013-03-22 23:39:33 -0600
  • e3df4cd9f3 choosePet inside <a/> with tooltip Tyler Renelle 2013-03-22 23:04:38 -0600
  • acdb9eb5e5 add better temporary pet positioning Tyler Renelle 2013-03-22 22:40:12 -0600
  • a6f4e01de7 move random-drop inside batch operations Tyler Renelle 2013-03-22 22:35:51 -0600
  • 6fd9bfbab4 pets: use pet.name for unique identifier, not pet.text. general cleanup Tyler Renelle 2013-03-22 22:17:25 -0600
  • b490133bd8 fix cactus css sprites Tyler Renelle 2013-03-22 22:16:30 -0600
  • c170cd269f move some more pet html into pets.html Tyler Renelle 2013-03-22 19:37:48 -0600
  • fc788f3f86 fix eggs css - was missing fox Tyler Renelle 2013-03-22 19:35:40 -0600
  • 5043c46b5a move some pet html around Tyler Renelle 2013-03-22 19:21:35 -0600
  • a4d50125d9 Merge branch 'develop' Tyler Renelle 2013-03-22 19:11:42 -0600
  • ccb6f9bd32 fix bootstrap-tour element bind with new herobox system Tyler Renelle 2013-03-22 19:11:29 -0600
  • a862e21e8e Merge branch 'develop' into pets Tyler Renelle 2013-03-22 19:06:48 -0600
  • 381bd6e9ec Merge pull request #707 from switz/api-4 Tyler Renelle 2013-03-22 13:59:49 -0700
  • 2a89ba62c8 Merge pull request #706 from switz/api-3 Tyler Renelle 2013-03-22 13:59:39 -0700
  • 7591846937 Remove req.task Daniel Saewitz 2013-03-22 16:57:34 -0400
  • 355dde07f4 Array to /user/tasks Daniel Saewitz 2013-03-22 16:52:33 -0400
  • b56bc6b1d9 Mark todos and dailies as completed via api Daniel Saewitz 2013-03-22 16:01:40 -0400
  • c876fe5b65 move test2 to test/test2 Tyler Renelle 2013-03-22 13:40:38 -0600
  • c48b90dd99 Merge pull request #699 from yangit/develop Tyler Renelle 2013-03-22 12:37:51 -0700
  • ee2f8c0b6c Merge pull request #701 from pjf/webservice_habitrpg Daniel Saewitz 2013-03-22 10:44:36 -0700
  • d6553c763d pfenwick went and changed his github username to pjf Paul Fenwick 2013-03-23 00:56:56 +1100
  • 4a1623c139 Test if EXP affected by clicking the "habits-up" button. Yangit 2013-03-22 12:10:14 +0800
  • da270edf35 Merge branch 'develop' Tyler Renelle 2013-03-21 16:50:36 -0600
  • 3d679ba94e fix to "anonymous" username Tyler Renelle 2013-03-21 16:50:27 -0600
  • 3365cf3e32 Merge branch 'develop' Tyler Renelle 2013-03-21 16:36:33 -0600
  • 199006d692 move todos-charts up top Tyler Renelle 2013-03-21 16:36:24 -0600
  • 548fb101e1 Merge branch 'develop' Tyler Renelle 2013-03-21 16:31:33 -0600
  • b286b95153 add charts back in, temporary style Tyler Renelle 2013-03-21 16:31:23 -0600
  • 4c09d432bf Merge branch 'develop' Tyler Renelle 2013-03-21 15:06:55 -0600