Commit Graph

906 Commits

Author SHA1 Message Date
deilann 024b6efd2b Merge pull request #187 from PeterHatch/update-crystal-helmet
Updated Crystal Helmet to work with full beards.
2014-03-27 20:40:23 -07:00
Peter Hatch 18ac472bc6 Updated Crystal Helmet to work with full beards. 2014-03-27 17:31:50 -07:00
deilann 2ba5871c25 Merge pull request #184 from PeterHatch/redo-shop-images
Redid all shop images.
2014-03-27 14:40:23 -07:00
Peter Hatch f497a41524 Updated shop images for mystery_201403 items. 2014-03-27 14:37:55 -07:00
Peter Hatch 4b54d09abf Moved mystery_201402 items to their own event folder; made events with few items not have their own shop folder. 2014-03-27 13:57:02 -07:00
Matteo Pagliazzi 48c9d29ad4 chore(i18n): update locales 2014-03-27 21:39:20 +01:00
Peter Hatch 8d325794fd Redid all shop images.
Reworked all shop images to always be 2x2 pixel blocks (2/3rds the
original size), never scaled unevenly.

Also went through and touched up every image if needed, removing
transparent pixels for the hand on each weapon, removing arm outlines
from armors that don't cover the arm, and so on.
2014-03-27 13:18:51 -07:00
Tyler Renelle 912f871b47 Merge pull request #185 from meganstrickland/develop
Desert Deer pet sprite correction
2014-03-26 15:33:34 -06:00
meganstrickland 23a1854b7e Desert Deer pet sprite correction
The Desert Deer pet was using the Base Deer artwork. I've just replaced
the file.
2014-03-26 14:00:51 -07:00
Matteo Pagliazzi 72dbb70b9e chore(i18n): update locales 2014-03-26 19:03:23 +01:00
Tyler Renelle f8d5fad086 feat(mystery): march mystery set 2014-03-24 23:40:09 -06:00
Tyler Renelle c42117dfd4 chore(grunt): grunt 2014-03-24 22:20:18 -06:00
Tyler Renelle ecbf34dbf9 Merge pull request #181 from PeterHatch/fix-slim-umbral-armor
Moved slim Umbral Armor up one 3x3 pixel block, so it matches other rogue armor.
2014-03-24 18:16:45 -06:00
deilann adde58e3af Merge pull request #183 from deilann/addspringstats
add stats to spring equipment descriptions
2014-03-23 19:19:04 -07:00
deilann 8add2b4116 removing weird spacing 2014-03-23 19:18:09 -07:00
deilann b4b3df51de Adds stats to Spring equipment descriptions 2014-03-23 19:15:45 -07:00
Sabe Jones 9faea5e9d7 Merge pull request #178 from PeterHatch/special-class-bonus
Gain the class bonus when using event equipment that belongs to your class.
2014-03-23 21:03:05 -05:00
Sabe Jones cb268523c0 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-shared into develop 2014-03-23 20:41:05 -05:00
Tyler Renelle 133c4d263a Merge pull request #177 from PeterHatch/remove-unused-images
Remove some unused images.
2014-03-23 19:40:44 -06:00
Sabe Jones f4d5ce83cb fix(Spring): Add stats text to Spring gear
Clarifies to users that the Spring Fling event items are not all purely cosmetic.
2014-03-23 20:40:38 -05:00
Peter Hatch 56a95ef567 Moved slim Umbral Armor up one 3x3 pixel block, so it matches other rogue armor. 2014-03-23 18:21:57 -07:00
Peter Hatch c30fbcfe71 Updated dist files by running grunt full. 2014-03-23 16:36:06 -07:00
deilann 3055d47f0b Merge pull request #179 from PeterHatch/fix-spring-stats
Made Clover-steel Helmet boost strength instead of perception; increased...
2014-03-23 16:35:32 -07:00
Peter Hatch 5f51e7c7ac Reverted change to cost of Hook Claws. 2014-03-23 16:31:11 -07:00
Peter Hatch 46b31237f2 Made Clover-steel Helmet boost strength instead of perception; increased cost of Hook Claws to match Ninja-to and Ski. 2014-03-23 15:52:15 -07:00
Peter Hatch e019985e81 Gain the class bonus when using event equipment that belongs to your class. 2014-03-23 15:29:47 -07:00
Peter Hatch 40ea10dc11 Remove some unused images. 2014-03-23 14:45:45 -07:00
deilann 43555cef30 Merge pull request #176 from PeterHatch/fix-spring-mage-staff
Made Swiss Cheese Staff two-handed.
2014-03-23 13:36:15 -07:00
Peter Hatch 2959dbca11 Made Swiss Cheese Staff two-handed. 2014-03-23 13:30:48 -07:00
Dušan Juretić e5901bf0e0 Refactoring tests, added custom matchers for helpful error messages 2014-03-22 20:15:06 -03:00
Sabe Jones 4178f0ba32 fix(quests): Remove double chance for quest drops
Makes collection quests maybe, possibly take more than a single day to complete for an average party. Doubled chances not fed through diminishingReturns: overkill.
2014-03-21 22:56:28 -05:00
Tyler Renelle ca290692dd feat(deer): add ghost-stag quest & deer pets + mounts. 2014-03-21 21:34:24 -06:00
Tyler Renelle 7147287164 chore(Merge): remote-tracking branch 'PeterHatch/develop' into develop
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith.css
	dist/spritesmith.png
2014-03-21 20:07:19 -06:00
Tyler Renelle bfa7fbabd0 fix(spring): 'mage' => 'wizard' class for spring-fling gear 2014-03-21 16:14:09 -06:00
Tyler Renelle 50132f1a35 feat(equipment): remove base gear from equipment tabs. now clicking the
same gear you have equipped will un-equip it
2014-03-21 15:06:26 -06:00
Tyler Renelle 6c2b45ff01 feat(spring): spring fling event class gear. Also! moving tons of folders around for better organizationfeat(spring): spring event class gear. Also! moving tons of spritesmith folders around for better organization 2014-03-21 14:53:30 -06:00
Tyler Renelle 74f62e7c1c feat(accessories): add head accessory 2014-03-21 14:02:29 -06:00
Tyler Renelle 7b8e0dc0a4 feat(march): replace npcs with march versions (revert here when done) 2014-03-21 12:31:47 -06:00
Tyler Renelle 60518f283e feat(march): march npcs 2014-03-21 12:30:36 -06:00
Tyler Renelle e53ef26d4c feat(flower): add flower customization option 2014-03-21 12:30:36 -06:00
Tyler Renelle 574f540fe3 Merge pull request #173 from jbutz/fix_put_task_id
Fix #730: id property ignored when updating task
2014-03-21 09:21:43 -06:00
Sabe Jones 34c594d333 fix(quests): Temporarily remove "booted" text
Users are confused by the fact that dying doesn't actually eject them from their current quest, as advertised. This commit removes that text from the English locale; we can put it back when the feature is implemented.
2014-03-20 19:04:25 -05:00
Jason Butz 887a0c3c8e Fix #730: id property ignored when updating task
When calling the user.updateTask function if there was an id in the body it would override the id from the request URI
2014-03-20 16:56:34 -04:00
Peter Hatch e373ccba35 Aligned Nunchaku's transparent pixel with the character's hand. 2014-03-20 13:08:59 -07:00
Matteo Pagliazzi c9d880f584 fix(i18n): typo and update locales 2014-03-20 14:32:10 +01:00
Sabe Jones 5506a2b4e4 feat(difficulty): Add string for difficulty page
Adds a string token for the not-yet-implemented Difficulty page.
2014-03-19 18:24:46 -05:00
Matteo Pagliazzi 1bc87c80d3 fix(content): typo 2014-03-18 19:55:07 +01:00
Matteo Pagliazzi 3f03359c91 chore(i18n): update locales 2014-03-18 19:53:41 +01:00
Tyler Renelle 3927b14119 feat(stPatties): st. patties npc_daniel 2014-03-17 13:07:48 -06:00
Sabe Jones fe8e42c5c3 fix(quests): Make Gryphon and Hedgebeast drop 3 eggs 2014-03-16 22:26:09 -05:00