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

1755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Blade Barringer 3625cf514e Added triad bingo achievement test 2015-01-16 11:49:00 -06:00
Blade Barringer e565bf7896 Added initial strings for triad bingo 2015-01-16 11:25:49 -06:00
Blade Barringer e8b6779be6 Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster 2015-01-16 10:47:50 -06: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
Matteo Pagliazzi 73d684987e chore(grunt): compile 2015-01-16 17:33:44 +01:00
Matteo Pagliazzi 4a22b1dc57 fix(sync): fix for when data is null, ie. server offline 2015-01-16 17:33:15 +01:00
Matteo Pagliazzi 1f1cd750cb chore(i18n): update locales 2015-01-16 17:16:48 +01:00
Sabe Jones c1d1d7d4a5 chore(grunt): grunt full 2015-01-15 16:52:59 -06:00
Sabe Jones 3e17834b5d Merge pull request #440 from SabreCat/develop 
T-Rex pet quest
 2015-01-15 16:39:38 -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
Matteo Pagliazzi 8a2e9caca9 chore(i18n): update locales 2015-01-14 19:53:17 +01:00
Matteo Pagliazzi ce1c0d9008 Merge pull request #438 from crookedneighbor/prevent-type-changing 
Prevent type changing
 2015-01-14 19:41:44 +01:00
Blade Barringer 2bd1af587b Compiled coffeescript 2015-01-13 20:18:06 -06:00
Blade Barringer a805b4f0c9 Brought in lefnire's change so type cannot be changed on updateTask 2015-01-13 20:17:36 -06:00
Blade Barringer cb835f97b2 Merge pull request #437 from taldin/mountmaster-modal-edit-from-taldin 
Rewritten modal
 2015-01-13 19:55:43 -06:00
Taldin 150909cc95 Rewritten modal 
As per comments in #4374.
 2015-01-13 11:31:02 -08:00
Sabe Jones 4e50c43da2 fix(world-boss): Scale based on current HP 2015-01-13 13:19:38 -06:00
Sabe Jones 625d1dfbed Merge pull request #436 from SabreCat/stressbeast 
Stressbeast healing on rage
 2015-01-13 12:04:42 -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 ddff5afda7 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster 
Conflicts:
	dist/habitrpg-shared.js
 2015-01-12 21:50:57 -06:00
Blade Barringer f1e354ba0e Added string for both beast master and mount master 2015-01-12 13:12:50 -06:00
Blade Barringer 1fd068ae89 Corrected capitalization 2015-01-12 13:09:51 -06:00
Blade Barringer c7d8c40b0b Updated strings to use master instead of abreviated mast 2015-01-12 12:58:55 -06:00
Blade Barringer b4a62d76b7 Corrected beastmaster to beast master 2015-01-11 18:28:50 -06:00
Blade Barringer 995daee88d Corrected camel casing of beastMaster and mountMaster 2015-01-11 18:27:04 -06:00
Alice Harris b0fc2a8e7c Merge pull request #434 from Alys/develop 
change G to Gem to remove confusion with Gold
 2015-01-11 11:06:48 +10:00
Alice Harris 4e2a79e69c change G to Gem to remove confusion with Gold 2015-01-11 10:58:47 +10:00
Blade Barringer a24fad40ca Removed unused pieces of text 2015-01-10 09:39:23 -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
Blade Barringer d5436dc8ec Corrected release mounts code 2015-01-10 09:13:25 -06:00
Blade Barringer 06a89f67d7 Added title to keys heading. Allows dynamic display of beast master and 
or mount master
 2015-01-10 08:25:43 -06:00
Sabe Jones fd7ba143cc Merge pull request #432 from SabreCat/stressbeast 
World boss for Winter Wonderland 2015
 2015-01-08 15:51:23 -06:00
Sabe Jones 8bd32e0f35 chore(grunt): grunt full 2015-01-08 15:29:41 -06: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
Matteo Pagliazzi 54a9df4619 test(cron): setup failing test for changing cds to an hour past last cron 2015-01-07 16:52:04 +01:00
Matteo Pagliazzi f4b72c088f chore(i18n): add danish and update locales 2015-01-06 15:59:20 +01:00
Matteo Pagliazzi d63cc4da8f merge cron-fix 2015-01-06 08:55:48 +01:00
deilann b5de2ebf4b Merge pull request #430 from scribblypanda/develop 
off-hand to shield-hand in gear.json and questsContent.json
 2015-01-05 20:50:47 -08:00
Tyler Renelle 9ab3849502 grunt 2015-01-05 21:33:14 -07:00
scribblypanda 2718fd39e3 off-hand to shield-hand in gear.json and questsContent.json 2015-01-05 23:27:04 -05:00
Sabe Jones 61b827183b fix(grunt): Push CSS 2015-01-05 17:15:05 -06:00
Sabe Jones 97a48eb66e chore(grunt): grunt full 2015-01-05 17:00:17 -06: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
negue 1bdacffe96 Merge pull request #428 from negue/markdownDirective 
add remove-watch and use-timeout attribute to the markdown directive
 2015-01-05 22:11:38 +01:00
Matteo Pagliazzi 5eda9a34b7 chore(grunt): compile 2015-01-05 19:20:22 +01:00
Brandon Reid 15eb64c7d2 Fixed cron dayStart option. 
Wrote test cases to verify fix.
Fixed test cases that were incorrect.
 2015-01-05 19:20:21 +01:00
Matteo Pagliazzi a65c675243 chore(i18n): add hungarian and update locales 2015-01-05 17:31:26 +01:00