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

8170 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 2b20c52a8d Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster 2015-01-10 09:25:18 -06:00
Blade Barringer 0f3d6bc751 Explicitly reset mountCount to 0. (Otherwise, will not reset until refresh) 2015-01-10 09:24:30 -06:00
Blade Barringer a5d6c9de3f Force update of mountCount after feedling 2015-01-10 09:22:53 -06:00
Blade Barringer d5436dc8ec Corrected release mounts code 2015-01-10 09:13:25 -06:00
Blade Barringer c6ef4b52ab The inventory controllers watch on mounts was creating an inaccurate count (was counting quest and special mounts) 2015-01-10 09:03:59 -06:00
Blade Barringer 7f20ca7d8b Made title dynamic 2015-01-10 08:26:11 -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
Blade Barringer 38f7c1e634 Closes #4490. Day start saves on blur instead of change 2015-01-09 19:10:10 -06:00
Blade Barringer dc37442691 Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat 
Cmd/Ctrl + enter for chat and pms.
 2015-01-09 13:51:21 -06:00
Blade Barringer 64bb55e57b Reworked mixin file to retain gembutton history 2015-01-09 13:48:19 -06:00
Blade Barringer a61c4c1b18 Wrote in ng-if to hide the mp if user has not chosen a class 2015-01-09 10:09:07 -06:00
Sabe Jones 689b13ecb6 fix(world-boss): Justin not stressed yet 2015-01-09 10:00:16 -06:00
Blade Barringer 9b0d854855 Changed calculation to use profile instead of logged in user (duh) 2015-01-09 09:56:53 -06:00
Blade Barringer 2d0d2cedd9 Converted floor mechanism to filter to match health calculation 2015-01-09 09:50:13 -06:00
Blade Barringer 34bd7cb879 Added mana to stats page 2015-01-09 09:47:06 -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 cda16d5bc0 Merge pull request #4494 from SabreCat/stressbeast 
World boss for Winter Wonderland 2015
 2015-01-08 15:51:04 -06:00
Sabe Jones 41d073d181 fix(world-boss): Achievement badge 2015-01-08 15:47:48 -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
Sabe Jones ee339fba4a feat(event): World boss 
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
 2015-01-08 15:22:42 -06:00
Tyler Renelle cba232ef83 feat(presskit): add presskit page cc @lemoness 2015-01-08 13:41:23 -07:00
Tyler Renelle 6626103d06 chore(cores): allow cores==0 to not use cluster at all (even w/ single 
core). Good for running debugger. If cores==1, it will use cluster to
restart the single node on error
 2015-01-08 13:19:11 -07:00
Blade Barringer 0807e7856c Merge remote-tracking branch 'upstream/develop' into mountmaster 2015-01-08 11:31:45 -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
Tyler Renelle 0b28f6df55 fix(plans): when gifting subscription, set plan.dateUpdated so it can 
roll gemCapExtra next month. Fixes #4480
 2015-01-07 14:59:38 -07:00
Blade Barringer c96ae618db Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-07 10:32:58 -06:00
Blade Barringer eca252a269 Corrected moment code to use new format instead of depreciating format 2015-01-07 10:28:46 -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 193b92c16b fix(cds): max hour is 23 not 24 2015-01-06 23:12:03 +01:00
Blade Barringer 8ba0bb5d88 Changed spellObj to skill to be more semantic, and match the text in the 
rewards column
 2015-01-06 15:31:07 -06:00
Blade Barringer 870d9d7e86 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-06 15:04:47 -06:00
Blade Barringer 9da000ec4e Changed spell to spellObj in ng-repeat for class spells in order to 
assist with applying an active class to current spell. (would collide
with $scope.spell in rootCtrl.js)
 2015-01-06 15:03:54 -06:00
Blade Barringer 96b48324f8 Merge pull request #4484 from crookedneighbor/fix-for-date-on-tasks 
Fix for truncated dates on task due date. Closes #4482
 2015-01-06 14:29:16 -06:00
Blade Barringer 53c466ee7f Rounds tooltip for exp, health and mana to 2 decimal places 2015-01-06 13:52:22 -06:00
Blade Barringer e416b03a59 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-06 09:39:04 -06:00
Blade Barringer dd4e8d74c7 Fix for truncated dates on task due date. Closes #4482 2015-01-06 09:37:29 -06:00
Matteo Pagliazzi f4b72c088f chore(i18n): add danish and update locales 2015-01-06 15:59:20 +01:00
Matteo Pagliazzi b854663b92 fix(loggly): do not pass apiKey 2015-01-06 09:05:30 +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 8feffa5431 fix(news): Improve accuracy 2015-01-05 17:31:19 -06:00
Blade Barringer f0c65be629 Fix to allow for challenges with the same award name. Closes #4479 2015-01-05 17:15:33 -06: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 8529c0f1db chore(news): Bailey 2015-01-05 16:48:58 -06:00
Sabe Jones 285ff6228c fix(backgrounds): Frigid, not Snowy, Peak 2015-01-05 16:41:23 -06:00