 Tyler Renelle
|
c9907f9558
|
move some external script loading into app.on('render') to see if that
solves https://groups.google.com/forum/?fromgroups=#!topic/derbyjs/x8FwdTLEuXo
|
2013-03-30 18:45:57 -07:00 |
|
|
Tyler Renelle
|
be83a2c46e
|
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
|
2013-03-29 22:28:27 -07:00 |
|
|
Tyler Renelle
|
9b42eb825b
|
small ads & static-bindings cleanup (doesn't fix the ads issue)
|
2013-03-29 21:48:08 -07:00 |
|
|
Daniel Saewitz
|
2b59c205a2
|
Remove translations for now
|
2013-03-29 14:15:17 -04:00 |
|
|
Tyler Renelle
|
f87ab6866f
|
Merge branch 'master' of github.com:lefnire/habitrpg
|
2013-03-28 08:46:50 -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
|
3d36a3f531
|
"new stuff" update
|
2013-03-28 01:36:18 -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
|
6d6085e29b
|
Merge branch 'ads' into pets
|
2013-03-28 00:28:59 -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
|
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 |
|
|
Shane Lister
|
ea1be5f346
|
Merge branch 'pets' into patch-3
|
2013-03-26 23:20: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
|
77f697446c
|
pets: revert back to market as top-level tab
|
2013-03-26 18:57:58 -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 |
|
|
Shane Lister
|
6b0aad01f7
|
Merge pull request #7 from lefnire/pets
Update my pets branch
|
2013-03-26 08:04:07 -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 |
|
|
Zachary Kain
|
0f49ec3ebc
|
fix 697 remove level from top of herobox
|
2013-03-25 16:03:13 -04:00 |
|
|
Tyler Renelle
|
4af56b998f
|
pets: some better default inventory/stable layout
|
2013-03-25 11:50:32 -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
|
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
|
b013460809
|
Merge branch 'develop'
|
2013-03-23 08:44:09 -06:00 |
|
|
Tyler Renelle
|
43d89599ca
|
add habitrpg-github to extensions (thanks @ruddfawcett!)
|
2013-03-23 08:15:39 -06:00 |
|
|
Tyler Renelle
|
3c75caffd8
|
Merge branch 'develop' into pets
|
2013-03-22 23:50:41 -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
|
c170cd269f
|
move some more pet html into pets.html
|
2013-03-22 19:37:48 -06:00 |
|
|
Tyler Renelle
|
5043c46b5a
|
move some pet html around
|
2013-03-22 19:21:35 -06:00 |
|
|
Tyler Renelle
|
a4d50125d9
|
Merge branch 'develop'
|
2013-03-22 19:11:42 -06:00 |
|
|
Tyler Renelle
|
ccb6f9bd32
|
fix bootstrap-tour element bind with new herobox system
|
2013-03-22 19:11:29 -06:00 |
|