ea1be5f346
Merge branch 'pets' into patch-3
2013-03-26 23:20:13 -07:00
0253815625
pets: rename food to hatching powder
2013-03-26 22:21:46 -07:00
903f2b17c6
pets: bug where everyone shows main user's pet
2013-03-26 22:15:52 -07:00
77f697446c
pets: revert back to market as top-level tab
2013-03-26 18:57:58 -07:00
42292be251
pets: show which egg was dropped on unlocking drops
2013-03-26 17:58:44 -07:00
f6b2c08a60
Merge branch 'develop' into pets
...
Conflicts:
views/app/rewards.html
2013-03-26 17:54:31 -07:00
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
80fd4f192c
code cleanup: some indentation & {{}} where live-binds aren't required
2013-03-26 12:55:47 -07:00
6b0aad01f7
Merge pull request #7 from lefnire/pets
...
Update my pets branch
2013-03-26 08:04:07 -07:00
124409bfc5
Merge pull request #715 from switz/translations
...
@lefnire => i18n support... aka Translations!
2013-03-25 18:42:53 -07:00
58ba7cf4f3
Merge branch 'develop'
2013-03-25 17:43:48 -07:00
f7937ffb1b
add forum link to footer
2013-03-25 17:43:34 -07:00
01f2bfeab7
remove FAQ page, redirect to http://community.habitrpg.com/faq-page
2013-03-25 17:41:25 -07:00
b2f0ee58c8
pets: move market into inventory as sub-tab
2013-03-25 17:01:16 -07:00
64e421d529
pets: add eggs to market, move from rewards tab to avatar modal
2013-03-25 15:44:41 -07:00
307bcb8a38
Merge branch 'develop'
2013-03-25 14:20:01 -07:00
0f49ec3ebc
fix 697 remove level from top of herobox
2013-03-25 16:03:13 -04:00
4af56b998f
pets: some better default inventory/stable layout
2013-03-25 11:50:32 -06:00
ae53675014
pets: move inventory into <menus>
2013-03-25 10:18:28 -06:00
102c693d7c
pets: show specific egg in inventory
2013-03-25 09:51:41 -06:00
5102b7fc51
Merge branch 'develop' into pets
2013-03-25 08:58:15 -06:00
b038b74534
checkbox shenanigans fix.
2013-03-25 10:05:44 -04:00
8107200105
i18n implemented
2013-03-23 16:03:12 -04:00
b013460809
Merge branch 'develop'
2013-03-23 08:44:09 -06:00
43d89599ca
add habitrpg-github to extensions (thanks @ruddfawcett!)
2013-03-23 08:15:39 -06:00
3c75caffd8
Merge branch 'develop' into pets
2013-03-22 23:50:41 -06:00
e3df4cd9f3
choosePet inside <a/> with tooltip
2013-03-22 23:04:38 -06:00
acdb9eb5e5
add better temporary pet positioning
2013-03-22 22:40:12 -06:00
a6f4e01de7
move random-drop inside batch operations
2013-03-22 22:35:51 -06:00
6fd9bfbab4
pets: use pet.name for unique identifier, not pet.text. general cleanup
2013-03-22 22:17:25 -06:00
c170cd269f
move some more pet html into pets.html
2013-03-22 19:37:48 -06:00
5043c46b5a
move some pet html around
2013-03-22 19:21:35 -06:00
a4d50125d9
Merge branch 'develop'
2013-03-22 19:11:42 -06:00
ccb6f9bd32
fix bootstrap-tour element bind with new herobox system
2013-03-22 19:11:29 -06:00
a862e21e8e
Merge branch 'develop' into pets
2013-03-22 19:06:48 -06:00
ee2f8c0b6c
Merge pull request #701 from pjf/webservice_habitrpg
...
pfenwick went and changed his github username to pjf
2013-03-22 10:44:36 -07:00
d6553c763d
pfenwick went and changed his github username to pjf
2013-03-23 00:56:56 +11:00
3d679ba94e
fix to "anonymous" username
2013-03-21 16:50:27 -06:00
199006d692
move todos-charts up top
2013-03-21 16:36:24 -06:00
b286b95153
add charts back in, temporary style
2013-03-21 16:31:23 -06:00
a1a85241d5
add "hatching powder" (as temporary pet food), clean up some dialogs,
...
fix eggs using their actual animal sprites
2013-03-21 14:56:25 -06:00
3ce2686662
Merge branch 'develop' into switz-inventory
...
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
Merge branch 'develop' into switz-inventory
Conflicts:
src/app/helpers.coffee
styles/app/avatar.styl
styles/app/index.styl
views/app/avatar.html
views/app/tasks.html
2013-03-21 13:51:38 -06:00
dd0b041565
remove duplicate user name from party popover
2013-03-21 14:55:35 -04:00
fa89b20dd5
Merge branch 'develop' into zakkain-ui-tweaks
...
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks
Conflicts:
styles/app/index.styl
styles/app/tasks.styl
views/app/alerts.html
views/app/avatar.html
views/app/header.html
views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank
Conflicts:
styles/app/tasks.styl
2013-03-21 12:36:05 -06:00
7c77126129
try some protocol-agnostics to fix homepage css
2013-03-21 11:23:46 -06:00
d737bd0714
remove a ton of public/vendor git submodules, using CDN instead. The
...
reason we're removing the submodules (intead of keeping them around
for offline development) is that derby does some watchfile magic on the
public directory, and it causes a "max file limit" operating system
error (mitigated by `ulimit -u 2048`). For offline developers, you may
want to have some symlinks and a git stash handy
2013-03-21 11:11:15 -06:00
fa94bef0f6
new input class names on restore function
2013-03-21 13:03:03 -04:00
7529601dcc
add general "new stuff" notification, linking to changelog
2013-03-21 10:31:23 -06:00
9280e9d851
Add WebService::HabitRPG to list of extensions.
2013-03-21 08:08:59 -06:00
25c6748f98
Add WebService::HabitRPG to list of extensions.
2013-03-22 00:31:19 +11:00
Shane Lister