 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
|
456c4eba62
|
Merge branch 'develop'
|
2013-03-26 14:54:35 -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
|
5fc9fdb418
|
Merge pull request #6 from lefnire/develop
Update my develop copy
|
2013-03-26 08:00:59 -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 |
|
|
Tyler Renelle
|
3eb0093626
|
pets: implement food-type rarity in item drops
|
2013-03-25 13:57:56 -07:00 |
|
|
Zachary Kain
|
19dd153e31
|
Merge pull request #726 from zakkain/develop
fix 697 remove level from top of herobox
|
2013-03-25 13:03:55 -07:00 |
|
|
Zachary Kain
|
0f49ec3ebc
|
fix 697 remove level from top of herobox
|
2013-03-25 16:03:13 -04:00 |
|
|
Tyler Renelle
|
c5c6629419
|
pets: add base food
|
2013-03-25 12:42:38 -06:00 |
|
|
Tyler Renelle
|
e8848ba0ad
|
pets: fix to not being able to select pet right after hatching
|
2013-03-25 12:00:23 -06:00 |
|
|
Tyler Renelle
|
4af56b998f
|
pets: some better default inventory/stable layout
|
2013-03-25 11:50:32 -06:00 |
|
|
Tyler Renelle
|
007e9bd339
|
pets: bug fix for can't feed pet
|
2013-03-25 10:42:17 -06:00 |
|
|
Tyler Renelle
|
ae53675014
|
pets: move inventory into <menus>
|
2013-03-25 10:18:28 -06:00 |
|
|
Tyler Renelle
|
102c693d7c
|
pets: show specific egg in inventory
|
2013-03-25 09:51:41 -06:00 |
|
|
Tyler Renelle
|
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
|
2013-03-25 09:42:30 -06:00 |
|
|
Tyler Renelle
|
b32c6aead0
|
Merge remote-tracking branch 'switz/inventory' into pets
|
2013-03-25 09:31:27 -06:00 |
|
|
Tyler Renelle
|
f34df36152
|
pets: alert & return if they already own that pet
|
2013-03-25 09:31:12 -06:00 |
|
|
Tyler Renelle
|
258086e4e8
|
Merge pull request #723 from zakkain/develop
checkbox shenanigans fix.
|
2013-03-25 08:05:43 -07:00 |
|
|
Tyler Renelle
|
5102b7fc51
|
Merge branch 'develop' into pets
|
2013-03-25 08:58:15 -06:00 |
|
|
Zachary Kain
|
b038b74534
|
checkbox shenanigans fix.
|
2013-03-25 10:05:44 -04:00 |
|
|
Daniel Saewitz
|
8107200105
|
i18n implemented
|
2013-03-23 16:03:12 -04:00 |
|
|
Tyler Renelle
|
f8dd7430a5
|
Merge branch 'develop'
|
2013-03-23 10:07:35 -06:00 |
|
|
Tyler Renelle
|
52d419a823
|
add min-width fix to hero-stats being squishd on smalls screens.
@zakkain feel free to change, just wanted a quick-fix
|
2013-03-23 10:07:26 -06:00 |
|
|
Daniel Saewitz
|
6575fe4fa3
|
Merge pull request #2 from lefnire/pets
Many pets fixes
|
2013-03-23 08:50:54 -07:00 |
|
|
Tyler Renelle
|
b013460809
|
Merge branch 'develop'
|
2013-03-23 08:44:09 -06:00 |
|
|
Tyler Renelle
|
cdcf7aa3b2
|
temp fix to undo being hidden
|
2013-03-23 08:22:05 -06:00 |
|
|
Tyler Renelle
|
43d89599ca
|
add habitrpg-github to extensions (thanks @ruddfawcett!)
|
2013-03-23 08:15:39 -06:00 |
|
|
Tyler Renelle
|
68bc02af72
|
pets: fix bug that food not getting added to
|
2013-03-23 00:09:05 -06:00 |
|
|
Tyler Renelle
|
3c75caffd8
|
Merge branch 'develop' into pets
|
2013-03-22 23:50:41 -06:00 |
|
|
Tyler Renelle
|
e7fe8f40a7
|
move backer mount into backer/
|
2013-03-22 23:41:22 -06:00 |
|