Commit graph

158 commits

Author SHA1 Message Date
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
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
Tyler Renelle
68e2d1c3ce Merge pull request #24 from djuretic/rewrite
Add .travis.yml
2013-10-16 17:32:35 -07:00
Tyler Renelle
d37aad9f04 Merge pull request #26 from Shaners/rewrite
Adding custom backer items from Leslie.
2013-10-15 23:04:18 -07:00
Shaners
eeea9d2746 Adding custom backer items from Leslie. 2013-10-15 22:30:13 -07:00
Tyler Renelle
fe9446c1d5 Merge pull request #25 from djuretic/test_drops
Added drop system tests
2013-10-15 20:03:22 -07:00
Dušan Juretić
6ef96c1f83 added drop system tests, stubbing Math.random with sinon 2013-10-05 22:12:42 -03:00
Dušan Juretić
479075ac21 add .travis.yml 2013-09-29 11:37:31 -03:00
Tyler Renelle
0c73790586 Merge pull request #23 from djuretic/rewrite
More unit tests
2013-09-29 06:37:11 -07:00
Dušan Juretić
f9d39103ed add test of 'to next level' experience 2013-09-28 19:25:46 -03:00
Dušan Juretić
49d73543e0 add test for revival 2013-09-28 19:21:45 -03:00
Dušan Juretić
db8723f0d2 add tests for store operations 2013-09-28 18:36:23 -03:00
Dušan Juretić
c9edf64d7f remove console.log in test 2013-09-28 18:28:57 -03:00
Tyler Renelle
641c3de6ef Merge pull request #22 from Shaners/rewrite
Adds new skin tones
2013-09-27 08:38:15 -07:00
Tyler Renelle
315b70f294 Merge pull request #21 from djuretic/rewrite
Corrected rounding of gold & silver calculations
2013-09-26 18:38:33 -07:00
Shaners
a5c7578e6d Adds new skin tones 2013-09-24 21:56:08 -07:00
Dušan Juretić
939bca1eb9 add silver leading zero 2013-09-23 23:30:13 -03:00
Dušan Juretić
c60f6f1c23 corrected rounding of gold & silver calculations 2013-09-23 23:03:11 -03:00
Tyler Renelle
d130989fd9 Merge pull request #20 from djuretic/rewrite
Tests now passing
2013-09-22 12:51:04 -07:00
Dušan Juretić
e664037fb9 tests now passing, fixes #18 2013-09-22 16:28:30 -03:00
Tyler Renelle
fc23bdb7c8 fixes to dotSet & dotGet which allow getting / setting deep paths that don't exist 2013-09-17 13:45:30 -04:00
Matteo Pagliazzi
ae4f3a6481 order css files & rebuild 2013-09-13 21:09:32 +02:00
Tyler Renelle
40b0e13112 add HISTORY_PREEN.js, a script we need to add to cron function (TODO) 2013-09-08 21:10:42 -04:00
Tyler Renelle
1e9ef6d2e2 re-build. was getting revive errors for some reason 2013-09-04 15:49:39 -04:00
Tyler Renelle
f5271ae866 Merge pull request #17 from HabitRPG/paglias/optimizations
Export moment and lodash in browser
2013-09-04 07:12:12 -07:00
Matteo Pagliazzi
da70845b94 build 2013-09-04 13:10:44 +02:00
Matteo Pagliazzi
517afd19a4 export moment and lodash in browser 2013-09-04 13:10:12 +02:00
Tyler Renelle
516f947d9b fail-safe dotSet for now until I can figure out what's triggering the error 2013-09-03 22:03:36 -04:00
Tyler Renelle
7fbb316f0b Merge pull request #16 from HabitRPG/paglias/optimizations
Optimizations
2013-09-03 09:31:53 -07:00
Matteo Pagliazzi
6a15072348 comment 2013-09-03 17:16:47 +02:00
Matteo Pagliazzi
fd9fee93e1 change some paths, js file size reduced by around 400kb 2013-09-03 17:08:22 +02:00
Tyler Renelle
76afd47953 build with new changes 2013-09-02 21:40:45 -04:00
Tyler Renelle
effa8ab2bd Merge branch 'rewrite' of github.com:HabitRPG/habitrpg-shared into rewrite
Conflicts:
	dist/habitrpg-shared.js
	spritesheets.css
2013-09-02 21:39:57 -04:00
Tyler Renelle
04de115877 don't run drops on the client. they will be wiped on refresh anyway,
only run on the server (we still need a way to notify users when a drop
happened on the server)
2013-09-02 20:51:21 -04:00
Tyler Renelle
4174412b11 small tweaks to user._tmp, and fixing my own icon 2013-09-02 17:35:00 -04:00
Tyler Renelle
d7db4a91de Merge pull request #14 from paglias/add-zzz
Add zzz classes and light version
2013-08-30 06:12:29 -07:00
Matteo Pagliazzi
bd7adda005 add zzz light version and classes 2013-08-30 10:19:13 +02:00
Tyler Renelle
83a711e796 update readme 2013-08-26 22:33:56 -04:00