9aac271b60
Improving readability of the statements for setting the colour of a task
2013-03-09 20:06:53 +01:00
9f172cb627
Merge branch 'inventory' of github.com:switz/habitrpg into inventory
2013-03-09 13:34:04 -05:00
96e36f97d3
Add eggs and rename to food
2013-03-09 13:33:57 -05:00
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
795aac8fcb
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-09 11:03:57 -05:00
7904cd17b6
Merge branch 'master' into develop
2013-03-09 11:03:35 -05:00
155747bfd0
fix to 401 user not found (can't use @byId)
2013-03-09 10:26:08 -05:00
9bd4f30375
Merge pull request #623 from arscan/develop
...
Add Task Delete to API
2013-03-09 06:28:18 -08:00
188e4ff271
Remove one id from array of typeIds instead of rewriting whole array
2013-03-09 09:14:07 -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
fd01da4f71
layer shaded box AND check on completed task
2013-03-09 02:10:33 -05:00
2111cca09a
Delete task for the API tests
2013-03-09 02:08:50 -05:00
2b8f2f48c1
Delete task for the API
2013-03-09 02:08:20 -05:00
fb3cd788df
remove body scrollbar, only on task lists
2013-03-09 01:51:39 -05:00
e5a893a710
revamp rewards and pets UI. Obv pets is temporary pending new pet system
2013-03-09 01:34:15 -05:00
f89037da53
new drag animation, tiny outline & shadow tweaks
2013-03-08 22:26:01 -05:00
5c4f400a2a
refactor circle and checkmark. maybe better cross-browser
2013-03-08 21:01:04 -05:00
17dcb70e04
Merge remote-tracking branch 'upstream/develop' into ui-tweaks
2013-03-08 19:01:25 -05:00
3407565d37
remove console.log(req.headers.origin)
2013-03-08 18:10:26 -05:00
1ef32c771b
remove console.log(req.headers.origin)
2013-03-08 18:10:12 -05:00
023f8aeaad
Merge branch 'origin-develop'
2013-03-08 18:05:06 -05:00
399e4b9dda
strange fix to CORS issue - move CORS middleware to top, respond with
...
200 if OPTIONS request
2013-03-08 18:04:57 -05:00
1ddd06ce38
remove webkit-agent (thought i already did?)
2013-03-08 15:39:03 -05:00
8cbf777232
allow OPTIONS, req.headers.origin || *
2013-03-08 15:34:37 -05:00
5c7fdc7ff5
Merge branch 'origin-develop'
2013-03-08 14:33:40 -05:00
75c1a38beb
add x-api-user and x-api-key to accpeted headers
2013-03-08 14:33:19 -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
b6a7d63c21
changed migration comment
2013-03-08 00:23:08 +00:00
24c7677764
Migration script for removing old dailies histories
2013-03-08 00:20:46 +00:00
50c5069224
notifications tweak and history fix
2013-03-08 00:10:11 +00:00
84f046024e
Updated public/splash.html
2013-03-07 13:08:36 -08: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
Tobias Leugger