Commit graph

116 commits

Author SHA1 Message Date
Tyler Renelle
8480ef3564 some bugs which are a result of user not being tested as already dead.
using scoring.setUser() so we don't have to pass user all over the
place, there's probably a better approach -- revisit
2012-09-20 10:57:32 -04:00
Tyler Renelle
5f771ef830 rename quarters to tokens 2012-09-19 09:50:39 -04:00
Tyler Renelle
be9d419313 Quarters system, generalized modal dialogs, bug fixes 2012-09-18 21:37:49 -04:00
Tyler Renelle
9811117acd Fix bug of incomplete TODOs not gaining value on cron 2012-09-18 01:23:10 -04:00
Tyler Renelle
393033b1c2 bug fix: needed to kill user before checking their exp - tnl() >= 0
when lvl == 0

Conflicts:

	test/test.coffee
2012-09-18 01:23:03 -04:00
Tyler Renelle
38ebce3b56 remove some unecessary files 2012-09-18 01:22:35 -04:00
Tyler Renelle
bde52a01a9 Pull in changes from private branch, including many bug fixes and -
drumrole - functioning facebook auth!!
2012-09-15 15:06:51 -04:00
Tyler Renelle
10c5fecb75 Merge branch 'master' of https://github.com/lefnire/habitrpg 2012-09-07 19:35:24 -04:00
Tyler Renelle
a0611297fa necessary changes to get everyauth working (since can't run
model.fetch() on the server). revisit, this might not be the case
2012-09-07 19:34:40 -04:00
Tyler Renelle
ee2c4663d5 Pull in a bunch of changes from private branch, initial everyauth code 2012-09-07 17:23:31 -04:00
Tyler Renelle
9fd4367a8a pull in some changes from private branch 2012-09-06 15:33:06 -04:00
Tyler Renelle
79cf7d2bb9 use linear growth TNL algorithm 2012-09-06 12:28:06 -04:00
Tyler Renelle
c9226b34bd Revert "temporarily disable accessControl so i can run schema update"
This reverts commit 01159545d8492831f4048235c2ab633a7d2d4905.
2012-09-04 23:08:11 -04:00
Tyler Renelle
79f1c635ca temporarily disable accessControl so i can run schema update 2012-09-04 23:08:06 -04:00
Tyler Renelle
9c58a7809f Beginnings of toggling days-of-week for repeatable dailies
Conflicts:

	lib/app/index.js
	package.json
	src/app/index.coffee
2012-09-04 23:07:58 -04:00
Tyler Renelle
f68dcbf469 add trash icon, remove delete button (people aren't deleting the same
tasks, maybe this will help them). add a bunch of tooltips on the
controls. prevent accidental deletes
2012-09-04 18:01:42 -04:00
Tyler Renelle
91711aad07 use heart & star icons instead of HP / Exp
Conflicts:

	lib/app/index.js
2012-09-04 16:09:54 -04:00
Tyler Renelle
9146f2f3fe move notifications to the right. eventually i'll want it above the mouse 2012-09-04 16:08:47 -04:00
Tyler Renelle
0391cee8a5 in fact, remove shortcuts altogether - we're not using formatting yet,
and it's borking firefox
2012-09-04 14:28:52 -04:00
Tyler Renelle
06e96407d3 Fix firefox by removing the document.execCommand('useCSS', false, true) stuff 2012-09-04 14:28:48 -04:00
Tyler Renelle
4aa21e03d9 remove console.log on accessControl
Conflicts:

	src/server/setupStore.coffee
2012-09-04 14:27:53 -04:00
Tyler Renelle
4c29c93864 bug fix on accessControl for variable-length arguments (was getting
writeAccess error)

Conflicts:

	lib/server/setupStore.js
	src/server/setupStore.coffee
2012-09-04 11:45:34 -04:00
Tyler Renelle
8a4185815f move terms & privacy to staticPages
Conflicts:

	lib/server/index.js
	src/server/index.coffee
	views/app/index.html
2012-09-02 23:01:14 -04:00
Tyler Renelle
ac2fc49e12 reset hp on level up (thought i did already..) 2012-09-02 16:37:05 -04:00
Tyler Renelle
881019f4e9 update item costs, they were too expensive
Conflicts:

	src/app/content.coffee
2012-09-01 19:31:51 -04:00
Tyler Renelle
1dea15f551 prevent long-standing red tasks from being deleted by hurting on delete 2012-09-01 19:15:26 -04:00
Tyler Renelle
7a8a7d4566 don't use growl on server (woops) 2012-09-01 17:59:11 -04:00
Tyler Renelle
c434072504 yellow warning for undoing a mistake checkbox 2012-09-01 17:45:31 -04:00
Tyler Renelle
91e4a50179 divide tibia TNL by 5, make leveling easier 2012-09-01 16:46:44 -04:00
Tyler Renelle
f0aa6299ea fix money/hp buying difference 2012-09-01 16:32:25 -04:00
Tyler Renelle
e78cb66f9c add icons to the notifications 2012-09-01 16:32:20 -04:00
Tyler Renelle
68079f5bfc send growl notifications for points gained/lossed & level up
Conflicts:

	src/app/scoring.coffee
2012-09-01 14:26:12 -04:00
Tyler Renelle
4312052fc8 add score-down, use scoring module to run up/down through modifiers 2012-08-27 23:55:05 -04:00
Tyler Renelle
c8bbfda776 basic setup for REST api - /:uid/up/:score? for now
Conflicts:

	lib/server/index.js
	src/server/index.coffee
2012-08-27 22:27:56 -04:00
Tyler Renelle
c55ce9d419 use mongo-store in express session (see
4409329271bafd68e931d1d13e5519109a9a3c8e of chat-example)
2012-08-27 10:23:48 -04:00
Tyler Renelle
b711ccfc03 Move purl authentication to server/index.js and don't redirect. keep
them on that url
2012-08-26 16:02:42 -04:00
Tyler Renelle
0e4e306046 Got accessControl working!!! 2012-08-26 11:58:20 -04:00
Tyler Renelle
55ceb9d40b try racer.io.set('transports') instead of racer.set('transports') 2012-08-24 15:28:35 -04:00
Tyler Renelle
494b26c866 userId is no longer auto-created by session middleware 2012-08-24 09:59:29 -04:00
Tyler Renelle
e4524e0958 temporary fix on _purl, using $().val() instead of view binding 2012-08-23 22:54:18 -04:00
Tyler Renelle
8dfa4a862b updateSchema to remove inactive users, reset history 2012-08-23 19:32:24 -04:00
Tyler Renelle
4b28ab9235 only use google analyatics in production 2012-08-09 11:22:44 -04:00
Tyler Renelle
29acf91e03 some typos and bugs, though didn't seem to fix anything 2012-08-09 11:02:56 -04:00
Tyler Renelle
b2cd9c0d0f use Addthis, some other attempts at fixing the weird bug 2012-08-08 09:57:32 -04:00
Tyler Renelle
73e857049e use page.redirect('/') after setting session, so don't have to use
middleware (don't need to use purl the whole time)
2012-08-06 16:55:51 -04:00
Tyler Renelle
e3700bc183 attempt fix using _.each in place of for loops 2012-08-06 16:04:49 -04:00
Tyler Renelle
203632b6a1 try using setTimeout to fix poormanscron-on-load issue 2012-08-06 13:39:27 -04:00
Tyler Renelle
6d204fb08c remove poormanscron() from refresh for now, only in setInterval 2012-08-06 12:34:54 -04:00
Tyler Renelle
a341ff9763 don't use dev logging on prod 2012-08-06 10:41:58 -04:00
Tyler Renelle
2e3e99e366 small passed.cron bug fix 2012-08-06 10:15:58 -04:00