Commit graph

195 commits

Author SHA1 Message Date
Tyler Renelle
f0cc17bfaf Merge remote-tracking branch 'djuretic/rewrite' 2013-11-05 14:54:48 -08:00
Tyler Renelle
8e38aa1332 better task defaults, since we may not be able to use Mongoose
TaskSchema (see http://goo.gl/a5irq4)
2013-11-02 11:11:28 -07:00
Matteo Pagliazzi
8503c37fde compile & upgrade browserify for grunt-browserify 2013-11-02 09:55:18 +01:00
Matteo Pagliazzi
669f39a48d upgrade lodash to 2.2.1 2013-11-02 09:53:09 +01:00
Tyler Renelle
f785621da4 grunt for task defaults issue 2013-11-01 13:27:08 -07:00
Tyler Renelle
6d786b43dd add task._id = task.id on taskDefaults 2013-11-01 13:03:27 -07:00
Tyler Renelle
084c7d3001 remove workaround 2013-11-01 13:01:38 -07:00
Tyler Renelle
a374f67549 [#1708] tmp workaround for task not defined 2013-11-01 12:43:57 -07:00
Dušan Juretić
8743e00b62 show how to run tests in readme 2013-10-31 22:07:19 -03:00
Matteo Pagliazzi
8531fb33b2 revert lodash version 2013-10-31 16:39:03 +01:00
Matteo Pagliazzi
d4b3d239e9 upgrade lodash to 2.2.x 2013-10-31 16:10:20 +01:00
Tyler Renelle
3a89c36366 Merge pull request #36 from Shaners/rewrite
Add golden paw graphic for missing but obtainable rare pets.
2013-10-30 21:33:55 -07:00
Shaners
d1de22f3e1 Add golden paw graphic for missing but obtainable rare pets. 2013-10-30 21:20:20 -07:00
Tyler Renelle
1bfb6a88fd Merge remote-tracking branch 'shaners/rewrite'
Conflicts:
	dist/spritesheets.css
2013-10-29 23:15:03 -07:00
Tyler Renelle
5c915547b0 Merge branch 'challenges' 2013-10-29 23:10:55 -07:00
Shaners
4b6d49a172 Add contributor shop sprites. 2013-10-28 23:13:05 -07:00
Shaners
3b241f81ba Merge branch 'rewrite' of https://github.com/Shaners/habitrpg-shared into rewrite 2013-10-28 22:22:54 -07:00
Shaners
620af8ed1f Add contributor weapon and shield 2013-10-28 22:18:37 -07:00
Tyler Renelle
91c1bd2ddb challenges: remove derby stuff 2013-10-28 09:13:18 -07:00
Shane Lister
399604c886 Update backer.css 2013-10-27 19:16:18 -07:00
Shane Lister
c05430aecc Update spritesheets.css 2013-10-27 19:15:33 -07:00
Dušan Juretić
fab7a10920 make cron tests locale aware (first day of the week) 2013-10-27 20:34:36 -03:00
Dušan Juretić
ecc8ff740e add lastDrop to helpers.newUser 2013-10-27 16:23:02 -03:00
Dušan Juretić
dd79638bac allow any branch in travis builds 2013-10-27 16:23:02 -03:00
Dušan Juretić
b5fefc2664 add test for priority values 2013-10-27 16:23:02 -03:00
Dušan Juretić
48393637fc using length matcher to have more helpful error messages 2013-10-27 16:23:02 -03:00
Matteo Pagliazzi
72bf5d7073 Merge branch 'rewrite' of https://github.com/HabitRPG/habitrpg-shared into rewrite 2013-10-27 12:13:26 +01:00
Matteo Pagliazzi
d7416117f9 award ultimate gear achievement 2013-10-27 12:13:06 +01:00
Shaners
8fed3f5c5a Add contributor-only pet - Hydra 2013-10-26 18:17:44 -07:00
Tyler Renelle
49cce86e60 Merge pull request #32 from Shaners/rewrite
Fix for female red hair missing pixels
2013-10-25 10:32:15 -07:00
Shaners
32101e5ffc Fix for female red hair missing pixels 2013-10-24 23:35:11 -07:00
Tyler Renelle
04048e9768 [#30] grunt 2013-10-24 12:12:13 -07:00
Tyler Renelle
0f621fe00b Merge pull request #30 from HabitRPG/paglias/reeset-lastdrop
Reset lastDrop to zero when day ends
2013-10-24 12:05:38 -07:00
Tyler Renelle
e84b1975a9 add hair to customizer options & run grunt 2013-10-24 10:56:15 -07:00
Tyler Renelle
c15ab8d413 Merge pull request #31 from Shaners/rewrite
New Red Hair Option
2013-10-24 10:10:37 -07:00
Shaners
212a4206c6 Added red hair option. Fixed a few minor pixel grid alignment issues 2013-10-23 23:50:11 -07:00
Matteo Pagliazzi
79e0d5cba2 upgrade browseridy to 2.34.x and grunt build 2013-10-23 18:25:41 +02:00
Matteo Pagliazzi
9285a3e44b add streak achievements 2013-10-23 18:01:35 +02:00
Tyler Renelle
2ca7b27503 add inline for gems 2013-10-22 19:23:27 -07:00
Tyler Renelle
0ffd26509c halloween: add halloween NPCs (thanks to @lemoness) 2013-10-22 16:20:18 -07:00
Tyler Renelle
06e489dfc5 halloween: consolidate customizer button css. was duplicated bw mobile &
web, copy into habitrpg-shared, remove from those projects, remove regex
css selectors (they weren't working), add crazy & monster skins
2013-10-22 16:05:20 -07:00
Tyler Renelle
9c06537e50 halloween: fix pixel adjustments on male & female sprites' arms 2013-10-22 15:01:23 -07:00
Tyler Renelle
b36e9a51c1 halloween: male_sprites give monster & pumpkin ears & head-cap (they got
copied over from female without modification @lemoness)
2013-10-22 14:52:49 -07:00
Tyler Renelle
f9c2fce4aa halloween: male sprites 2013-10-22 14:46:44 -07:00
Tyler Renelle
d7482fedc5 halloween: add Crazy Skin & Halloween Skin for female sprites 2013-10-22 14:32:26 -07:00
Matteo Pagliazzi
607336f56e reset lastDrop to zero when day end 2013-10-22 21:45:33 +02:00
Tyler Renelle
b0ebeb8c2c grunt build 2013-10-21 10:25:27 -07:00
Meagan
b3ba04de0f Merge pull request #29 from HabitRPG/mevanoff/bug
hopefully fix for apparent ios7 issue
2013-10-20 17:35:25 -07:00
meaganoff
46bc1545d1 hopefully fix for apparent ios7 issue 2013-10-20 19:34:53 -05:00
Dušan Juretić
e6d0f405e3 add .travis.yml 2013-10-16 17:34:39 -07:00