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

683 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
3047a7f8a0 chore(grunt): grunt 2014-02-04 12:32:19 -07:00
Tyler Renelle
7377fbf200 chore(simulations): fix simulations 2014-02-04 12:32:02 -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
f4fbe95969 Merge pull request #124 from marcgenesis/develop 
Changed string costumeText to reflect changes to inventory panel. Issue ...
 2014-02-04 10:59:47 -08:00
Tyler Renelle
9affe71179 Merge pull request #125 from brandonjreid/develop 
Changed some skills to use a hyperbolic formula
 2014-02-04 10:35:27 -08:00
brandonjreid
5dcc732e24 Lowered the effectiveness of Pickpocket. 2014-02-02 01:24:28 -07: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
Brandon
0458606eeb Left out the critical chance on Brutal Smash changes 2014-02-01 12:37:58 -07:00
Brandon
612f983bf0 Adjusted Searing Brightness, Brutal Smash, and Pickpocket to use a hyperbolic scale. 2014-02-01 12:18:09 -07:00
Marc-André Larivière
00a3dd1cd6 Changed string costumeText to reflect changes to inventory panel. Issue #2158 2014-02-01 13:04:30 -05: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
e090e0430d feat(winter): remove WWE scrolls 2014-02-01 07:39:21 -08: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
2cd7959d2e fix(userServices): only crash client on 500 2014-01-31 10:25:35 -07:00
Tyler Renelle
2a2024262b fix(errors): ooo, and some other stray unecessary 500s 2014-01-30 22:02:35 -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
d721644f15 fix(tests): put honey last in food items def, seems to fix the mocked 
random function looking for honey. @djuretic any ideas?
 2014-01-30 19:31:36 -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
Tyler Renelle
05b139be78 chore(logging): remove console logging 2014-01-30 15:21:03 -07:00
Matteo Pagliazzi
8b0543f761 i18n(fix): change a name and add two strings back 2014-01-30 22:21:06 +01:00
Matteo Pagliazzi
47da2b4406 i18n(merge): merge @Sinza- changes & rebuild 2014-01-30 22:00:20 +01:00
Marcelo Sizer
927c43bac4 Add buyQuest to quests.json 2014-01-30 18:54:43 -02:00
Marcelo Sizer
ff04b15789 i18n(interpolation): Add string interpolation 2014-01-30 18:24:25 -02:00
Matteo Pagliazzi
22f5159dca Merge pull request #121 from Sinza-/split-main-json 
i18n(subscriber): replace subscriber hard-coded strings for env.t
 2014-01-30 09:36:00 -08: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
Matteo Pagliazzi
6cf7160f65 fix(purchase) add a check for user.balance 2014-01-29 15:55:02 +01:00
Marcelo Sizer
91bcf7ff87 i18n(subscriber): replace subscriber hard-coded strings for env.t 2014-01-28 22:20:28 -02:00
Matteo Pagliazzi
d52ffb1bfb Merge branch 'develop' of https://github.com/HabitRPG/habitrpg-shared into develop 2014-01-28 19:43:27 +01:00
Matteo Pagliazzi
4c768d1277 fix(translations): move strings in limbo.json 2014-01-28 19:43:04 +01:00
Tyler Renelle
db36406680 feat(marketing): update frontpage tagline 2014-01-28 10:35:58 -08:00
Matteo Pagliazzi
5df797bdf0 fix(translations): revert constText to conText 2014-01-28 19:27:04 +01:00
Matteo Pagliazzi
cd584a983e fix(translations): split main.json, by @Sinza- 2014-01-28 19:21:55 +01:00
Sabe Jones
33222e0f15 feat(attributes): Add backfill button in flat and classbased allocation modes 2014-01-28 08:55:42 -06:00
Marcelo Sizer
97c1197a3e Create front.json file and minor fixes 2014-01-27 23:26:01 -02:00
Tyler Renelle
da526a50cf chore(license): reference main repo's license here 2014-01-27 15:52:19 -08:00
Marcelo Sizer
04701ec121 Update json files for drops.jade 2014-01-27 15:08:22 -02: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
Marcelo Sizer
5bdc75593a Fix typos 2014-01-27 00:30:33 -02: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
Tyler Renelle
dcfa9e4724 Merge remote-tracking branch 'ryepdx/conText-bug' into develop 
Conflicts:
	locales/en/main.json
 2014-01-26 17:07:06 -08:00
Tyler Renelle
ba1095eb33 Merge pull request #108 from creidieki/develop 
Fix typo in description of constitution.
 2014-01-26 17:01:34 -08:00
Tyler Renelle
bbecfb3ffd Merge pull request #116 from deilann/petcounting 
adding mechanic to count previously owned pets
 2014-01-26 16:57:53 -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
Tyler Renelle
e739c4e78f Merge pull request #115 from deilann/copy-strings 
adding strings for copy and fixing a typo
 2014-01-26 12:37:31 -08:00
Cole Gleason
2a32517ae4 Merge pull request #117 from deilann/dequip-1 
changing dequip to make sense for all classes
 2014-01-26 12:06:50 -08:00