Tyler Renelle
|
30d92a1583
|
add username to tokens migration
|
2013-03-27 16:02:29 -07:00 |
|
Tyler Renelle
|
56eccabe5a
|
apply tokens migration script
|
2013-03-27 14:19:11 -07:00 |
|
Tyler Renelle
|
b7459517f4
|
Merge branch 'develop' into pets
|
2013-03-27 13:14:08 -07:00 |
|
Tyler Renelle
|
8bad13e5c7
|
pets: remove <strong> on "hatching potion"
|
2013-03-27 12:32:18 -07:00 |
|
Tyler Renelle
|
562634478f
|
pets: easier click on market items
|
2013-03-27 11:59:56 -07:00 |
|
Tyler Renelle
|
3a62482a4d
|
pets: bug fixes & rewording
|
2013-03-27 11:57:40 -07:00 |
|
Tyler Renelle
|
1ee008aea1
|
pets: raise egg cost a tad
|
2013-03-27 11:46:10 -07:00 |
|
Tyler Renelle
|
4edbb8bf3d
|
pets: rename everything "food" to "hatcing potions" (since we may be adding food in the near future)
|
2013-03-27 11:34:41 -07:00 |
|
Tyler Renelle
|
6520bfb789
|
pets: rename shaners Item_HatchingPotion to Pet_HatchingPotion to fit
previous architecture, add some placeholders for the un-finished
potions. got them working
|
2013-03-27 00:20:33 -07:00 |
|
Tyler Renelle
|
db2a210007
|
Merge pull request #735 from Shaners/pets
Hatching Potions from Lemoness, Pet Egg CSS, Ethereal lion mount.
|
2013-03-26 23:53:28 -07:00 |
|
Tyler Renelle
|
18ccf816ec
|
crit fix: freeze lodash version
|
2013-03-26 23:48:26 -07:00 |
|
Tyler Renelle
|
5d38962151
|
crit fix: freeze lodash version
|
2013-03-26 23:47:51 -07:00 |
|
Shane Lister
|
2cb5fed3fc
|
egg and mount image update
|
2013-03-26 23:28:20 -07:00 |
|
Shane Lister
|
ea1be5f346
|
Merge branch 'pets' into patch-3
|
2013-03-26 23:20:13 -07:00 |
|
Shane Lister
|
ca66c658d7
|
Update PetEggs.css
Fixed flying pig and fox positions since they seemed to be reversed. Added positions for new hatching potion items.
|
2013-03-26 22:52:45 -07:00 |
|
Tyler Renelle
|
32f07afd7a
|
pets: move pets down a bit
|
2013-03-26 22:37:19 -07:00 |
|
Tyler Renelle
|
f95a537894
|
pets: move inventory.styl out of items.styl
|
2013-03-26 22:35:51 -07:00 |
|
Tyler Renelle
|
63f1a73d91
|
pets: re-price items based on rarity
|
2013-03-26 22:22:13 -07:00 |
|
Tyler Renelle
|
0253815625
|
pets: rename food to hatching powder
|
2013-03-26 22:21:46 -07:00 |
|
Tyler Renelle
|
903f2b17c6
|
pets: bug where everyone shows main user's pet
|
2013-03-26 22:15:52 -07:00 |
|
Tyler Renelle
|
bf7fe8ff53
|
pets: migration working, but still don't understand why some users
already have pets as new structure not old
|
2013-03-26 22:14:47 -07:00 |
|
Tyler Renelle
|
3340ee767d
|
pets: @WIP add migration script from old to new system (not working)
|
2013-03-26 20:23:01 -07:00 |
|
Tyler Renelle
|
77f697446c
|
pets: revert back to market as top-level tab
|
2013-03-26 18:57:58 -07:00 |
|
Tyler Renelle
|
eec551b230
|
pets: small cleanup
|
2013-03-26 18:52:18 -07:00 |
|
Tyler Renelle
|
8ce1945001
|
pets: pull @Shaners updated sprites with wolf-base
|
2013-03-26 18:29:16 -07:00 |
|
Tyler Renelle
|
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)
|
2013-03-26 18:24:12 -07:00 |
|
Tyler Renelle
|
fb0117c71e
|
pets: implement drop daily limit (2 for now)
|
2013-03-26 18:21:17 -07:00 |
|
Tyler Renelle
|
42292be251
|
pets: show which egg was dropped on unlocking drops
|
2013-03-26 17:58:44 -07:00 |
|
Tyler Renelle
|
f6b2c08a60
|
Merge branch 'develop' into pets
Conflicts:
views/app/rewards.html
|
2013-03-26 17:54:31 -07:00 |
|
Tyler Renelle
|
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
|
2013-03-26 14:54:14 -07:00 |
|
Tyler Renelle
|
80fd4f192c
|
code cleanup: some indentation & {{}} where live-binds aren't required
|
2013-03-26 12:55:47 -07:00 |
|
Tyler Renelle
|
77e696554a
|
bug: popovers where being attached to ".main-avatar" which was changed
to ".main-herobox" in the redesign
|
2013-03-26 12:54:34 -07:00 |
|
Tyler Renelle
|
b95fd4a053
|
Merge pull request #731 from Shaners/patch-1
Update Mounts.css
|
2013-03-26 11:28:56 -07:00 |
|
Tyler Renelle
|
6f6626b4f5
|
Merge pull request #732 from Shaners/patch-2
Update pet_sprites.css
|
2013-03-26 11:28:10 -07:00 |
|
Shane Lister
|
79ead2cdff
|
Update pet_sprites.css
Added missing wolf base position.
|
2013-03-26 09:40:01 -07:00 |
|
Shane Lister
|
2f38286716
|
Update Mounts.css
periods and ethereal lion position
|
2013-03-26 09:31:42 -07:00 |
|
Shane Lister
|
48e96df07b
|
Update Mounts.css
|
2013-03-26 09:06:07 -07:00 |
|
Shane Lister
|
7f74a6752a
|
Update pet_sprites.css
|
2013-03-26 08:56:50 -07:00 |
|
Shane Lister
|
6b0aad01f7
|
Merge pull request #7 from lefnire/pets
Update my pets branch
|
2013-03-26 08:04:07 -07:00 |
|
Shane Lister
|
9145bc7c99
|
Merge pull request #5 from lefnire/master
Update my master copy
|
2013-03-26 07:59:47 -07:00 |
|
Tyler Renelle
|
124409bfc5
|
Merge pull request #715 from switz/translations
@lefnire => i18n support... aka Translations!
|
2013-03-25 18:42:53 -07:00 |
|
Tyler Renelle
|
58ba7cf4f3
|
Merge branch 'develop'
|
2013-03-25 17:43:48 -07:00 |
|
Tyler Renelle
|
f7937ffb1b
|
add forum link to footer
|
2013-03-25 17:43:34 -07:00 |
|
Tyler Renelle
|
01f2bfeab7
|
remove FAQ page, redirect to http://community.habitrpg.com/faq-page
|
2013-03-25 17:41:25 -07:00 |
|
Tyler Renelle
|
b2f0ee58c8
|
pets: move market into inventory as sub-tab
|
2013-03-25 17:01:16 -07:00 |
|
Tyler Renelle
|
64e421d529
|
pets: add eggs to market, move from rewards tab to avatar modal
|
2013-03-25 15:44:41 -07:00 |
|
Tyler Renelle
|
307bcb8a38
|
Merge branch 'develop'
|
2013-03-25 14:20:01 -07:00 |
|
Tyler Renelle
|
8f993ba6d4
|
pets: take task reddness into account when calculating chance drop
|
2013-03-25 14:12:43 -07:00 |
|
Tyler Renelle
|
62892bdc9b
|
remove more unecessary imgs
|
2013-03-25 14:02:55 -07:00 |
|
Tyler Renelle
|
afb8dcbf83
|
pets: adjust so eggs = 40%, food = 60%
|
2013-03-25 14:01:31 -07:00 |
|