65b7f432a9
get the pets working for the avatar box, with consistent names (need
...
to manually apply with model.set for now)
2013-03-09 12:03:38 -05:00
c8c7d76efd
renaming some pets for consistency, adding foods
2013-03-09 11:36:27 -05:00
8ecf3eacc0
Merge branch 'inventory' of github.com:switz/habitrpg into switz-inventory
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-03-09 11:04:54 -05:00
6fdd69d2e1
Add comments to helper function
2013-03-09 08:47:09 -05:00
31c0099119
Drop an egg when the user htis level 4
2013-03-09 08:30:06 -05:00
db132fad19
Show meats in inventory
2013-03-09 08:17:02 -05:00
e280be3f62
gut old pet images, now we're using sprites. begin on new items.pets[] structure
2013-03-08 13:01:29 -05:00
f71e2fbade
Working... in progress
2013-03-08 12:55:04 -05:00
510bcda47c
wip
2013-03-08 12:44:21 -05:00
b3247e32d0
add . to player / pet sprite classes
2013-03-08 12:21:59 -05:00
e555271a70
Merge branch 'pet+player_css' of github.com:Pandoro/habitrpg into inventory
2013-03-08 12:17:43 -05:00
d17de8c5c9
Enable drops at level 4
2013-03-08 12:16:44 -05:00
9a06f5d6c3
Add inventory tab
2013-03-07 23:23:18 -05:00
354ed148f4
Merge branch 'origin-develop'
2013-03-07 14:31:43 -05:00
1fadb7955a
add exp overflow migration
2013-03-07 14:28:24 -05:00
eba727249e
add find_unique_user script for lost user accounts ( https://github.com/lefnire/habitrpg/wiki/User-ID )
2013-03-07 13:40:04 -05:00
36677c0585
Merge branch 'origin-develop'
2013-03-07 13:16:54 -05:00
05bd0fdd52
semi-colons
2013-03-07 13:16:47 -05:00
63c00a7261
add @MrConcepts normalization migration for busted busted values, and
...
in preparation for another big algorithm upgrade
2013-03-07 12:53:45 -05:00
d5b3d89a73
Rename user.stats.tnl to user.stats.toNextLevel
2013-03-06 23:50:19 -05:00
c9822efbf8
Fix broken tnl test
2013-03-06 23:50:16 -05:00
ac419e7813
add default numbers for restore tool if one isn't provided: #594
2013-03-06 23:50:06 -05:00
5b0dd6f797
Merge pull request #607 from switz/api-alg
...
@lefnire => Fix broken tnl test
2013-03-06 19:00:18 -08:00
7cb291c4de
Rename user.stats.tnl to user.stats.toNextLevel
2013-03-06 20:39:48 -05:00
5141aeda78
Fix broken tnl test
2013-03-06 19:59:19 -05:00
75aadf6eb1
add default numbers for restore tool if one isn't provided: #594
2013-03-06 13:32:10 -05:00
db805b6388
Merge pull request #592 from aaron4/patch-1
...
Added space after each line of text (privacy.html)
2013-03-06 10:11:01 -08:00
467cbfba64
Merge pull request #593 from aaron4/patch-2
...
Added space after each line of text (terms.html)
2013-03-06 10:09:42 -08:00
1ecebe4cbb
Merge branch 'master' into origin-develop
2013-03-06 12:48:48 -05:00
f602f69893
Merge pull request #604 from MrConcept/algos
...
New Algorithms + fixes
2013-03-06 09:46:14 -08:00
0dbf2257d7
New Algorithms + fixes
2013-03-06 17:02:08 +00:00
722b5c7640
Merge pull request #601 from switz/api-alg
...
Add 'To next level' to user stats on API
2013-03-06 07:19:22 -08:00
5a1343a3b7
Set maxHealth to 50
2013-03-06 09:11:14 -05:00
ef7d705059
Add to next level to user stats on API
2013-03-06 08:45:51 -05:00
27ce1b050b
try x-requested-with for CORS
2013-03-05 23:05:59 -05:00
b6564828ce
use different rewards selector for items-unlocked popover, wasn't getting it
2013-03-05 21:41:01 -05:00
4f7cdc38e9
add help popover to difficulty
2013-03-05 18:58:15 -05:00
9c14b29a3d
rename priority multiplier to "Difficulty" -> easy, medium,
...
hard (people keep getting confused) and putting it back into
"advanced" section
2013-03-05 18:07:22 -05:00
df220b43df
Merge branch 'develop'
2013-03-05 17:05:32 -05:00
41b1ca9f73
typo
2013-03-05 17:05:05 -05:00
b0b591dc96
Merge branch 'develop'
2013-03-05 17:04:31 -05:00
6a280c57ea
re-applying #553 fix
2013-03-05 17:04:22 -05:00
a8c09110f7
reverting redisign commits. @zakkain some issues here ill follow up with you on - if i forget, "add" button in responsive layout, item store issues
2013-03-05 17:02:22 -05:00
16b9ea3b58
reverting my #553 & html cleanup fixes, merge conflicts from redesign - gotta go through and do these again
2013-03-05 17:00:44 -05:00
1cd3299388
strange fix for #553 , also #539 take note
2013-03-05 16:16:08 -05:00
9a60ed5269
some html cleanup
2013-03-05 16:06:56 -05:00
bb82bcc62a
namespacing for tasks & rewards too
2013-03-05 15:52:47 -05:00
8132dbfe05
<task:> tabbing borked
2013-03-05 15:23:16 -05:00
26a26b5344
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-05 14:23:00 -05:00
4ca62b9f28
put splash middleware back in
2013-03-05 14:09:56 -05:00
Tyler Renelle