a363062fc0
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-15 16:58:21 -04:00
12274e2f34
move settings and API into tabs
2013-03-15 16:58:07 -04:00
ae96dc8ddb
add toggle header to settings dialog
2013-03-15 16:53:39 -04:00
823f524d57
begin adding toggle-header
2013-03-15 16:47:48 -04:00
60fc0c9e78
Merge pull request #662 from zakkain/ui-tweaks
...
Firefox Critical Hotfix
2013-03-15 09:27:49 -07:00
d8918790e5
update comment
2013-03-15 12:27:22 -04:00
a7de94f180
move party stats to a modal
2013-03-15 12:24:30 -04:00
f8a8a5e492
Merge branch 'develop' of github.com:lefnire/habitrpg into ui-tweaks
2013-03-15 12:23:47 -04:00
eeec3cf1bc
FIX Firefox task hover checkbox bug
2013-03-15 12:21:27 -04:00
916ac57917
FIX Firefox outline freakout on tasks
2013-03-15 12:18:57 -04:00
a4efbe34df
Merge branch 'master' of github.com:lefnire/habitrpg into ui-tweaks
2013-03-15 12:09:35 -04:00
b76b1a33f5
cleaner view.fn "tnl"
2013-03-15 12:06:38 -04:00
d2837afbd4
move tnl to a view function instead of model function, beging adding
...
party stats visuals (hp & exp presently)
2013-03-15 12:00:47 -04:00
2f372124b3
start moving javascript loading functionality back to <Scripts:> so we
...
can utilize CDNs
2013-03-15 11:15:35 -04:00
565c9004ca
Merge branch 'master' into develop
2013-03-15 10:41:57 -04:00
1e5ec6f176
Merge pull request #660 from Shaners/master
...
Pet Egg Sprite Sheet and CSS
2013-03-15 07:40:22 -07:00
644a23cc57
Pet Egg Sprite Sheet and CSS
2013-03-14 21:57:08 -07:00
b3a031bee5
Merge pull request #3 from lefnire/master
...
Update this branch
2013-03-14 18:14:38 -07:00
646deb2cdd
protocol-agnostic fonts
2013-03-14 15:51:29 -04:00
3f251c4b32
Merge pull request #624 from zakkain/ui-tweaks
...
Time to update the dev preview again!
2013-03-14 11:38:06 -07:00
905719725e
use Unroll-Me/derby#master
2013-03-14 14:17:10 -04:00
f991e2a965
Persist
2013-03-13 13:01:39 -04:00
3d5e3c7743
Fix modals
2013-03-13 11:47:37 -04:00
4485d226e8
1% chance on every score to get an item
2013-03-13 11:37:06 -04:00
c83da2ae79
Merge branch 'develop' of github.com:lefnire/habitrpg into inventory
2013-03-13 06:15:17 -04:00
e51cf0089e
typo test/api.mocha.coffee
2013-03-12 17:52:44 -07:00
f98a303475
move more scoring functionality into shared. on the web side, we'll
...
run the batch user object through thse functions, clone at the end,
then set, commit()
2013-03-12 18:10:16 -04:00
6248962d50
update the readme
2013-03-12 17:46:36 -04:00
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
c5f2a53e44
add helpers.js
2013-03-12 12:25:25 -04:00
bb57eddec1
divide exp gain by 2, temporary hack since people are leveling way too
...
fast.
2013-03-12 10:05:18 -04:00
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
ead9de2369
add a bunch of possible shared items for now, will clean up later
2013-03-11 14:50:00 -04:00
b34bfc886d
start static-pages redesign
2013-03-11 01:32:24 -04:00
a534eec548
[documentation] level 2 unlocks items
2013-03-10 12:21:30 -04:00
c0c4ef141b
Merge pull request #613 from kyokutei/master
...
Splash page rewritten
2013-03-10 09:18:22 -07:00
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
72e81b8891
#315 fixes: newValue not accessible at scope, only remove duff history
...
entries, not all
2013-03-10 11:40:58 -04:00
0332ee7b48
Merge pull request #616 from MrConcept/fix
...
Fixed Daily History graphs
2013-03-10 08:22:43 -07:00
ab332d5f23
Save eggs as object so we can grab text easily
2013-03-09 20:03:24 -05:00
aece4b1a41
Add food drop and avatar stable
2013-03-09 15:34:48 -05:00
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
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
Tyler Renelle