sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 03:52:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
9345 commits 3 branches 0 tags 1.6 GiB
Commit graph

581 commits

Author SHA1 Message Date
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
0bd3743392 feat(box): 2014-07-31 17:39:19 -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
Tyler Renelle
da87767c48 grunt(store-icons): re: #257 (before I forget) 2014-07-29 15:31:28 -06:00
Tyler Renelle
75eb860650 feat(mystery): july mystery items 2014-07-24 19:40:27 -06:00
Tyler Renelle
c96ef70428 feat(dilatory): add dilatory achievement 2014-07-17 18:36:50 -06:00
Tyler Renelle
f1db2bf1d5 refactor(dotSet): move dotSet & dotGet to exports 2014-07-17 12:55:45 -06:00
Tyler Renelle
b449387cc0 fix(dilatory): add honey https://twitter.com/ogbajoj/status/489515513148497920 2014-07-16 15:50:42 -06:00
Tyler Renelle
4cb79c6fff fix(dilatory): update rewards: 0gp, 0xp, food drops 2014-07-16 13:24:06 -06:00
Tyler Renelle
9f0e6607c5 chore(grunt): run grunt for summer gear prices, fixes https://github.com/HabitRPG/habitrpg/issues/3727 2014-07-14 20:01:26 -06:00
Tyler Renelle
5cd0039171 fix(reset): don't remove special gear on reset #3349 2014-07-07 19:06:48 -06:00
Tyler Renelle
9e85a886ba feat(quests): seahorse quest 2014-07-07 14:56:47 -06:00
Tyler Renelle
3a83ca1770 feat(gaymerx): gaymerx special gear 2014-07-02 16:53:13 -06:00
Tyler Renelle
6e46b7670c feat(backgrounds): add Set2 bgs 2014-07-02 16:33:21 -06:00
Tyler Renelle
6f615ad634 fix(dilatory): double-woops... rage/3 2014-06-30 20:49:46 -06:00
Tyler Renelle
3900f52026 fix(dilatory): woops, rage*3 (should cast it 3x during 30days) 2014-06-30 20:31:17 -06:00
Tyler Renelle
893f04aaa2 fix(dilatory): update stats with real avgs from global usage 2014-06-30 19:55:51 -06:00
Tyler Renelle
0dcbe7b18c chore(premium): update present box 2014-06-30 19:49:49 -06:00
Tyler Renelle
92fc8bd5cf feat(dilatory): broken matt 2014-06-27 13:07:37 -07:00
Tyler Renelle
e62a18bd37 feat(dilatory): Add dilatory boss. Add limit-break (rage) to bosses. Add defense 2014-06-25 14:49:24 -06:00
Tyler Renelle
fd645fb6a5 feat(mystery): mystery items 062014 2014-06-24 16:41:18 -06:00
Tyler Renelle
f939bdcbcb feat(summer): summer event 2014-06-20 15:28:29 -06:00
Tyler Renelle
81108a0039 feat(backgrounds): i18n for backgrounds 2014-06-10 18:29:33 -06:00
Tyler Renelle
1151576e6c feat(backgrounds): group bgs into sets in content.coffee, for easier 
"purchase set"
 2014-06-10 17:47:08 -06:00
Tyler Renelle
d95528a205 feat(backgrounds): add backgrounds feature 2014-06-10 17:47:08 -06:00
Tyler Renelle
9767c540c3 feat(bosses): add Octohulu quest 2014-06-09 14:23:46 -06:00
Tyler Renelle
5d2399015e Merge pull request #222 from Alys/equip-fix2 
show "unequipped" message instead of "equipped" when taking off gear
 2014-06-06 13:58:06 -06:00
Tyler Renelle
1b6bf43367 feat(mystery): june gift box 2014-06-05 22:55:24 -06:00
Matteo Pagliazzi
5ffabd3633 chore(i18n): update locales 2014-05-28 17:51:44 +02:00
Alice Harris
9f084e1ac4 show "unequipped" message instead of "equipped" when taking off gear 2014-05-27 12:08:15 +10:00
Tyler Renelle
cfd2c427e8 feat(mystery): add 05/2014 mystery item 2014-05-23 00:33:39 +02:00
Tyler Renelle
73b8128af9 fix(accessories): add body accessory to user model, fixes https://github.com/HabitRPG/habitrpg/issues/3346 2014-05-22 23:23:30 +02:00
Alice Harris
c09e06e73a fix #3513 - if contrib level is NaN, use 0 
Fixes (I hope) https://github.com/HabitRPG/habitrpg/issues/3513. NOTE that private code will need to be edited too - ref f49ed5436c
 2014-05-22 16:25:08 +10:00
Tyler Renelle
25ce644915 feat(mystery): 0 GP mystery items @deilann 2014-05-21 08:49:51 -06:00
Tyler Renelle
912f2152a1 chore(grunt): grunt 2014-05-21 08:29:35 -06:00
Tyler Renelle
b0f4c9e9e3 Merge pull request #217 from Alys/messageEvolve 
insert messageEvolve into correct locations, replacing incorrect messageAlreadyMount
 2014-05-17 19:21:24 -06:00
Tyler Renelle
fea7e9e69d Merge pull request #218 from Alys/todo-with-checklist-untick 
fix bug where an un-checked to-do with checklist removes only part of reward
 2014-05-17 19:20:48 -06:00
Alice Harris
7edeb53cda add correct message for equipping equipment 
Currently, when you put on equipment, you see the messageBought notification. There was no messageEquipped notification in the code so I've added one.

I've updated ALL locale files IN ENGLISH, following the convention already in place for using English when there is no translation (e.g., locales/pl/messages.json, locales/sv/messages.json).
 2014-05-18 10:45:24 +10:00
Alice Harris
8f07f06cb0 fix bug where an un-checked to-do with checklist removes only part of reward 
When a to-do is checked off, the rewards are increased by the number of checklist items that have been completed. However as reported in https://github.com/HabitRPG/habitrpg/issues/3474, if the to-do is later un-checked, then the rewards subtracted are not being similarly increased by the number of checklist items completed. This fix will change that - the number of checklist items completed will have an equal effect on checking and unchecking a to-do.

This of course won't fix the problem of, upon unchecking, not being able to calculate the exact value of the rewards that had been given upon checking, so there will still be a discrepancy between checking and unchecking, but it will be much smaller than it is currently.
 2014-05-17 19:55:08 +10:00
Alice Harris
01595fcf1a insert messageEvolve into correct locations, replacing incorrect messageAlreadyMount 
Currently, when you feed a pet enough to turn it into a mount, you see the messageAlreadyMount notification ("You already have that mount. Try feeding another pet."). This fix changes it to the messageEvolve notification ("You have tamed <%= egg %>, let's go for a ride!").
 2014-05-17 19:44:59 +10:00
Tyler Renelle
519154dc89 Revert "feat(archive_todo)" (see http://goo.gl/mCygbz) 2014-05-15 23:48:02 -06:00
Matteo Pagliazzi
0d1d53fff6 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-shared into develop 2014-05-15 23:12:18 +02:00
Matteo Pagliazzi
77c7e1aa93 fix(i18n): recognize t() funcs 2014-05-15 23:11:52 +02:00
Matteo Pagliazzi
a78dcabddd Merge pull request #215 from Alys/develop 
change spellSpecialSnowballNotes to spellSpecialSnowballAuraNotes
 2014-05-15 22:56:31 +02:00
Matteo Pagliazzi
78589f9af4 fix(i18n): fallback to english if locale not avalaible 2014-05-15 22:45:22 +02:00
Alice Harris
321258cd27 change spellSpecialSnowballNotes to spellSpecialSnowballAuraNotes 2014-05-16 06:13:33 +10:00
Alice Harris
cc38f9c9b6 change spellSpecialSnowballText to the correct spellSpecialSnowballAuraText 
https://github.com/HabitRPG/habitrpg/issues/3466#issuecomment-43166675
 2014-05-15 19:56:43 +10:00
Alice Harris
9f97b5528a replace messageBought with messageUnEquipped in the equip function 
Users are getting "Bought <item name>" messages when they take off their equipment.
 2014-05-15 16:19:58 +10:00
Alice Harris
a7a3abd462 fix typo : Canycane -> Candycane 
"Candycane" had the "d" left out in headSpecialCanycaneText and headSpecialCanycaneNotes. I've inserted the "d" in all places that needed it.

I've checked all locale files and none of them had that typo.
 2014-05-15 15:16:09 +10:00
Matteo Pagliazzi
f8be09dc78 chore(i18n): use t() syntax for questEggs, grunt, update locales 2014-05-14 17:09:15 +02:00
Tyler Renelle
86c51535c5 feat(rat): add rat quest 2014-05-14 08:47:43 -06:00
Matteo Pagliazzi
f8912c8506 fix(i18n): mistery -> mystery 2014-05-12 17:16:11 +02:00
Tyler Renelle
cc424dac03 chore(grunt): grunt 2014-05-11 21:10:17 -06:00
Matteo Pagliazzi
4868d31496 chore(i18n): update locales & grunt 2014-05-06 20:11:02 +02:00
Matteo Pagliazzi
4083d62f16 chore(i18n): sync with develop 2014-05-06 19:51:36 +02:00
Matteo Pagliazzi
a1c53ec2aa fix(i18n): fix messages, pet and mount names and update locales 2014-05-06 19:51:36 +02:00
Matteo Pagliazzi
17a221f475 chore(i18n): grunt and update locales 2014-05-06 19:51:35 +02:00
Matteo Pagliazzi
17aaa13785 fix(i18n): rebase, fix and compile 2014-05-06 19:51:35 +02:00
Matteo Pagliazzi
c57df7fbc4 fix(i18n): use right syntax and add a few strings 2014-05-06 19:51:33 +02:00
Matteo Pagliazzi
37f999fabe chore(i18n): move new content to strings, update locales 2014-05-06 19:51:33 +02:00
Matteo Pagliazzi
cdaf9285a2 chore(i18n): upload new locales 2014-05-06 19:51:33 +02:00
Matteo Pagliazzi
ad7a890160 refactor(i18n): start using strings for api messages 2014-05-06 19:51:33 +02:00
Matteo Pagliazzi
f80cff8916 refactor(i18n): refactor & fix 2014-05-06 19:51:33 +02:00
Matteo Pagliazzi
85d0ebbc8e improve(i18n): move potion to strings, add content.json for generic content 2014-05-06 19:51:32 +02:00
Matteo Pagliazzi
fdfbd17cf7 improve(i18n): move gear strings to gear.json, recompile 2014-05-06 19:51:32 +02:00
Matteo Pagliazzi
a0ed07996d chore(i18n): move attributes values to interpolation 2014-05-06 19:51:32 +02:00
Matteo Pagliazzi
fcbe8a76f2 chore(i18n): move armor items to content.json 2014-05-06 19:51:32 +02:00
Matteo Pagliazzi
c2d8dc5549 chore(i18n): move all the weapons to content.json and update README.md 2014-05-06 19:51:32 +02:00
Matteo Pagliazzi
968c899836 improve(i18n): add locales for content.json, add code for server to i18n, build 2014-05-06 19:51:31 +02:00
Matteo Pagliazzi
7af95edc8c chore(i18n:): implement i18n module, start moving content to locales/en/content.json, recompile 2014-05-06 19:51:31 +02:00
Tyler Renelle
d92a2eb86e feat(subscriptions): allow one month after sub start-date before it's terminated. 2014-05-05 23:59:28 -06:00
Tyler Renelle
bedf472ff3 Merge remote-tracking branch 'PeterHatch/single-pass-spritesmith' into develop 
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	dist/spritesmith.png
 2014-05-03 21:29:37 -06:00
Tyler Renelle
746ce6de4f feat(spring): take egg hunt quest out of the market 2014-04-30 22:28:54 -06:00
Tyler Renelle
c091290fd0 feat(may): may mystery box 2014-04-30 22:26:30 -06:00
Tyler Renelle
b304243119 feat(spring): back to normal npcs 2014-04-30 22:17:59 -06:00
Tyler Renelle
34c86a869f chore(grunt): grunt 2014-04-30 00:31:23 -06:00
Tyler Renelle
db95376b52 feat(mystery): april mystery items 2014-04-24 17:42:36 -06:00
Tyler Renelle
b0c1b13af0 fix(vice3): allow re-purchase of broken "Stephen Weber's Shaft of the 
Dragon". Fixes https://github.com/HabitRPG/habitrpg/issues/3308
 2014-04-22 12:27:35 -06:00
Tyler Renelle
4d4339903a chore(grunt): grunt 2014-04-18 08:36:59 -07:00
Tyler Renelle
bc5ff6412a feat(wondercon): add wondercon gear 2014-04-16 17:47:09 -06:00
Tyler Renelle
b93bf8be7f feat(accessories): add body accessory & better handling of gear sorting 2014-04-16 17:44:13 -06:00
Tyler Renelle
cfb762db58 chore(grunt): grunt 2014-04-15 14:56:14 -06:00
Tyler Renelle
692a1f6639 feat(spring): put spring npcs back in (@lemoness) 2014-04-07 15:08:52 -06:00
Tyler Renelle
462ffe5fd3 chore(grunt): grunt 2014-04-06 21:51:40 -06:00
Tyler Renelle
bd8d2dcbd0 feat(eggQuest): add april egg quest 2014-04-06 21:29:34 -06:00
Tyler Renelle
a1eb1f8a59 feat(hair): limited ed pastel hair 2014-04-03 23:00:24 -07:00
Tyler Renelle
c9b63a6a31 feat(premium): april mystery box 2014-04-02 00:15:02 -06:00
Tyler Renelle
7b040242bb fix(npcs): put ian.gif back in 2014-04-02 00:10:52 -06:00
Tyler Renelle
4b03f373dd chore(april-fools): revert april fools 2014-04-02 00:06:34 -06:00
Tyler Renelle
c091be3064 feat(april-fools): april-fools npcs & characters 2014-03-31 20:09:28 -06:00
Tyler Renelle
806151dbe7 chore(grunt): grunt 2014-03-30 18:26:34 -06:00
Peter Hatch
c9a42ed115 Create spritesmith CSS in a single pass. 2014-03-27 23:00:54 -07: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
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
Peter Hatch
c30fbcfe71 Updated dist files by running grunt full. 2014-03-23 16:36:06 -07: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
7b8e0dc0a4 feat(march): replace npcs with march versions (revert here when done) 2014-03-21 12:31:47 -06:00
Tyler Renelle
e53ef26d4c feat(flower): add flower customization option 2014-03-21 12:30:36 -06:00
Peter Hatch
e373ccba35 Aligned Nunchaku's transparent pixel with the character's hand. 2014-03-20 13:08:59 -07: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
Tyler Renelle
dfa4814af3 fix(mystery): fix canOwn for mystery items, so they don't permenantly 
break. Fixes https://github.com/HabitRPG/habitrpg/issues/2999
 2014-03-09 17:23:45 -06:00
Tyler Renelle
bede329d11 feat(mystery): add mystery items to spritesmith, so 3rd parties can use them too. 2014-03-08 21:14:20 -07:00
Tyler Renelle
a741b744b1 fix(hedgehogs): flip sprites, expand template to 81x99, position down & 
left. Fixes https://github.com/HabitRPG/habitrpg/issues/3000
 2014-03-07 14:57:58 -07:00
Tyler Renelle
75cd8c2ec3 feat(mystery): update mystery box 2014-03-02 12:59:57 -07:00
Sabe Jones
d232743f2a fix(drops): Ratchet up base chance some more 
Ups the base drop chance to an expected 15% for typical tasks, brings back diminishing returns for super bonuses, reduces effect of checklists. Should be acceptable to most people?
 2014-03-02 12:46:09 -06:00
Sabe Jones
b0f574d598 fix(strength): Remove threat reduction, increase crit chance 
Tweaks the STR attribute's algorithmic effects. (1) Task "redness" no longer declines faster with high STR. (2) The 3% chance of a critical hit is multiplied by a percentage factor equal to STR. (3) The value of STR in dealing damage to bosses is increased by 25% (.5% instead of .4%).

Fixes HabitRPG/habitrpg/#2464.
 2014-03-02 12:44:23 -06:00
Sabe Jones
734d558580 fix(drops): Boost base drop chance 
Initial feedback from the drop chance overhaul was that non-minmaxed characters had their drops severely curtailed, while tricked-out Rogues with enormous streaks were still scoring drops every time. Lots of complaining ensued! This commit doubles the base chance, establishes a minimum base chance of 2%, and halves the effectiveness of the high-end offenders.
 2014-03-01 18:56:09 -06:00
Tyler Renelle
9f1bec79f5 fix(quests): hedgehog fix alignments 2014-03-01 12:26:55 -07:00
Tyler Renelle
3c77f6e9c6 fix(quests): fix hedgehog drop text, fixes https://github.com/HabitRPG/habitrpg/issues/2979 2014-03-01 08:37:24 -07:00
Tyler Renelle
4010bb950c fix(spritesmith): add padding between sprites to avoid stray-pixels 
issue, fixes https://github.com/HabitRPG/habitrpg/issues/2938
 2014-02-28 10:23:45 -08:00
Tyler Renelle
1223294267 fix(spritesmith): add background-size property to all sprites. Fixes https://github.com/HabitRPG/habitrpg/issues/2510 , see https://github.com/Ensighten/grunt-spritesmith/issues/67 2014-02-28 10:19:04 -08:00
Tyler Renelle
5fc920356a chore(grunt): grunt for hedgehog quest 2014-02-27 18:32:04 -08:00
Tyler Renelle
29f6f8e140 feat(quests): add hedgehog sprites 2014-02-27 18:32:04 -08:00
Tyler Renelle
8b8011f0cb chore(grunt): grunt 2014-02-27 09:52:10 -08:00
Tyler Renelle
27da784cf6 fix(ultimateGear): add last:true to the only back piece 2014-02-27 08:39:15 -08:00
Sabe Jones
c32d91a331 fix(drops): Further overhaul drop chance 
Reduces the divisors for several modifiers to give them a more noticeable effect (especially PERception, so Rogues continue to be durn sharp).
 2014-02-26 20:44:43 -06:00
Tyler Renelle
335d063512 chore(grunt): revert f3c5d3f73a and 
fb63ae25f0 . Was causing broken
customizer.css, fixes https://github.com/HabitRPG/habitrpg/issues/2934
. cc @paglias
 2014-02-22 22:44:33 -08:00
Matteo Pagliazzi
a1ec40e77e chore(): update dependencies (not moment because we keep the same version as habitrpg), move tests from /tests to /test so that it correctly uses mocha.opts 2014-02-22 17:10:29 +01:00
Matteo Pagliazzi
fb63ae25f0 fix(css spritesheet): prevent duplication of css in customizer.css 2014-02-22 16:26:15 +01:00
Tyler Renelle
68dc117adb chore(grunt): grunt with new food images 2014-02-21 17:28:03 -08:00
Sabe Jones
5469b5013e Merge pull request #157 from denis-sokolov/issue-2880 
fix(items): fix mage ultimate per bonus #2880
 2014-02-20 19:44:19 -06:00
Denis
35f3eac626 fix(items): fix mage ultimate per bonus #2880 2014-02-18 20:27:36 +02:00
Tyler Renelle
b03c377294 feat(valentine): remove valentine event 2014-02-18 11:20:31 -07:00
Tyler Renelle
20387bf21c chore(grunt): grunt 2014-02-14 19:50:53 -07:00
Tyler Renelle
07eef7c723 chore(grunt): bailey valentine 2014-02-13 23:29:55 -07:00
Tyler Renelle
a6b2191927 fix(valentine): what? cards aren't getting added to array first time, 
only 2nd+. Maybe an issue with markModified?
 2014-02-13 23:09:00 -07:00
Tyler Renelle
608b829d7e feat(valentine): valentine event 2014-02-13 18:20:12 -07:00
Matteo Pagliazzi
207d88757d fix(spritesmith): upload spritesmith 2014-02-12 15:59:08 +01:00
Matteo Pagliazzi
cddf513359 refactor(grunt): spritesmith cached on server, do not add timestamp to name, remove unused coins icons 2014-02-12 15:11:45 +01:00
Tyler Renelle
1b2bcc4683 feat(event-tracking): track purchases 2014-02-11 17:48:44 -07:00
Matteo Pagliazzi
8170ac746f chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:35 +01:00
Lorian
82b58a7435 dropEggs and questEggs now automatically make the full content.eggs list; no manual duplication required. 2014-02-08 20:14:50 -08:00
Lorian
c39d2a8a13 Separated stable into dropped pets, quest pets, and rare pets, and made countPets only count the former. Made countMounts only count dropped and quest-hatched mounts, not rare mounts. 2014-02-08 16:56:07 -08:00
Matteo Pagliazzi
6104767711 fix(css): gems alignment and remove unused code 2014-02-08 17:35:43 +01:00
Tyler Renelle
7ace7b49b1 fix(critical-hammer): add 40x40 shop icon 2014-02-07 12:31:58 -07:00
Tyler Renelle
6a5df319ed feat(critical-hammer): add Critical Hammer of Bug-Crushing 2014-02-07 11:48:06 -07:00
Tyler Renelle
63f691b00d feat(premium): add mystery-item present box. Doesn't do anything yet, 
will add logic later this month
 2014-02-07 10:53:08 -07:00
Tyler Renelle
619d254cc0 feat(rainbow-hair): add rainbow hair colors 2014-02-07 09:45:10 -07:00
Tyler Renelle
3047a7f8a0 chore(grunt): grunt 2014-02-04 12:32:19 -07:00
Tyler Renelle
35d0688f4a Merge pull request #123 from HabitRPG/sabe/fix 
fix(checklists): Bring MP behavior in sync with XP/Gold
 2014-02-04 11:04:53 -08:00
Tyler Renelle
4ff9a3de7d fix(quests): drop vice1 when lvl 30+, fixes https://github.com/HabitRPG/habitrpg/issues/2694 2014-02-01 16:14:47 -08:00
Tyler Renelle
1b36425099 fix(drops): don't random-drop cakes, fixes #2700 2014-02-01 15:44:56 -08:00
Sabe Jones
14fc4a3c31 fix(checklists): Bring MP behavior in sync with XP/Gold 
Previously, the player would accrue Mana for every checklist item when a To-Do was completed, regardless of whether or not those checklist items were complete. This was inconsistent with XP and Gold, which were only multiplied based on the number of checklist items previously clicked. Now Mana acts the same way, multiplying MP scored by (1 + completed checklist items).
 2014-02-01 10:26:26 -06:00
Tyler Renelle
64fa6d9a53 feat(npcs): return npcs back to normal (incl npc_ian as a gif) 2014-01-31 15:45:38 -07:00
Tyler Renelle
39285e2d0b feat(quests): Vice quest 2014-01-31 14:50:24 -07:00
Tyler Renelle
1331ff0f12 fix(pets): 401 error when can't hatch a pet, not 500 2014-01-30 21:51:44 -07:00
Tyler Renelle
949386f44f feat(habitBirthday): add habitrpg birthday event. includes cakes for all 
pets, absurd party robes, npc swap, badge, etc. @lemoness
 2014-01-30 19:19:30 -07:00
Matteo Pagliazzi
47da2b4406 i18n(merge): merge @Sinza- changes & rebuild 2014-01-30 22:00:20 +01:00
Cole Gleason
8fdae0b35c Merge branch 'sabe/attributes' into develop 
Conflicts:
	dist/habitrpg-shared.js
	locales/en/main.json
 2014-01-30 10:44:49 -06:00
Tyler Renelle
67e76798af chore(grunt): 2014-01-29 21:38:24 -07:00
Sabe Jones
33222e0f15 feat(attributes): Add backfill button in flat and classbased allocation modes 2014-01-28 08:55:42 -06:00
Sabe Jones
9d2e00f408 fix(mounts): Correct one more bungle on Skeleton Gryphon 
OK, I lied. I accidentally killed a pixel on the Skeleton Gryphon's wing, so I've put that back and attached it in a way that looks good. Now! Done! Until I do some entirely unrelated mount sprite tinkering. :P
 2014-01-26 20:13:49 -08:00
Sabe Jones
e9547a6c7f Merge branch 'HEAD' of https://github.com/HabitRPG/habitrpg-shared into develop 
Conflicts:
	dist/customizer.css
	dist/habitrpg-shared.css
	dist/spritesmith.css
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Base.png
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-CottonCandyBlue.png
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-CottonCandyPink.png
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Desert.png
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Golden.png
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Red.png
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Shade.png
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Skeleton.png
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-White.png
	img/sprites/spritesmith/mounts/Mount_Body_Gryphon-Zombie.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Base.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-CottonCandyBlue.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-CottonCandyPink.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Desert.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Golden.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Red.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Shade.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Skeleton.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-White.png
	img/sprites/spritesmith/mounts/Mount_Head_Gryphon-Zombie.png
 2014-01-26 20:01:29 -08:00
Sabe Jones
6a0f48540d fix(mounts): Reposition gryphons, one more time 
Third time's the charm. This version uses a 5x, 3y offset, preserving the wingtip. I've also moved the skeleton gryphon's wing so it emerges from the shoulder similar to the fleshy gryphons' wings, no longer obscuring the avatar's face. Now I'm done for reals; more expert pixelists can tweak from here ^.^;
 2014-01-26 19:55:41 -08:00
Tyler Renelle
be986e09f6 fix(beastmaster): allow hatching pets when petOwned<=0 (fyi 
@deilann). Man, browserify adds so many lines - this commit is a
one-liner, lol
 2014-01-26 17:47:27 -08:00
Sabe Jones
f53a2a87c3 fix(mounts): Offset gryphons by 5x, 5y 
Corrects positioning errors of gryphon mounts vs. avatar sprites. Known issue: we lose one chunky!pixel from the uttermost tip of the wing. More adept Pixelist work welcome!
 2014-01-26 15:43:28 -08:00
Sabe Jones
f1bbd92ceb fix(mounts): Relocate wing to head layer 
Implements @baconsaur's revised placement of wings for Gryphon mounts. Avatars now sit behind the wing, which protrudes from the Gryphon's shoulder facing the player. There are further fixes to be done, but this should get us closer to the artist's original vision.
 2014-01-26 10:20:39 -08:00
Cole Gleason
b246a6d430 Merge branch 'round-boss' into develop 2014-01-24 15:33:30 -06:00
Cole Gleason
e76c81b3d7 refactor(api.percent): allow for round direction to be specified 2014-01-24 15:31:08 -06:00
Cole Gleason
a501d5c3ba perf(ultimateGear): move ultimateGear from ops to fns so it only runs once 2014-01-24 00:02:51 -06:00
Cole Gleason
2283093845 fix(ultimateGear): fix bug where ultimateGear isn't awarded 
This does several things:
- Moves the calculation of the ultimateGear achievement into its own
function on user.ops.
- Only computes ultimateGear if item is last and the user does not
already have the achievement
- Fixes bug where ultimateGear was not awarded if user wasn't wearing
their class gear at the time of item purchase.
- Adds content.classes and content.gearTypes which we should start using
elsewhere.
- Added tests for ultimateGear

Fixes HabitRPG/habitrpg#2232.
 2014-01-23 23:49:04 -06:00
Tyler Renelle
2ee93763fc feat(quests): add the gryphon quest, mount, pet, egg. For the glory of @baconsaur! 2014-01-21 14:41:07 -08:00
Tyler Renelle
965e57ed2f chore(grunt): grunt with @sabrecat's mount=>spritesmith, + my multi-drops 2014-01-21 13:32:46 -08:00
Tyler Renelle
cb7e654c48 refactor(sprites): grunt spritesmith for @sabrecat's e44c84bef9 2014-01-19 17:48:06 -08:00
Tyler Renelle
587a660ac1 fix(todos): add dateCompleted to todos so they're archived 3 days after completion, not 3 days after creation. fixes https://github.com/HabitRPG/habitrpg/issues/2478 2014-01-19 17:11:19 -08:00
Tyler Renelle
77b2e5400f Merge pull request #100 from HabitRPG/sabe/fix 
fix(calculateDelta): don't detrain stats on ripening To-Dos
 2014-01-19 15:18:05 -08:00
Sabe Jones
a770d0c72f fix(checklists): Make checklist To-Do behavior more intuitive 
Previously, all To-Do scoring was multiplied by the length of the checklist, including cron "reddening" and ultimate scoring. The checkboxes themselves only affected MP bonuses. Now, checklist tasks redden at the same rate as any other task, and the score multiplier only applies to checklist items that have actually been accomplished when the user concludes the overall To-Do.

Fixes HabitRPG/habitrpg#2327, HabitRPG/habitrpg#2405, and HabitRPG/habitrpg#2483.
 2014-01-19 10:36:04 -06:00
Sabe Jones
70394ea0b9 fix(autoAllocate): don't detrain stats on ripening To-Dos 
Previously, on cron, the reddening of To-Dos would subtract from the stat training for task-based auto-allocation. This had a tendency to cause users with lots of active tasks to get backward stat allocations on levelup. Now the "down" direction for To-Dos is not counted for attribute training. (Missed Dailies will still detrain.)

Fixes HabitRPG/habitrpg/#2247
 2014-01-19 09:36:23 -06:00
Sabe Jones
2ae7d1dede Merge pull request #86 from HabitRPG/sabe/preferences 
Finish up @wc8 suggested user preferences
 2014-01-19 06:40:34 -08:00
Cole Gleason
ffb77e45ed grunt browserify 2014-01-18 22:11:52 -06:00
Tyler Renelle
06113f46e3 grunt browserify 2014-01-17 23:32:08 -07:00
Tyler Renelle
18ccbb51df Merge remote-tracking branch 'colegleason/drops' into develop 
Conflicts:
	dist/habitrpg-shared.js
 2014-01-15 17:40:07 -07:00
Tyler Renelle
5dac20d9e8 Merge remote-tracking branch 'colegleason/checklist-mp' into develop 
Conflicts:
	dist/habitrpg-shared.js
 2014-01-15 16:52:13 -07:00
Tyler Renelle
8df7fe65c5 feat(perfect-day achievement) here's one for the road @wc8 @sabrecat, if 
you perform a perfect day of dailies, you get an achievement PLUS lvl/2
buff to all stats for the next day
 2014-01-15 16:26:47 -07:00
Cole Gleason
c967c1c21d Generate new browser code 2014-01-15 00:13:52 -06:00
Cole Gleason
2f51041bf4 fix randomVal to be actually random. Fixes habitrpg/habitrpg#2176 2014-01-14 21:54:54 -06:00
Tyler Renelle
3e290b4734 Revert auto-clearing completed to-dos, instead we'll hide stale completeds from our angular app 2014-01-14 17:59:35 -07:00
Tyler Renelle
d3a076a405 give all tasks a creation date. When to-dos are completed, if they're 
sitting in "completed" section for more than 3 days, delete them on
cron. @sabrecat @paglias @colegleason @wc8 heads up. this should help
with the performance issues people are experiencing when they don't know
to clear completeds, but let me know if this you think this is a bad
idea. @wizonesolutions sorry for the delay ;)
 2014-01-14 16:49:52 -07:00
Tyler Renelle
9b01ea5072 grunt 2014-01-09 20:49:12 -07:00
Tyler Renelle
cfd475a7c7 grunt 2014-01-09 11:27:54 -07:00
Sabe Jones
8c7b27cca0 Finish up @wc8 suggested user preferences: tags and Advanced Options start collapsed 2014-01-08 22:21:32 -06:00
Tyler Renelle
87aa1ab731 Revert "#85 i heart lodash" 
This reverts commit 8097dc38d1.
 2014-01-08 18:55:46 -07:00
Tyler Renelle
8097dc38d1 #85 i heart lodash 2014-01-08 18:49:13 -07:00
Sabe Jones
a89ef25e23 Rebirth fix: flip owned items to explicit false instead of wiping them out, so limited edition gear can be repurchased 2014-01-08 19:35:54 -06:00
Tyler Renelle
60641524cf Merge pull request #82 from HabitRPG/sabe/preferences 
New user preference: open new tasks in edit mode
 2014-01-08 14:31:29 -08:00
Tyler Renelle
221574bcb2 #83 ski-sassin offhand pole should match 2nd-best regular offhand 2014-01-08 09:38:24 -07:00
Sabe Jones
7732f4af32 New user preference: open new tasks in edit mode 2014-01-07 20:16:35 -06:00
Tyler Renelle
84637ad336 fix https://github.com/HabitRPG/habitrpg/issues/2276 provide 
newly-created tags with an id from the browser
 2014-01-07 17:23:47 -07:00
Tyler Renelle
398a919afb Merge pull request #79 from HabitRPG/sabe/fix 
Server side of Rebirth-related fix: don't remove Wolf Eggs upon drops unlock
 2014-01-07 11:55:52 -08:00
Tyler Renelle
939ce14185 https://github.com/HabitRPG/habitrpg/issues/2010 allow wrapping members (don't add ops to them) 2014-01-07 10:43:00 -07:00
Sabe Jones
9d9cf0788f Rebirth-related fix: don't remove Wolf Eggs upon drops unlock if user has some already 2014-01-07 08:04:50 -06:00