f89037da53
new drag animation, tiny outline & shadow tweaks
2013-03-08 22:26:01 -05:00
17dcb70e04
Merge remote-tracking branch 'upstream/develop' into ui-tweaks
2013-03-08 19:01:25 -05:00
1ef32c771b
remove console.log(req.headers.origin)
2013-03-08 18:10:12 -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
8cbf777232
allow OPTIONS, req.headers.origin || *
2013-03-08 15:34:37 -05:00
75c1a38beb
add x-api-user and x-api-key to accpeted headers
2013-03-08 14:33:19 -05:00
7cb291c4de
Rename user.stats.tnl to user.stats.toNextLevel
2013-03-06 20:39:48 -05:00
75aadf6eb1
add default numbers for restore tool if one isn't provided: #594
2013-03-06 13:32:10 -05: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
456580e352
gut & re-style Task Options, only Rewards tasks & options left to go through
2013-03-06 00:50:39 -05:00
84e07a0317
better a11y than display:none
2013-03-06 00:50:39 -05:00
ce19fed852
remove responsive from bootstrap includes. Rolling our own!
2013-03-06 00:50:38 -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
26a26b5344
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-05 14:23:00 -05:00
57b497f1bd
put splash middleware back in
2013-03-05 14:09:39 -05:00
22c5acc303
tour fix
2013-03-05 14:02:46 -05:00
1f94085875
CORS middleware
2013-03-05 13:12:09 -05:00
7e402c5688
iterative levelling
2013-03-05 13:17:46 +00:00
8e7c93aa0b
iterative levelling
2013-03-05 13:11:13 +00:00
d616579e4e
cap deltas
2013-03-05 09:51:42 +00:00
17ab9b9a22
Merge pull request #582 from MrConcept/onlies
...
Onlies
2013-03-04 14:07:14 -08:00
78ba0f5214
comment logging
2013-03-04 22:04:02 +00:00
7c10aafb1c
Fixes galore
2013-03-04 22:00:12 +00:00
8c1c5bba13
possible fix for #562 - reflists sometimes contain a null value
2013-03-04 15:20:53 -05:00
bb5fe4520f
only setup bootstrap growl notifications once. i still don't get this.
...
this issue is caused after browser.resetDom(), which happens on (1)
cron, (2) reset, (3) reroll. after which for some people this commit
will cause notifications to disappear altogether, while for others
reverting this commit will cause notifications to double.
2013-03-04 12:50:49 -05:00
721803d4de
don't use bootstrap tour until #578 fixed
2013-03-04 12:48:10 -05:00
378a03b6a0
add bootstrap tour as a submodule, some cleanup
2013-03-04 12:47:33 -05:00
34651083ec
Merge pull request #570 from lefnire/priority-multiplier
...
Priority multiplier
2013-03-04 08:38:14 -08:00
9517455a79
migrate "multiplier" setup to "priority" setup, with ! !! !!! instead
...
of 1 2 3. multipliers are now 1x 1.5x 2x
2013-03-04 11:37:46 -05:00
bd19e09fcf
possible fix for #324 - shuffle some function placement to be sure
...
definition precedes function call. put re-rendering
functionality (setupSortable, setupTour, etc) into app.on('render')
2013-03-04 11:17:17 -05:00
1bd067f32f
add multiplier "new feature" alert
2013-03-03 22:06:34 -05:00
d925c43c7b
multipy GP with priority-multiplier, too
2013-03-03 22:01:59 -05:00
7f03a30fd5
remove "advanced" section, clean up the task-edit form a bit
2013-03-03 21:38:21 -05:00
2e26df743f
Merge branch 'develop' into priority-multiplier
2013-03-03 21:25:13 -05:00
35cea7fcbb
notification on "onlies" mechanic
2013-03-03 20:59:14 -05:00
ec2889a366
Merge branch 'develop' of github.com:lefnire/habitrpg into develop
2013-03-03 20:30:46 -05:00
30a3e46f20
Move deprecated api back into new
2013-03-03 19:37:54 -05:00
4919cd22b5
Move deprecated API back to deprecated
2013-03-03 19:30:53 -05:00
120e058346
onlies now reset their value every day
2013-03-04 00:18:04 +00:00
c33c6c3480
add multiplier functionality to task scoring
2013-03-03 18:18:49 -05:00
1a335cc68a
add priority-multiplier to html & tasks.coffee (note, requires merge
...
of @IvanGaravito /derby#hotfix-model_at_for_each_blocks
2013-03-03 17:54:14 -05:00
6189fee74e
algorightms notification (to warn people to restore their exp)
2013-03-03 16:14:16 -05:00
Zachary Kain