Tyler Renelle
fc788f3f86
fix eggs css - was missing fox
2013-03-22 19:35:40 -06:00
Tyler Renelle
5043c46b5a
move some pet html around
2013-03-22 19:21:35 -06:00
Tyler Renelle
a862e21e8e
Merge branch 'develop' into pets
2013-03-22 19:06:48 -06:00
Tyler Renelle
381bd6e9ec
Merge pull request #707 from switz/api-4
...
@lefnire => Array API
2013-03-22 13:59:49 -07:00
Tyler Renelle
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
Daniel Saewitz
7591846937
Remove req.task
2013-03-22 16:57:34 -04:00
Daniel Saewitz
355dde07f4
Array to /user/tasks
2013-03-22 16:52:33 -04:00
Daniel Saewitz
b56bc6b1d9
Mark todos and dailies as completed via api
2013-03-22 16:01:40 -04:00
Tyler Renelle
c876fe5b65
move test2 to test/test2
2013-03-22 13:40:38 -06:00
Tyler Renelle
c48b90dd99
Merge pull request #699 from yangit/develop
...
Develop
2013-03-22 12:37:51 -07:00
Yangit
4a1623c139
Test if EXP affected by clicking the "habits-up" button.
2013-03-22 12:10:14 +08:00
Tyler Renelle
3d679ba94e
fix to "anonymous" username
2013-03-21 16:50:27 -06:00
Tyler Renelle
199006d692
move todos-charts up top
2013-03-21 16:36:24 -06:00
Tyler Renelle
b286b95153
add charts back in, temporary style
2013-03-21 16:31:23 -06:00
Tyler Renelle
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
Tyler Renelle
0f8b50c806
remove 'veteran' pet
2013-03-21 13:58:23 -06:00
Tyler Renelle
3fbb1b9135
only drop on 'up' scores
2013-03-21 13:57:22 -06:00
Tyler Renelle
cebe7fce7b
rename randomProp to randomVal
2013-03-21 13:55:31 -06:00
Tyler Renelle
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
Tyler Renelle
6c14e0c325
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-21 13:15:41 -06:00
Tyler Renelle
e5f00bd2dc
update changelog
2013-03-21 13:09:39 -06:00
Zachary Kain
02c7b81a4c
Merge pull request #693 from zakkain/ui-tweaks
...
remove duplicate user name from party popover
2013-03-21 11:56:58 -07:00
Zachary Kain
dd0b041565
remove duplicate user name from party popover
2013-03-21 14:55:35 -04:00
Zachary Kain
4770af02a9
Merge pull request #692 from zakkain/ui-tweaks
...
MAD BUG FIXES YO
2013-03-21 11:50:28 -07:00
Zachary Kain
0ddac82f1d
MAD BUG FIXES YO
2013-03-21 14:49:07 -04:00
Tyler Renelle
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
Tyler Renelle
7c77126129
try some protocol-agnostics to fix homepage css
2013-03-21 11:23:46 -06:00
Tyler Renelle
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
Zachary Kain
fa94bef0f6
new input class names on restore function
2013-03-21 13:03:03 -04:00
Yangit
5b67c0fa49
model returns full user object
2013-03-22 00:36:14 +08:00
Tyler Renelle
86f560f69b
layer "new stuff" below "offline" error
2013-03-21 10:32:34 -06:00
Tyler Renelle
7529601dcc
add general "new stuff" notification, linking to changelog
2013-03-21 10:31:23 -06:00
Tyler Renelle
f032502368
add headers to changelog
2013-03-21 10:17:39 -06:00
Tyler Renelle
8aeecd2746
add to changelog
2013-03-21 10:17:00 -06:00
Tyler Renelle
6b3dff2053
Merge pull request #690 from switz/api-2
...
@lefnire => Add alternate scoreTask + fix broken specs
2013-03-21 09:09:22 -07:00
Daniel Saewitz
4d3db53bef
Remove extra newline
2013-03-21 11:56:06 -04:00
Paul Fenwick
9280e9d851
Add WebService::HabitRPG to list of extensions.
2013-03-21 08:08:59 -06:00
Yangit
656b0891ed
async model get
2013-03-21 18:28:40 +08:00
Yangit
3434b4d224
empty test files
2013-03-21 18:01:07 +08:00
Zachary Kain
f86aa0316b
fix #679 line height issue
2013-03-20 22:32:01 -04:00
Daniel Saewitz
81b14cfac6
Add alternate scoreTask
2013-03-20 16:52:32 -04:00
Tyler Renelle
272eda64c6
copyright 2013
2013-03-20 09:36:50 -06:00
Tyler Renelle
b69ae59d39
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-19 18:33:08 -06:00
Tyler Renelle
5580fd6802
remove hashed_password & salt from /user
2013-03-19 18:32:18 -06:00
Tyler Renelle
db7a60be65
Merge pull request #676 from Shaners/develop
...
Mount sprite sheet, mount CSS, revised pet egg CSS.
2013-03-18 23:26:06 -07:00
Shane Lister
63f0a9f3a4
Mount Sprite Sheet, Mount CSS, Revised Pet Egg CSS
...
Here is a copy of the mount sprite sheet, mount CSS, and a revised pet
egg CSS. CSS now matches the player CSS structure. Removed individual
mount images as they'd no longer be needed.
2013-03-18 22:19:20 -07:00
Zachary Kain
1d93793616
fix customization modal cutting off herobox
2013-03-19 01:02:59 -04:00
Shane Lister
42754bd2a7
Merge pull request #4 from lefnire/develop
...
Develop
2013-03-18 21:56:48 -07:00
Zachary Kain
fc01b44a5a
by popular demand, we're dropping the crosshatched square and going blank
2013-03-19 00:11:37 -04:00
Zachary Kain
30b3b527a5
fix no name showing up if not logged in
2013-03-19 00:09:06 -04:00
