Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,739 Commits 64 Branches 1,256 Tags
e907e2e4eedbb07b5eb8564cfc15ef61ac7bcf84
Commit Graph

150 Commits

Author SHA1 Message Date
Alice Harris 6ca9c10cda change some comments 2015-01-26 14:53:13 +10:00
Blade Barringer cc6cb3785e Merge branch 'mountmaster' into bailey-20150120 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
 2015-01-20 10:39:45 -06:00
Blade Barringer 8b864e114b Compiled spritesheets 2015-01-18 21:11:49 -06:00
Blade Barringer 5b2c4d5a09 Compiled css 2015-01-16 12:23:25 -06:00
Blade Barringer 75cf2a4788 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
 2015-01-16 10:46:59 -06:00
Sabe Jones c1d1d7d4a5 chore(grunt): grunt full 2015-01-15 16:52:59 -06:00
Blade Barringer 83d91dfe34 Merged in changes from develop and re-ran grunt full 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	dist/spritesmith5.css
	dist/spritesmith5.png
 2015-01-10 09:33:52 -06:00
Sabe Jones 8bd32e0f35 chore(grunt): grunt full 2015-01-08 15:29:41 -06:00
Blade Barringer 8f90d154a0 Merge remote-tracking branch 'upstream/develop' into mountmaster 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
 2015-01-08 11:30:53 -06:00
Sabe Jones 61b827183b fix(grunt): Push CSS 2015-01-05 17:15:05 -06:00
Sabe Jones 83559c5d98 chore(January): Jan updates 
Reverts New Year's NPCs to normal winter garb and updates the Mystery Item package to its January scheme.
 2015-01-01 23:18:18 -06:00
Blade Barringer 9b34cfe8c6 Compiled mountmaster achievement medal 2015-01-01 21:17:37 -06:00
Blade Barringer 611e350b63 Compiled changes to spookdust and snowball in task view 2014-12-31 09:31:09 -06:00
Blade Barringer 015ab34a4f Compiled images with cards 2014-12-31 08:40:50 -06:00
Blade Barringer 63a96db650 Merge branch 'develop' into resize-special-items 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith3.css
	dist/spritesmith3.png
 2014-12-31 08:37:17 -06:00
Sabe Jones fba6472b7e chore(grunt): grunt full 2014-12-30 22:21:16 -06:00
Blade Barringer 72e705b9f0 Compiled the image changes to sprites and min css files 2014-12-30 11:30:41 -06:00
Blade Barringer e2e3b3944b Compiled hydra pet and css. Closes #272 2014-12-29 22:41:08 -06:00
Sabe Jones 2cac24ebe9 chore(grunt): grunt full 2014-12-25 18:09:29 -06:00
Sabe Jones 9d279b7a77 chore(grunt): grunt full 2014-12-25 17:43:31 -06:00
Sabe Jones eb0d19fa29 chore(grunt): grunt full 2014-12-21 15:45:13 -06:00
Sabe Jones ef02e059c7 chore(grunt): grunt full 2014-12-21 15:24:55 -06:00
Sabe Jones 8d645bcafd chore(grunt): grunt full 
Also flips Ian NPC to standard spritesmith instead of animated GIF.
 2014-12-21 10:57:02 -06:00
Sabe Jones 19930226c7 chore(grunt): grunt 2014-12-14 14:24:37 -06:00
Sabe Jones ac2ce59873 chore(grunt): grunt 2014-12-09 21:16:00 -06:00
Tyler Renelle 3de86f35cb fix(plans): attempted fix for: Cast to number failed for value "NaN" at 
path "purchased.plan.consecutive.count", see https://github.com/HabitRPG/habitrpg/issues/4317
 2014-12-06 12:49:19 -07:00
Tyler Renelle cb8c1359c4 fix(plans): mystery 3014 promo 2014-12-03 19:24:26 -07:00
Tyler Renelle d81badde69 feat(plans): add time traveler - buy individual mystery items 2014-12-03 15:24:08 -07:00
Sabe Jones d7b904efec chore(December): grunt 2014-11-30 23:08:53 -06:00
Tyler Renelle 192110e25a grunt 2014-11-29 09:04:58 -07:00
Tyler Renelle eb80bdf3e0 grunt(turkey-mount) 2014-11-26 19:10:22 -07:00
Tyler Renelle 22cddb1086 feat(mystery): mystery 201411 2014-11-24 19:34:47 -07:00
Tyler Renelle b88a48ebd3 grunt(owl) 2014-11-18 23:06:13 -08:00
Tyler Renelle d74f9d7a47 fix(goldenknight): add shop img for shield_special_goldenknight and fix 
translation issues, fixes https://github.com/HabitRPG/habitrpg/issues/4249
 2014-11-17 12:14:14 -08:00
Tyler Renelle 9bb40d6a96 feat(invite-friends): add basilist quest 2014-11-12 19:23:43 -07:00
Tyler Renelle 73bdc0dbaf feat(quests): golden knight chain 2014-11-11 20:59:31 -07:00
Tyler Renelle c53e6a23cf feat(backgrounds): add new backgrounds 2014-11-04 19:45:42 -07:00
Tyler Renelle 3fc4978176 feat(fall): back to default npcs 2014-11-02 23:10:48 -07:00
Tyler Renelle 3132bbcb41 feat(fall): back to fall npcs 2014-11-01 13:28:32 -06:00
Tyler Renelle 6f3c855db0 feat(halloween): halloween sprites 2014-10-31 13:05:22 -06:00
Tyler Renelle 3c249725af feat(mystery): mystery items 2014-10 2014-10-24 20:32:40 -06:00
Tyler Renelle d3ca101dd8 feat(quests): add moonstone chain, lvl drop at 60 2014-10-23 10:33:20 -06:00
Tyler Renelle 11761f9ee2 feat(quests): spider quest 2014-10-12 19:29:18 -06:00
Tyler Renelle 76d4f684cf feat(halloween): add jackolantern pet 2014-10-06 15:39:38 -06:00
Tyler Renelle 5718fb183a feat(backgrounds): replace spookyForest with pumpkinPatch 2014-10-02 23:06:34 -06:00
Tyler Renelle 786f9a92df feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:05:28 -06:00
Tyler Renelle 29262826e2 feat(backgrounds): october backgrounds 2014-10-02 18:47:11 -06:00
Tyler Renelle c635fef960 grunt() 2014-09-30 20:29:16 -06:00
Tyler Renelle ee39286c8d feat(mystery): 201409 2014-09-24 23:21:05 -06:00
Tyler Renelle bf7f65e8c8 feat(fall): npc-swap 2014-09-16 17:43:46 -06:00