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

44 Commits

Author SHA1 Message Date
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 d4d18dcee5 Added triad bingo achievement 2015-01-16 12:14:51 -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 97a48eb66e chore(grunt): grunt full 2015-01-05 17:00:17 -06:00
Blade Barringer 9b34cfe8c6 Compiled mountmaster achievement medal 2015-01-01 21:17:37 -06:00
Sabe Jones fba6472b7e chore(grunt): grunt full 2014-12-30 22:21:16 -06:00
Sabe Jones 9d279b7a77 chore(grunt): grunt full 2014-12-25 17:43:31 -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 ac2ce59873 chore(grunt): grunt 2014-12-09 21:16:00 -06: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 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 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 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 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 133634c247 feat(fall): special fall gear 2014-09-16 17:30:22 -06:00
Tyler Renelle 2790ee1bab feat(fall): Add candy drops. Add canDrop & canBuy to food, handled separately for this 
event and future events
 2014-09-16 17:25:58 -06:00
Tyler Renelle fc73c0841f feat(quests): add rooster rampage quest 2014-09-16 16:08:21 -06:00
Tyler Renelle 60b93367e5 feat(backgrounds): september 2014 backgrounds 2014-09-02 12:02:37 -06:00
Tyler Renelle 11f3055913 feat(mystery): august mystery 2014-08-25 17:16:16 -06:00
Tyler Renelle 475e4c0e4e feat(quests): Parrot quest 2014-08-18 19:00:36 -06:00
Tyler Renelle d3520e48e4 feat(quests): lvl 15 ATOM quest drop 2014-08-12 16:18:08 -07:00
Tyler Renelle b73cc259b2 feat(backgrounds): add august bgs set 2014-08-05 15:16:31 -06:00
Phillip Thelen 766f663b02 Add skin images with sleeping eyes and make ZZZ more visible 2014-08-03 20:33:21 +02:00
Tyler Renelle b3fd859cad chore(npcs): back to normal npcs 2014-08-01 14:07:01 -06:00
Tyler Renelle 050b6fc1f4 chore(spritesmith): bump sheets from 4 to 6, fixes for android 2.3 - may 
for other users too
 2014-07-31 20:27:04 -06:00
Tyler Renelle ec39634458 fix(spritesmith): split spritesheets in to multiple files to remove the 
blurry iOS issue. Fixes
https://github.com/HabitRPG/habitrpg/issues/2510, see
http://goo.gl/IwxdI4 . Note, this commit isn't smart/dynamic, there's
commented-out code for handling dynamic splitting, but I couldn't get it
working - static 4 sheets for now
 2014-07-31 15:44:22 -06:00