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
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
b490133bd8
fix cactus css sprites
2013-03-22 22:16:30 -06:00
c170cd269f
move some more pet html into pets.html
2013-03-22 19:37:48 -06:00
fc788f3f86
fix eggs css - was missing fox
2013-03-22 19:35:40 -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
381bd6e9ec
Merge pull request #707 from switz/api-4
...
@lefnire => Array API
2013-03-22 13:59:49 -07:00
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
7591846937
Remove req.task
2013-03-22 16:57:34 -04:00
355dde07f4
Array to /user/tasks
2013-03-22 16:52:33 -04:00
b56bc6b1d9
Mark todos and dailies as completed via api
2013-03-22 16:01:40 -04:00
c876fe5b65
move test2 to test/test2
2013-03-22 13:40:38 -06:00
c48b90dd99
Merge pull request #699 from yangit/develop
...
Develop
2013-03-22 12:37:51 -07: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
4a1623c139
Test if EXP affected by clicking the "habits-up" button.
2013-03-22 12:10:14 +08:00
da270edf35
Merge branch 'develop'
2013-03-21 16:50:36 -06:00
3d679ba94e
fix to "anonymous" username
2013-03-21 16:50:27 -06:00
3365cf3e32
Merge branch 'develop'
2013-03-21 16:36:33 -06:00
199006d692
move todos-charts up top
2013-03-21 16:36:24 -06:00
548fb101e1
Merge branch 'develop'
2013-03-21 16:31:33 -06:00
b286b95153
add charts back in, temporary style
2013-03-21 16:31:23 -06:00
4c09d432bf
Merge branch 'develop'
2013-03-21 15:06:55 -06:00
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
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
0f8b50c806
remove 'veteran' pet
2013-03-21 13:58:23 -06:00
3fbb1b9135
only drop on 'up' scores
2013-03-21 13:57:22 -06:00
cebe7fce7b
rename randomProp to randomVal
2013-03-21 13:55:31 -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
6c14e0c325
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-21 13:15:41 -06:00
e5f00bd2dc
update changelog
2013-03-21 13:09:39 -06:00
02c7b81a4c
Merge pull request #693 from zakkain/ui-tweaks
...
remove duplicate user name from party popover
2013-03-21 11:56:58 -07:00
dd0b041565
remove duplicate user name from party popover
2013-03-21 14:55:35 -04:00
4770af02a9
Merge pull request #692 from zakkain/ui-tweaks
...
MAD BUG FIXES YO
2013-03-21 11:50:28 -07:00
0ddac82f1d
MAD BUG FIXES YO
2013-03-21 14:49:07 -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
ae9546180c
Merge branch 'develop'
...
Conflicts:
styles/app/index.styl
2013-03-21 11:27:42 -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
5b67c0fa49
model returns full user object
2013-03-22 00:36:14 +08:00
be305f918e
Merge branch 'develop'
...
Conflicts:
src/server/api.coffee
views/static/head.html
views/static/privacy.html
views/static/terms.html
2013-03-21 10:35:00 -06:00
86f560f69b
layer "new stuff" below "offline" error
2013-03-21 10:32:34 -06:00
7529601dcc
add general "new stuff" notification, linking to changelog
2013-03-21 10:31:23 -06:00
Tyler Renelle