Commit graph

1767 commits

Author SHA1 Message Date
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
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
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
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
5102b7fc51 Merge branch 'develop' into pets 2013-03-25 08:58:15 -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
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
Tyler Renelle
7ab4abad60 adding in as much currently-designed, unused pixel art that I could find into public/img/unprocessed 2013-03-22 23:39:33 -06:00
Tyler Renelle
e3df4cd9f3 choosePet inside <a/> with tooltip 2013-03-22 23:04:38 -06:00
Tyler Renelle
acdb9eb5e5 add better temporary pet positioning 2013-03-22 22:40:12 -06:00
Tyler Renelle
a6f4e01de7 move random-drop inside batch operations 2013-03-22 22:35:51 -06:00
Tyler Renelle
6fd9bfbab4 pets: use pet.name for unique identifier, not pet.text. general cleanup 2013-03-22 22:17:25 -06:00
Tyler Renelle
b490133bd8 fix cactus css sprites 2013-03-22 22:16:30 -06:00
Tyler Renelle
c170cd269f move some more pet html into pets.html 2013-03-22 19:37:48 -06:00
Tyler Renelle
fc788f3f86 fix eggs css - was missing fox 2013-03-22 19:35:40 -06:00
Tyler Renelle
5043c46b5a move some pet html around 2013-03-22 19:21:35 -06:00
Tyler Renelle
ccb6f9bd32 fix bootstrap-tour element bind with new herobox system 2013-03-22 19:11:29 -06:00
Tyler Renelle
a862e21e8e Merge branch 'develop' into pets 2013-03-22 19:06:48 -06:00
Tyler Renelle
381bd6e9ec Merge pull request #707 from switz/api-4
@lefnire => Array API
2013-03-22 13:59:49 -07:00
Tyler Renelle
2a89ba62c8 Merge pull request #706 from switz/api-3
Mark todos and dailies as completed via api
2013-03-22 13:59:39 -07:00
Daniel Saewitz
7591846937 Remove req.task 2013-03-22 16:57:34 -04:00
Daniel Saewitz
355dde07f4 Array to /user/tasks 2013-03-22 16:52:33 -04:00
Daniel Saewitz
b56bc6b1d9 Mark todos and dailies as completed via api 2013-03-22 16:01:40 -04:00
Tyler Renelle
c876fe5b65 move test2 to test/test2 2013-03-22 13:40:38 -06:00
Tyler Renelle
c48b90dd99 Merge pull request #699 from yangit/develop
Develop
2013-03-22 12:37:51 -07:00
Yangit
4a1623c139 Test if EXP affected by clicking the "habits-up" button. 2013-03-22 12:10:14 +08:00
Tyler Renelle
3d679ba94e fix to "anonymous" username 2013-03-21 16:50:27 -06:00
Tyler Renelle
199006d692 move todos-charts up top 2013-03-21 16:36:24 -06:00
Tyler Renelle
b286b95153 add charts back in, temporary style 2013-03-21 16:31:23 -06:00
Daniel Saewitz
8c3577f3bf Merge pull request #1 from lefnire/pets
add "hatching powder" (as temporary pet food), clean up some dialogs, fix eggs using their actual animal sprites
2013-03-21 14:06:45 -07:00