Commit Graph

292 Commits

Author SHA1 Message Date
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