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

287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Renelle 69d248f826 grunt-spritesmith #37 backer & contrib spritesheets support 2013-12-05 15:46:08 -07:00
Tyler Renelle ee4777d5e8 classes spritesmith #37 remove chin outlines from helms so they won't 
cover beards. move head_warrior_0 to head_0 so it doesn't add
extra chin outline. We'll need to figure out how to handle class_0 for
each class
 2013-12-05 10:46:27 -07:00
Tyler Renelle 9ce88004cb classes spritesmith #37 rogue knife weapon/off-hand shop-sprites 2013-12-05 10:10:10 -07:00
Tyler Renelle 3c68bd90da classes & spritesmith [#37] fixes to top 3 rogue helms 2013-12-05 09:49:56 -07:00
Tyler Renelle 4818c0a830 classes: temporarily switch rogues to knives instead of bows, revisit 
this commit - incomplete
 2013-12-05 03:46:11 -07:00
Tyler Renelle e7c7ab099e spritesmith [#37] @crystalphoenix BEARDS! 2013-12-05 02:27:43 -07:00
Tyler Renelle 7c6d2cfe31 classes spritesmith [#37] add shop 300-tier items 2013-12-05 02:04:03 -07:00
Tyler Renelle 1fd63c00c1 grunt-spritesmith [#37] add initial shop-sprites (these may need adjusting) 2013-12-05 01:34:07 -07:00
Tyler Renelle 2a417cd201 classes: add level requirements for spells, remove derby cleanup, unlock 
classes properly
 2013-12-04 23:53:15 -07:00
Tyler Renelle 80eb0f564a spritesmith [#37] fixes to shop-sprites 2013-12-04 23:09:45 -07:00
Tyler Renelle a0ea8dbca2 costumes: add costume support (supporting habitrpg#5fea978) 2013-12-04 22:50:43 -07:00
Tyler Renelle b74f4905f9 [#37]grunt-spritesmith: re-organize folders 2013-12-04 20:01:37 -07:00
Tyler Renelle 8aa89b8ee4 [#37]grunt-spritesmith: add 300-tier (@lemoness) 2013-12-04 20:01:35 -07:00
Tyler Renelle 94603fa0ca [#37]grunt-spritesmith: NPCs (this is a big one!) 2013-12-04 20:01:33 -07:00
Tyler Renelle 417986c6b4 [#37]grunt-spritesmith: shop sprites 2013-12-04 20:01:29 -07:00
Tyler Renelle 0f3f67b6b3 [#37]grunt-spritesmith: death & paws 2013-12-04 20:01:27 -07:00
Tyler Renelle 7dd4216b0f [#37]grunt-spritesmith: death 2013-12-04 20:01:25 -07:00
Tyler Renelle 3026cc2132 [#37] grunt-spritesmith: achievements 2013-12-04 20:01:14 -07:00
Tyler Renelle 53bbb20ba6 [#37] class: misc cleanup (moving / deletions) 2013-12-04 20:01:04 -07:00
Tyler Renelle 9c135482a2 [#37] classes: move m/f => broad/slim, add those body-types in, fix hair positioning 2013-12-04 20:00:50 -07:00
Tyler Renelle 6c927414d1 grunt-spritesmith: eggs, food, hatchingPotions, gems #37 2013-12-03 18:43:08 -07:00
Tyler Renelle e204bed2d9 Merge @Shaners eggs with food sprites 2013-12-03 18:21:25 -07:00
Tyler Renelle 4bbf0cfae8 Merge remote-tracking branch 'Shaners/contrib' into classes 
Conflicts:
	img/sprites/Egg_Sprite_Sheet.png
	img/sprites/archive/BackerOnly-Shop-temporary.png
	img/sprites/archive/player_sprites.png
	img/sprites/archive/player_sprites105x.png
 2013-12-03 18:16:33 -07:00
Tyler Renelle 9409f5ee7f grunt-spritesmith eggs #37 2013-12-03 18:11:50 -07:00
Tyler Renelle 5c97887d0d Merge branch 'master' into classes 
Conflicts:
	img/sprites/Mount-SpriteSheet.png
 2013-12-03 18:10:08 -07:00
Tyler Renelle 0ffc836120 mounts: mounts & food sprites & css 2013-12-03 18:04:51 -07:00
Tyler Renelle dbd7aaf4c4 classes: spritesmith add pets 2013-12-03 17:58:37 -07:00
Tyler Renelle 5ebf3a7802 classes: spritesmith wip #37 2013-12-03 16:49:54 -07:00
Tyler Renelle c46795e7a5 classes: grunt-spritesmith WIP #37 (working for male sprites now) 2013-12-03 16:32:20 -07:00
Tyler Renelle 091600d7fc classes: add _statsComputed property, and sample 
`user.stats.buffs.stealth` handling (@SabreCat @danielthebard)
 2013-12-02 19:14:29 -07:00
Tyler Renelle f662b3af18 Merge branch 'master' into classes 
Conflicts:
	dist/habitrpg-shared.js
	dist/spritesheets.css
	script/items.coffee
 2013-12-01 19:24:40 -07:00
Tyler Renelle 9976610652 classes: armory WIP 2013-11-30 16:32:09 -07:00
Tyler Renelle 0d0080ace4 Merge pull request #47 from HabitRPG/sabe/classes 
Draft of names, descriptions, stats, and costs for class-based equipment
 2013-11-30 11:29:07 -08:00
Tyler Renelle 5d0b925a4c fix tests for 282e105 . May be temporary, unless we verify that 282e105 
was the fix for https://github.com/HabitRPG/habitrpg/issues/1057
 2013-11-29 17:21:22 -07:00
Tyler Renelle 282e105ea3 [https://github.com/HabitRPG/habitrpg/issues/1057] don't exit-early when 
attempting to detect if they've switched timezones. Also, don't need to
sanitize user.lastCron in shared, do it in Mongoose
 2013-11-29 17:15:41 -07:00
Tyler Renelle bf7f7b6583 [#1057] use sanitized o.dayStart, not options.dayStart. slightly better sanitize(dayStart) 2013-11-29 16:47:08 -07:00
Sabe Jones b2a4d215a8 Draft of names, descriptions, stats, and costs for class-based equipment. 2013-11-29 17:31:43 -06:00
snicker 671c130512 Merge pull request #45 from snicker/master 
suggested fix for adding "special" pets
 2013-11-28 13:45:40 -08:00
Nick Gordon 9b0eea6624 grunted 2013-11-28 13:42:29 -08:00
Nick Gordon f977bd5171 I don't know much about coffeescript, but this build should pass now 2013-11-28 12:46:49 -08:00
Nick Gordon 328a9d28dc suggested fix for adding "special" pets so that the list does not have to be duplicated multiple times. the user model can be updated in habitrpg to pull from here instead of hard coding it 2013-11-27 22:50:19 -08:00
Tyler Renelle cd7d490ae3 fix #1937 (missing justin npc) @SabreCat 2013-11-27 18:56:03 -07:00
Tyler Renelle 7e5eda10d9 Merge pull request #44 from snicker/master 
adding emoji images
 2013-11-27 16:46:05 -08:00
Tyler Renelle 73d8e00406 thanksgiving turkey & npcs 2013-11-27 11:58:19 -07:00
Nick Gordon 20cb03f93c adding emoji images 2013-11-27 10:23:04 -08:00
Dušan Juretić b9abc31edb added test for countPets 2013-11-23 23:57:16 -03:00
Dušan Juretić b89cce001f fix readme: use npm test to run tests 2013-11-23 23:33:24 -03:00
Tyler Renelle 3d93f63216 classes: multi-class items WIP 2013-11-23 17:00:55 -07:00
Tyler Renelle 71d832f263 Merge pull request #43 from DanielTheBard/classes 
Updated Abilities
 2013-11-23 12:52:48 -08:00
Daniel the Bard c2810a4074 Merge branch 'classes' of https://github.com/DanielTheBard/habitrpg-shared into classes 
Conflicts:
	script/items.coffee
 2013-11-23 14:27:50 -05:00