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

257 Commits

Author SHA1 Message Date
Alice Harris 731589c0ea Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 2015-01-25 08:39:37 +10:00
Blade Barringer cc6cb3785e Merge branch 'mountmaster' into bailey-20150120 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
 2015-01-20 10:39:45 -06:00
Sabe Jones 7925935ff5 feat(world-boss): Desperation move 2015-01-19 21:47:27 -06:00
Alice Harris 8401790017 Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	locales/cs/gear.json
	locales/de/gear.json
	locales/de/generic.json
	locales/de/subscriber.json
	locales/es/communityguidelines.json
	locales/es/gear.json
	locales/es/generic.json
	locales/es_419/communityguidelines.json
	locales/es_419/gear.json
	locales/es_419/generic.json
	locales/es_419/questscontent.json
	locales/fr/gear.json
	locales/fr/generic.json
	locales/fr/limited.json
	locales/hu/backgrounds.json
	locales/hu/communityguidelines.json
	locales/hu/content.json
	locales/hu/front.json
	locales/hu/gear.json
	locales/hu/generic.json
	locales/hu/groups.json
	locales/hu/limited.json
	locales/hu/messages.json
	locales/hu/npc.json
	locales/hu/pets.json
	locales/hu/questscontent.json
	locales/hu/subscriber.json
	locales/hu/tasks.json
	locales/it/gear.json
	locales/it/generic.json
	locales/it/groups.json
	locales/it/limited.json
	locales/it/subscriber.json
	locales/nl/gear.json
	locales/nl/limited.json
	locales/nl/questscontent.json
	locales/pl/gear.json
	locales/pl/limited.json
	locales/pl/subscriber.json
	locales/pt/gear.json
	locales/ro/gear.json
	locales/ru/gear.json
	locales/ru/limited.json
	script/content.coffee
 2015-01-18 15:46:25 +10:00
Blade Barringer 75cf2a4788 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
 2015-01-16 10:46:59 -06:00
Sabe Jones c260362d96 feat(quest): T-Rex pet 
Implements two new Quests, and the "tyrannosaur" pets included as rewards for same.
 2015-01-15 15:45:56 -06:00
Sabe Jones 4e50c43da2 fix(world-boss): Scale based on current HP 2015-01-13 13:19:38 -06:00
Sabe Jones a2be1bc472 fix(world-boss): Bit stronger healing 2015-01-13 12:00:06 -06:00
Sabe Jones 480b4e2764 feat(world-boss): Healing on rage 2015-01-13 11:50:15 -06:00
Blade Barringer 83d91dfe34 Merged in changes from develop and re-ran grunt full 
Conflicts:
	dist/habitrpg-shared.css
	dist/habitrpg-shared.js
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
	dist/spritesmith4.css
	dist/spritesmith4.png
	dist/spritesmith5.css
	dist/spritesmith5.png
 2015-01-10 09:33:52 -06:00
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
Sabe Jones fde64b0bdf feat(event): World Boss 
Implements the 2015 Winter Wonderland world boss: the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:24:26 -06:00
Blade Barringer 8f90d154a0 Merge remote-tracking branch 'upstream/develop' into mountmaster 
Conflicts:
	dist/habitrpg-shared.css
	dist/spritesmith0.css
	dist/spritesmith0.png
	dist/spritesmith1.css
	dist/spritesmith1.png
	dist/spritesmith2.css
	dist/spritesmith2.png
	dist/spritesmith3.css
	dist/spritesmith3.png
 2015-01-08 11:30:53 -06: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
Sabe Jones 285ff6228c fix(backgrounds): Frigid, not Snowy, Peak 2015-01-05 16:41:23 -06:00
Sabe Jones 0bfc5b37c0 feat(backgrounds): January backgrounds 2015-01-05 16:36:11 -06:00
Blade Barringer 5d6da27a70 Merge branch 'issue4454habitrpg' of https://github.com/melissamcewen/habitrpg-shared into melissamcewen-issue4454habitrpg 2015-01-04 16:10:30 -06: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
Blade Barringer c0f51379e7 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-01 16:25:56 -06:00
Melissa Mcewen aa6abeecaa Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varibles to other spells 2015-01-01 14:47:04 -06:00
Melissa Mcewen 4a30363bc7 Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varible to spell 2015-01-01 14:30:30 -06: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 a5a7d22ce4 Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster 2014-12-31 13:17:21 -06:00
Alice Harris a7dd2dbd74 add canOwn code to nye2014 hat 2014-12-31 16:25:12 +10: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 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
Shared 7facfd1b84 Changed armorSpecialSkiText to armorSpecialSkiNotes for the notes 2014-12-30 22:28:46 +05:30
Sabe Jones 9e74d94e48 WIP(NYE): New Year's Cards 2014-12-29 20:57:12 -06:00
Sabe Jones f7d45c951e feat(seasonal): Implement snowball 
Minor refactoring of special spell purchasing, and turns snowball into Gold- instead of Gem-purchasable.
 2014-12-29 19:38:43 -06:00
Verabird 195f7832d0 Change valorousPresence to utilize diminishing returns. Keep results at 200 str the same 2014-12-29 13:57:11 -05:00
Alice Harris 058e506d13 Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12 2014-12-27 07:05:52 +10:00
Sabe Jones 6c8f9e39b6 fix(event): Mystery typo 2014-12-25 18:05:04 -06:00
Sabe Jones 9471393776 feat(event): 2014 Mystery Items 2014-12-25 16:08:06 -06:00
Sabe Jones 8ec9f79188 feat(event): Winter Wonderland 2015 gear 2014-12-21 12:37:37 -06:00
Alice Harris 4a7dcfc2bb merge changes for smash (Brutal Smash) from brandonjreid's PR https://github.com/HabitRPG/habitrpg-shared/pull/331 2014-12-20 21:13:43 +10:00
Alice Harris e9c8f66562 merge backStab change by brandonjreid from https://github.com/HabitRPG/habitrpg-shared/pull/331 2014-12-20 16:03:37 +10:00
Alice Harris fbc5a258f6 stop backStab and fireball (Burst of Flames) changing the task value 2014-12-20 13:35:10 +10:00
Alice Harris 9f77819d94 add pickpocket change from PR by brandonjreid: https://github.com/HabitRPG/habitrpg-shared/pull/331/files#diff-652dbbf3d459e90a3de1a122c063bb6bL502 2014-12-20 11:07:47 +10:00
Alice Harris afef118200 Merge toolsOfTrade changes from 'ShilohT-skillbalancing' into rebalancing-2014-12 2014-12-20 09:46:30 +10:00
Alice Harris 621615a6f9 Merge fireball (Burst of Flames) changes from 'ShilohT-skillbalancing' into rebalancing-2014-12 2014-12-20 09:42:26 +10:00