Commit graph

25741 commits

Author SHA1 Message Date
Tyler Renelle
7f03a30fd5 remove "advanced" section, clean up the task-edit form a bit 2013-03-03 21:38:21 -05:00
Tyler Renelle
2e26df743f Merge branch 'develop' into priority-multiplier 2013-03-03 21:25:13 -05:00
Tyler Renelle
35cea7fcbb notification on "onlies" mechanic 2013-03-03 20:59:14 -05:00
Tyler Renelle
ec2889a366 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-03 20:30:46 -05:00
Tyler Renelle
7dc2bd6663 Merge pull request #569 from switz/api
@lefnire => Move deprecated API back to deprecated
2013-03-03 16:39:49 -08:00
Daniel Saewitz
30a3e46f20 Move deprecated api back into new 2013-03-03 19:37:54 -05:00
Daniel Saewitz
4919cd22b5 Move deprecated API back to deprecated 2013-03-03 19:30:53 -05:00
Tyler Renelle
e86c994076 Merge pull request #568 from MrConcept/notifications
onlies now reset their value every day
2013-03-03 16:23:45 -08:00
Philip How
120e058346 onlies now reset their value every day 2013-03-04 00:18:04 +00:00
Alex
811e9a673c Added Pet css sprite and removed genders from player css sprites
Added one sprites containing all of @Shaners' pets.

Fused male and female back together to 1 spritesheet again. Genders were removed although the same appearance should be obtainable with the new system!
2013-03-04 00:54:18 +01:00
Tyler Renelle
c33c6c3480 add multiplier functionality to task scoring 2013-03-03 18:18:49 -05:00
Tyler Renelle
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
Tyler Renelle
6189fee74e algorightms notification (to warn people to restore their exp) 2013-03-03 16:14:16 -05:00
Tyler Renelle
4b77daff0a redirect deprecated task-scoring to new API, some cleanup to score function to use switz auth 2013-03-03 12:44:50 -05:00
Tyler Renelle
264119b755 remove ical link from new API. shouldn't even be in old API, really -
it's just a link... don't know why I did that. but alas, people
already have subscriptions on that link so if it aint broke
2013-03-03 12:22:56 -05:00
Tyler Renelle
afaf358005 update to chest favicon 2013-03-03 12:15:25 -05:00
Tyler Renelle
69c8d78352 purchase tokens accessControl bug fix 2013-03-03 11:34:09 -05:00
Shane Lister
3d340539b4 Merge pull request #1 from lefnire/master
Update my fork
2013-03-03 03:01:45 -08:00
Tyler Renelle
cc4d1b2508 fix double-alerts bug 2013-03-03 01:41:52 -05:00
Tyler Renelle
34f5f2dc54 custom dayStart 2013-03-03 01:21:10 -05:00
Tyler Renelle
0f0ca21f82 fix default dailies repeat schema 2013-03-02 23:57:10 -05:00
Tyler Renelle
e6e960ae5e performance boost - only re-establish popover / tooltips on saving task 2013-03-02 23:52:47 -05:00
Tyler Renelle
d20fccea75 pass model by reference to scoring functions 2013-03-02 23:38:31 -05:00
Tyler Renelle
e4b8742320 Merge pull request #557 from MrConcept/notifications
XP Changes, Better Notifications and Fixes!
2013-03-02 16:33:09 -08:00
Philip How
e10c65dff7 merge 2013-03-02 20:12:18 +00:00
Philip How
81eb070ee6 Reset button 2013-03-02 20:03:16 +00:00
Philip How
9283b8adb4 Add death notification and algorithm fixes 2013-03-02 20:02:57 +00:00
Philip How
08839278b3 Notification and Algorithim changes 2013-03-02 18:23:43 +00:00
Tobias Leugger
7fc1de01e6 Small improvement of the error-alert styling 2013-03-02 00:27:59 +01:00
Tyler Renelle
ba8cf7742a sortable cleanup 2013-03-01 18:02:53 -05:00
Philip How
09467aee1b Merge branch 'develop' of github.com:lefnire/habitrpg into notifications 2013-03-01 22:47:00 +00:00
Tyler Renelle
20f5a05905 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-03-01 16:23:04 -05:00
Tyler Renelle
74e531bee5 add changelog 2013-03-01 16:22:24 -05:00
Philip How
4db3216e1d Merge branch 'master' into notifications 2013-03-01 20:48:13 +00:00
Tyler Renelle
7e78e8cd12 Merge pull request #522 from switz/api
@lefnire => Initial API support including specs
2013-03-01 12:32:49 -08:00
Daniel Saewitz
bc76aee85e Remove nodetime 2013-03-01 15:13:53 -05:00
Daniel Saewitz
4377ff918a Prepend /user to the /task/:id routes 2013-03-01 15:11:35 -05:00
Daniel Saewitz
5ce5152757 More secure regex type check 2013-03-01 06:11:32 -05:00
Daniel Saewitz
33b529731c Remove extra query 2013-03-01 06:03:05 -05:00
Daniel Saewitz
4e6c741594 Shouldn't update type in task PUT 2013-03-01 05:48:49 -05:00
Daniel Saewitz
c080ddc683 Separate out logic for tasks plus specs 2013-03-01 05:16:55 -05:00
Tyler Renelle
26de70c17c temporary set session so we can save new user in tests 2013-02-28 20:42:52 -05:00
Tyler Renelle
6fe375114c set req._isServer=true for API calls, use that as access check 2013-02-28 20:00:08 -05:00
Philip How
4597cba813 Changes to XP and GP gain 2013-02-28 23:42:38 +00:00
Tyler Renelle
3017f5a592 small test tweaks 2013-02-28 18:24:14 -05:00
Philip How
2a49b64023 Better notifications 2013-02-28 23:09:12 +00:00
Tyler Renelle
afe95975e1 fix up deprecated to work again (order of middleware) 2013-02-28 18:03:35 -05:00
Tyler Renelle
92f18f536d Merge branch 'develop' into switz-api 2013-02-28 17:41:43 -05:00
Tyler Renelle
b1c770c0f9 decrease "reset" button size 2013-02-28 10:59:39 -05:00
Tyler Renelle
39a98446b9 move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule) 2013-02-27 23:27:01 -05:00