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

9193 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sabe Jones 438516b26f fix(NYE): Correct achievement badge 2014-12-30 22:56:40 -06:00
Sabe Jones fba6472b7e chore(grunt): grunt full 2014-12-30 22:21:16 -06:00
Sabe Jones d1355faa31 Merge pull request #4452 from SabreCat/nye 
New Year's event features
 2014-12-30 22:18:11 -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 230482c578 chore(news): Bailey 2014-12-30 21:58:15 -06:00
Sabe Jones 1f1b4371b7 feat(NYE): Migrate hats 2014-12-30 21:48:02 -06:00
Tyler Renelle 8eebaea3dd woops.. :/ 2014-12-30 20:41:54 -07: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
Tyler Renelle edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -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 e35722865a fix(NYE): I18N for random text 2014-12-30 20:52:06 -06: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
Sabe Jones 51acc477fe feat(NYE): New Year's cards 2014-12-30 19:57:24 -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 53a18dbcac Added in last logged in string for sorting 2014-12-30 13:06:10 -06:00
Blade Barringer a8888a0a53 Added last logged in choice for sorting 2014-12-30 13:05:55 -06:00
Blade Barringer b4975bb8a4 Merge branch 'groupSorting' of https://github.com/vIiRuS/habitrpg into vIiRuS-groupSorting 
Conflicts:
	public/js/controllers/headerCtrl.js
	views/options/social/group.jade
 2014-12-30 12:57:32 -06:00
Blade Barringer 3b8a686368 Added new strings 2014-12-30 12:40:08 -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
Blade Barringer 303d30a270 Merge pull request #4439 from crookedneighbor/transparent-gems 
Added transparent class to gem purchasing if zero gems are available for purchase
 2014-12-30 11:11:32 -06:00
Saagar Saini 1226c60dd9 Ski-sassin parka description added 2014-12-30 22:32:48 +05:30
Shared 7facfd1b84 Changed armorSpecialSkiText to armorSpecialSkiNotes for the notes 2014-12-30 22:28:46 +05:30
Blade Barringer f414cac772 Resized special inv items so they are the same size as the gems 2014-12-30 10:57:00 -06:00
Matteo Pagliazzi 8a8e71394c Update README.md 2014-12-30 16:13:09 +01:00
Blade Barringer 2b7a22b2d2 Changed coverage command so that it would automatically open up the html 
file on finish. Closes #174
 2014-12-30 06:56:51 -06:00
Blade Barringer 486bd72fb0 Merge branch 'develop' into Feriority-coverage 2014-12-30 06:47:13 -06:00
Blade Barringer 5f66738305 Merge branch 'coverage' of https://github.com/Feriority/habitrpg-shared into Feriority-coverage 2014-12-30 06:47:01 -06:00
Blade Barringer 23de3eeff8 Corrected grammar to use a ; in stead of a , 2014-12-30 06:44:10 -06:00
Blade Barringer 3b5a2f925e Removed unused translation string 2014-12-30 06:36:29 -06:00
Blade Barringer 8603c1d451 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2014-12-30 06:35:05 -06:00
Matteo Pagliazzi 055f8b2e79 Merge branch 'crookedneighbor-fix-tests' into develop 2014-12-30 11:43:42 +01:00
Matteo Pagliazzi 0e266f917e fix(tests) 2014-12-30 11:43:25 +01:00
Matteo Pagliazzi d054d4418b Merge branch 'fix-tests' of git://github.com/crookedneighbor/habitrpg-shared into crookedneighbor-fix-tests 2014-12-30 11:31:47 +01:00
Blade Barringer 627a9af3b9 Compiled css and images for cyrstal armor (shop). Closes #180 2014-12-29 23:04:30 -06:00