 Shane Lister
|
f72c8f33ec
|
Added Gem to Sprite Sheet and Egg CSS
|
2013-03-28 19:04:01 -07:00 |
|
|
Shane Lister
|
9ecb53747c
|
Merge pull request #10 from lefnire/pets
Update my Pets Branch
|
2013-03-28 17:04:25 -07:00 |
|
|
Stan Lindsey
|
ef12b2adce
|
Incomplete up of EN "translation"
|
2013-03-28 22:29:54 +00:00 |
|
|
Tyler Renelle
|
f87ab6866f
|
Merge branch 'master' of github.com:lefnire/habitrpg
|
2013-03-28 08:46:50 -07:00 |
|
|
Tyler Renelle
|
b03bf8ea60
|
Merge branch 'develop'
|
2013-03-28 08:43:25 -07:00 |
|
|
Tyler Renelle
|
51f054e51c
|
show tokens in character modal at all times
|
2013-03-28 08:43:13 -07:00 |
|
|
Stan Lindsey
|
6ba25e40b0
|
Added Community Link
|
2013-03-28 11:29:02 +00:00 |
|
|
Stan Lindsey
|
e0a28514c7
|
Added Community Link
|
2013-03-28 11:27:52 +00:00 |
|
|
Tyler Renelle
|
f57734eda5
|
Merge branch 'develop'
|
2013-03-28 01:36:29 -07:00 |
|
|
Tyler Renelle
|
3d36a3f531
|
"new stuff" update
|
2013-03-28 01:36:18 -07:00 |
|
|
Tyler Renelle
|
f3c43628c7
|
Merge branch 'develop'
|
2013-03-28 00:52:22 -07:00 |
|
|
Tyler Renelle
|
d2b4072ad6
|
better wording on buying tokens
|
2013-03-28 00:49:57 -07:00 |
|
|
Tyler Renelle
|
88badc4929
|
pets: list cost of items in market
|
2013-03-28 00:36:57 -07:00 |
|
|
Tyler Renelle
|
a966c2ce65
|
pets: rename base.name to from "Common" to "Base" for technical reasons
|
2013-03-28 00:34:05 -07:00 |
|
|
Tyler Renelle
|
6d6085e29b
|
Merge branch 'ads' into pets
|
2013-03-28 00:28:59 -07:00 |
|
|
Tyler Renelle
|
157f0400e1
|
fix tokens migration script
|
2013-03-28 00:25:45 -07:00 |
|
|
Tyler Renelle
|
83bfee0fa3
|
and include email in apply_tokens
|
2013-03-27 23:23:19 -07:00 |
|
|
Tyler Renelle
|
a84d1920bf
|
pets: remove unecessary css
|
2013-03-27 17:57:39 -07:00 |
|
|
Tyler Renelle
|
e44304f63a
|
Merge branch 'pets' of github.com:lefnire/habitrpg into pets
|
2013-03-27 17:33:27 -07:00 |
|
|
Tyler Renelle
|
fdcf927a47
|
Merge pull request #739 from Shaners/pets
Last Four Potions for New Pet System from Lemoness
|
2013-03-27 17:32:50 -07:00 |
|
|
Shane Lister
|
0ac25e7686
|
Last four potions for new pet system
|
2013-03-27 17:16:49 -07:00 |
|
|
Shane Lister
|
264ab6f241
|
Merge pull request #9 from lefnire/pets
Keeping my pets branch updated
|
2013-03-27 16:59:59 -07:00 |
|
|
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
|
1055f687cd
|
Merge branch 'develop'
|
2013-03-26 23:48:42 -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 |
|