Tyler Renelle
6248962d50
update the readme
2013-03-12 17:46:36 -04:00
Tyler Renelle
b832f40315
reverting back to commonjs format, using browserify to compile
...
index-browser.js which will load into window.habitrpgShared. Not the
best method, we'll move to requirejs (r.js?) later
2013-03-12 17:41:32 -04:00
Tyler Renelle
c5f2a53e44
add helpers.js
2013-03-12 12:25:25 -04:00
Tyler Renelle
bb57eddec1
divide exp gain by 2, temporary hack since people are leveling way too
...
fast.
2013-03-12 10:05:18 -04:00
Tyler Renelle
7bd30d6924
temporary wrap exports for browser (see
...
http://caolanmcmahon.com/posts/writing_for_node_and_the_browser/ ). We
may want to use Browserify. I thougth requirejs would handle require()
for module.exports, but i was wrong
2013-03-12 00:22:51 -04:00
Tyler Renelle
ead9de2369
add a bunch of possible shared items for now, will clean up later
2013-03-11 14:50:00 -04:00
Tyler Renelle
b34bfc886d
start static-pages redesign
2013-03-11 01:32:24 -04:00
Tyler Renelle
a534eec548
[documentation] level 2 unlocks items
2013-03-10 12:21:30 -04:00
Tyler Renelle
c0c4ef141b
Merge pull request #613 from kyokutei/master
...
Splash page rewritten
2013-03-10 09:18:22 -07:00
Tyler Renelle
4d5110c9d3
Merge pull request #627 from toebu/high-level-algo-fix
...
Changing expModifier and hpModifier algo to be less influenced by level....
2013-03-10 08:46:42 -07:00
Tyler Renelle
72e81b8891
#315 fixes: newValue not accessible at scope, only remove duff history
...
entries, not all
2013-03-10 11:40:58 -04:00
Tyler Renelle
0332ee7b48
Merge pull request #616 from MrConcept/fix
...
Fixed Daily History graphs
2013-03-10 08:22:43 -07:00
Daniel Saewitz
ab332d5f23
Save eggs as object so we can grab text easily
2013-03-09 20:03:24 -05:00
Daniel Saewitz
aece4b1a41
Add food drop and avatar stable
2013-03-09 15:34:48 -05:00
Tobias Leugger
cbbfdaa542
Changing expModifier and hpModifier algo to be less influenced by level. For high lvls (~50), you actually get HP instead of losing them with the current formula. This now doesn't happen anymore (at least for levels up to 100, which is the current max).
2013-03-09 20:14:42 +01:00
Tobias Leugger
9aac271b60
Improving readability of the statements for setting the colour of a task
2013-03-09 20:06:53 +01:00
Daniel Saewitz
9f172cb627
Merge branch 'inventory' of github.com:switz/habitrpg into inventory
2013-03-09 13:34:04 -05:00
Daniel Saewitz
96e36f97d3
Add eggs and rename to food
2013-03-09 13:33:57 -05:00
Tyler Renelle
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
Tyler Renelle
c8c7d76efd
renaming some pets for consistency, adding foods
2013-03-09 11:36:27 -05:00
Tyler Renelle
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
Tyler Renelle
795aac8fcb
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-09 11:03:57 -05:00
Tyler Renelle
7904cd17b6
Merge branch 'master' into develop
2013-03-09 11:03:35 -05:00
Tyler Renelle
155747bfd0
fix to 401 user not found (can't use @byId)
2013-03-09 10:26:08 -05:00
Daniel Saewitz
9bd4f30375
Merge pull request #623 from arscan/develop
...
Add Task Delete to API
2013-03-09 06:28:18 -08:00
Daniel Saewitz
188e4ff271
Remove one id from array of typeIds instead of rewriting whole array
2013-03-09 09:14:07 -05:00
Daniel Saewitz
6fdd69d2e1
Add comments to helper function
2013-03-09 08:47:09 -05:00
Daniel Saewitz
31c0099119
Drop an egg when the user htis level 4
2013-03-09 08:30:06 -05:00
Daniel Saewitz
db132fad19
Show meats in inventory
2013-03-09 08:17:02 -05:00
Zachary Kain
fd01da4f71
layer shaded box AND check on completed task
2013-03-09 02:10:33 -05:00
Rob Scanlon
2111cca09a
Delete task for the API tests
2013-03-09 02:08:50 -05:00
Rob Scanlon
2b8f2f48c1
Delete task for the API
2013-03-09 02:08:20 -05:00
Zachary Kain
fb3cd788df
remove body scrollbar, only on task lists
2013-03-09 01:51:39 -05:00
Zachary Kain
e5a893a710
revamp rewards and pets UI. Obv pets is temporary pending new pet system
2013-03-09 01:34:15 -05:00
Zachary Kain
f89037da53
new drag animation, tiny outline & shadow tweaks
2013-03-08 22:26:01 -05:00
Zachary Kain
5c4f400a2a
refactor circle and checkmark. maybe better cross-browser
2013-03-08 21:01:04 -05:00
Zachary Kain
17dcb70e04
Merge remote-tracking branch 'upstream/develop' into ui-tweaks
2013-03-08 19:01:25 -05:00
Tyler Renelle
3407565d37
remove console.log(req.headers.origin)
2013-03-08 18:10:26 -05:00
Tyler Renelle
1ef32c771b
remove console.log(req.headers.origin)
2013-03-08 18:10:12 -05:00
Tyler Renelle
023f8aeaad
Merge branch 'origin-develop'
2013-03-08 18:05:06 -05:00
Tyler Renelle
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
Tyler Renelle
1ddd06ce38
remove webkit-agent (thought i already did?)
2013-03-08 15:39:03 -05:00
Tyler Renelle
8cbf777232
allow OPTIONS, req.headers.origin || *
2013-03-08 15:34:37 -05:00
Tyler Renelle
5c7fdc7ff5
Merge branch 'origin-develop'
2013-03-08 14:33:40 -05:00
Tyler Renelle
75c1a38beb
add x-api-user and x-api-key to accpeted headers
2013-03-08 14:33:19 -05:00
Tyler Renelle
e280be3f62
gut old pet images, now we're using sprites. begin on new items.pets[] structure
2013-03-08 13:01:29 -05:00
Daniel Saewitz
f71e2fbade
Working... in progress
2013-03-08 12:55:04 -05:00
Daniel Saewitz
510bcda47c
wip
2013-03-08 12:44:21 -05:00
Tyler Renelle
b3247e32d0
add . to player / pet sprite classes
2013-03-08 12:21:59 -05:00
Daniel Saewitz
e555271a70
Merge branch 'pet+player_css' of github.com:Pandoro/habitrpg into inventory
2013-03-08 12:17:43 -05:00
