sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-07-31 15:09:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
25741 commits 3 branches 0 tags 1.6 GiB
Commit graph

25741 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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