Commit graph

940 commits

Author SHA1 Message Date
Tyler Renelle
5d53ac80fa Merge pull request #294 from Pandoro/new_pixel_art
New pixel art
2013-02-03 09:04:30 -08:00
Alex
474ca9462c As discussed in #107 I added the following:
* The full gimp file, containing all the current character pixel art for both male and female, now with different hair color and skin color.
* A CSS sprite of the above
* I took the liberty to also add @Shaners wolf, with and without black border.
2013-02-03 13:19:19 +01:00
Tyler Renelle
0d53469de5 underscore on server seems to return objects, not modify the original
- 'gender undefined' bug fix
2013-02-02 12:58:33 -05:00
Tyler Renelle
0a59d6e43d another fix on duplicates 2013-01-31 21:50:36 -05:00
Tyler Renelle
995e699130 fix to prefs migration 2013-01-31 21:28:55 -05:00
Tyler Renelle
910e67684e add armorSet to prefs migration 2013-01-31 21:22:03 -05:00
Tyler Renelle
8fa318f900 add migration for adding missing preferences (to be run) 2013-01-31 21:21:46 -05:00
Tyler Renelle
38a3c2fa9a remove cron 2013-01-31 18:56:54 -05:00
Tyler Renelle
30db654eea clean up user cron and set back down to 10 days 2013-01-31 18:43:58 -05:00
Tyler Renelle
cd331dbca5 clean up .get('/') by moving user updates & cleanup to schema.coffee 2013-01-30 15:50:54 -05:00
Tyler Renelle
e0f1d74541 don't redirect json calls to /splash.html 2013-01-30 14:17:18 -05:00
Tyler Renelle
c15d272e12 add preferences to schema (we'll later want to run a mongo migration
to move many random variables into user.preferences, such as the
'flags' document)
2013-01-30 13:37:11 -05:00
Tyler Renelle
3cb9749f57 pass in resetDom as callback to cron 2013-01-30 13:33:36 -05:00
Tyler Renelle
52b2532b5a armorset (v1 or v2) settings for females 2013-01-30 13:29:59 -05:00
Tyler Renelle
0e01160ee4 add setting for male / female 2013-01-30 13:25:10 -05:00
Tyler Renelle
480f589643 female armor version bug fix 2013-01-30 13:05:29 -05:00
Tyler Renelle
466256f793 lotsa changes! renaming male/female icons, fix tnl & current armor
refresh bug, model function for current armor (female pending)
2013-01-30 13:03:10 -05:00
Tyler Renelle
371b532e70 remove mailing list alert 2013-01-30 12:19:10 -05:00
Tyler Renelle
8dd0b4eeb2 todos.casper.coffee 2013-01-30 12:11:15 -05:00
Tyler Renelle
b9c9586696 remove toobusy 2013-01-29 15:10:27 -05:00
Tyler Renelle
003f70d5bc Merge pull request #253 from SlappyBag/master
Fixes up/down checkboxes spilling onto second line
2013-01-29 11:19:00 -08:00
Tyler Renelle
c4b4b16f0c Merge branch 'master' of github.com:lefnire/habitrpg 2013-01-29 14:13:59 -05:00
Tyler Renelle
69e577818a fix for "can't delete todos" 2013-01-29 14:09:04 -05:00
Tyler Renelle
ea00b7061c Merge pull request #255 from Pandoro/girl_pixel_art
Added girl pixel art
2013-01-29 06:53:01 -08:00
Alex
026cf38bca Added girl pixel art 2013-01-29 14:37:31 +01:00
Stan Lindsey
04501af827 Magic Number Width Checkboxes 2013-01-29 10:20:30 +00:00
Tyler Renelle
bb4fa87f4a use data-targets instead of hrefs for modal links. fixes mobile 2013-01-29 00:50:36 -05:00
Tyler Renelle
0cbca80acb Revert "back to original mongo_store style"
This reverts commit 3fdd43aeee.
2013-01-29 00:12:53 -05:00
Tyler Renelle
3242ce6e95 account for undfined lastCrons 2013-01-29 00:02:30 -05:00
Tyler Renelle
4fae8f05a4 move flash error down below header 2013-01-28 23:56:44 -05:00
Tyler Renelle
aca5ad4ca7 handle missing crons @WIP 2013-01-28 22:32:04 -05:00
Tyler Renelle
3fdd43aeee back to original mongo_store style 2013-01-28 22:05:17 -05:00
Tyler Renelle
59b80a62f6 disable cron for now, back up to 1mo. 2013-01-28 22:03:34 -05:00
Tyler Renelle
c6ede3b5f8 Merge branch 'master' into preen-users
Conflicts:
	src/app/index.coffee
	src/app/scoring.coffee
2013-01-28 21:50:50 -05:00
Tyler Renelle
c147d4775a taskObj tweaks 2013-01-28 21:44:26 -05:00
Tyler Renelle
0512aacbbf another attempt at cron set optimizations 2013-01-28 21:28:45 -05:00
Tyler Renelle
77ac68ecc0 Merge branch 'master' into preen-users 2013-01-28 20:14:39 -05:00
Tyler Renelle
d7e28ea07f some tweaks to last merge 2013-01-28 20:09:57 -05:00
Tyler Renelle
c2cd3d8498 Merge pull request #227 from SlappyBag/master
Static Header & Popups
2013-01-28 17:06:50 -08:00
Stan Lindsey
29387b9c03 Update styles/app/index.styl 2013-01-29 00:22:43 +00:00
Stan Lindsey
9ef4236bb7 Removed edits 2013-01-29 00:22:22 +00:00
Stan Lindsey
6e4d14d64f Update styles/bootstrap-responsive.styl 2013-01-28 23:39:10 +00:00
Stan Lindsey
858c2dded7 Update styles/bootstrap-responsive.styl 2013-01-28 23:36:25 +00:00
Tyler Renelle
278cd04fd1 rewards tests 2013-01-28 18:22:19 -05:00
Tyler Renelle
26462be457 more todos/dailies test cleanup 2013-01-28 18:10:59 -05:00
Stan Lindsey
ad3221a846 Update styles/app/index.styl 2013-01-28 22:56:14 +00:00
Tyler Renelle
d5f36a291c todos tests (stub) 2013-01-28 17:43:50 -05:00
Tyler Renelle
4a7b5183f8 dailies tests 2013-01-28 17:42:48 -05:00
Tyler Renelle
24979d35df habits tests 2013-01-28 17:37:36 -05:00
Tyler Renelle
c3810cf7ea registration tests 2013-01-28 17:31:10 -05:00