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

271 commits

Author SHA1 Message Date
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
Tyler Renelle
0157afb6b3 spritesmith: try using spritesmith-{TIMESTAMP}.png for image 
cache-busting (@paglias good idea)
 2014-01-06 22:57:35 -07:00
Tyler Renelle
eff279be5b spritesmith: reposition healer tiaras 2014-01-06 22:28:18 -07:00
Sabe Jones
d2542b05ca Rebirth fix: force Costume preference off so avatar will display new gear prior to Market unlock 2014-01-06 21:30:47 -06:00
Tyler Renelle
2635db9e51 winter: weapons should be 2nd best, not 1st. Some refactoring 2014-01-06 18:24:31 -07:00
Tyler Renelle
4b16317c15 winter: add winter-specific class gear as event-timed specials (@lemoness) 2014-01-06 17:14:17 -07:00
Tyler Renelle
c01d5d79d6 event-items: try a different approach than "unbreakable" (1335750). If they've owned it before (item==false), then they canOwn() again. In those cases, set item to 'event' 2014-01-06 17:13:44 -07:00
Tyler Renelle
1335750804 add unbreakable special items, so we can add special-event gear which users can buy during a certain period of time, but which they can't lose on death. Starting with party-hats 2014-01-06 14:15:21 -07:00
Sabe Jones
cd38cc9fb8 Merge pull request #75 from HabitRPG/sabe/tweak2 
Rebirth fixes: deequip pets and mounts, allow stacking at max level
 2014-01-05 15:33:02 -08:00
Sabe Jones
d7fd82039f Fix assignment operator bug 2014-01-05 17:31:08 -06:00
Tyler Renelle
63034a587b grunt 2014-01-05 16:17:46 -07:00