Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,711 Commits 64 Branches 1,256 Tags
ebfab32c0fdfba61bf46f4b456a3bc6372d73ec8
Commit Graph

1711 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Verabird ebfab32c0f doubled multiplier on CON buffs and changed multiplier on searing brightness from 1.5 to 4 2015-01-09 14:09:02 -05:00
Alice Harris ab66f95c8e Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-06 15:26:59 +10:00
Alice Harris 5ffb35485b removed comments (outdated or inaccurate) 2015-01-04 15:38:30 +10:00
Alice Harris 184cb69ce1 Merge pull request #426 from Verabird/AddDimRet 
Add diminishing Returns to several skills
 2015-01-03 13:07:44 +10:00
Alice Harris 04bc0a02b3 Merge remote-tracking branch 'upstream/rebalancing-2014-12' into rebalancing-2014-12 2015-01-03 13:01:17 +10:00
Alice Harris ac08549f84 Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-03 13:01:01 +10:00
Matteo Pagliazzi 0cc87d4ea0 revert last commit 2015-01-02 19:07:31 +01:00
Matteo Pagliazzi d362003cdf fix json 2015-01-02 18:52:14 +01:00
Matteo Pagliazzi 1f258e601c move spritesmith and phantomjs to dev dependencies 2015-01-02 18:50:39 +01:00
Matteo Pagliazzi edbfc24b08 fix(i18n): remove duplicate strings cc @negue 2015-01-02 12:45:40 +01:00
Sabe Jones 83559c5d98 chore(January): Jan updates 
Reverts New Year's NPCs to normal winter garb and updates the Mystery Item package to its January scheme.
 2015-01-01 23:18:18 -06:00
Blade Barringer 38a5dca58e Merge branch 'yearUpdate' of https://github.com/thehindenburg/habitrpg-shared into thehindenburg-yearUpdate 2015-01-01 15:37:55 -06:00
Sabe Jones cf10ecb30e Merge pull request #424 from crookedneighbor/upgrade-spritesmith 
Updated spritesmith
 2015-01-01 15:36:11 -06:00
thehindenburg 74a871a8d2 add two years to winter gear 2014-12-31 17:46:06 -08:00
Blade Barringer 439f72cb91 Separated out the check for nyeRecieved and pushing to the array 2014-12-31 18:35:59 -06:00
Blade Barringer 0b57d42e2a Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2014-12-31 09:32:29 -06:00
Blade Barringer 611e350b63 Compiled changes to spookdust and snowball in task view 2014-12-31 09:31:09 -06:00
Blade Barringer f2bf3efc5c Adjusted position of ghost and snowball 2014-12-31 09:14:29 -06:00
Blade Barringer 008f79ad84 Resized shop versions of snowball and spookdust to match gold coins 2014-12-31 09:08:58 -06:00
Blade Barringer 8fb22c5301 Merge pull request #422 from crookedneighbor/resize-special-items 
Resize special items
 2014-12-31 08:49:49 -06:00
Blade Barringer 92ad91d545 Reverted gruntfile back 2014-12-31 08:41:11 -06:00
Blade Barringer 015ab34a4f Compiled images with cards 2014-12-31 08:40:50 -06:00
Blade Barringer 7cd9674d97 Resized cards 2014-12-31 08:39:35 -06:00
Blade Barringer 63a96db650 Merge branch 'develop' into resize-special-items 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith3.css
	dist/spritesmith3.png
 2014-12-31 08:37:17 -06:00
Matteo Pagliazzi c3283483e3 chore(i18n): update locales 2014-12-31 13:35:49 +01:00
Alice Harris a7dd2dbd74 add canOwn code to nye2014 hat 2014-12-31 16:25:12 +10:00
Sabe Jones fba6472b7e chore(grunt): grunt full 2014-12-30 22:21:16 -06:00
Sabe Jones 8fabcc4ffd Merge pull request #425 from SabreCat/nye 
New Year's event features
 2014-12-30 22:17:23 -06:00
Verabird bfd2709008 added diminishing returns function to toolsOfTrade, max of 400, halfway point 100 PER 2014-12-30 23:11:16 -05:00
Sabe Jones dd3ec20e5e feat(NYE): Silly Party Hat 2014-12-30 21:20:07 -06:00
Verabird 6a3bbcfcee Add diminishing returns to earth and mpheal. earth maxes out at 30 with halfway at 200 and mpheal at 25 with halfway at 125 2014-12-30 22:19:31 -05:00
Tyler Renelle 5fc001e4f6 feat(google-discount): add google discount 2014-12-30 20:05:51 -07:00
Verabird fd1c2f531d Add diminishingReturns for protectAura, intimidate, and defensiveStance. ProtectAura maxes out at 100, intimidate at 12 and defensiveStance at 20 2014-12-30 21:56:04 -05:00
Sabe Jones 7a16c644c3 fix(NYE): I18N for random text 2014-12-30 20:51:40 -06:00
Sabe Jones 11beb14e14 fix(NYE): t undefined 2014-12-30 20:42:32 -06:00
Sabe Jones e7388822f1 fix(NYE): Card to self exploit 2014-12-30 20:33:45 -06:00
Sabe Jones 5623fb0078 fix(NYE): I18N shop text 2014-12-30 20:14:56 -06:00
Sabe Jones dd13727765 feat(NYE): New Year's cards 2014-12-30 19:58:40 -06:00
Blade Barringer a6560d1651 Compiled fortify potion into spritesheet 2014-12-30 19:06:40 -06:00
Blade Barringer a0eb6f2229 Removed larger border from side of fortify potion 2014-12-30 19:04:25 -06:00
Alice Harris af909c0ed3 Merge pull request #418 from Verabird/valorouspresence 
Change valorousPresence to utilize diminishing returns. Keep results at ...
 2014-12-31 07:34:52 +10:00
Blade Barringer 6b88ad6f2a Merge branch 'resize-pet-dragon-hydra' of https://github.com/bcseda/habitrpg-shared into bcseda-resize-pet-dragon-hydra 
Conflicts:
	img/sprites/spritesmith/stable/pets/Pet-Dragon-Hydra.png
 2014-12-30 15:01:52 -06:00
Blade Barringer 3a0dd0417a Compiled panda skull image to spritesheet 2014-12-30 14:49:56 -06:00
Blade Barringer a1e48eadd1 Merge branch 'issue-3954' of https://github.com/ebiagogo/habitrpg-shared into ebiagogo-issue-3954 
Conflicts:
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.png
	dist/spritesmith3.png
	dist/spritesmith4.png
	dist/spritesmith5.png
 2014-12-30 14:47:22 -06:00
Blade Barringer fabf1d3f2a Updated spritesmith 2014-12-30 14:39:29 -06:00
Blade Barringer 8e0e6233f8 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into resize-special-items 2014-12-30 11:48:21 -06:00
Blade Barringer f205a28be0 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2014-12-30 11:34:01 -06:00
Blade Barringer 7c027f4c8b Updated compiled habitrpg-shared.js 2014-12-30 11:33:27 -06:00
Blade Barringer 72e705b9f0 Compiled the image changes to sprites and min css files 2014-12-30 11:30:41 -06:00
Saagar Saini 1226c60dd9 Ski-sassin parka description added 2014-12-30 22:32:48 +05:30