sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-04-14 19:56:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
12406 commits 3 branches 0 tags 1.6 GiB
Commit graph

581 commits

Author SHA1 Message Date
Blade Barringer
c23730fdbf Merge branch 'develop' of github.com:HabitRPG/habitrpg into rebalancing 2015-03-06 07:47:10 -06:00
Alice Harris
b106b88201 fix comment 2015-02-08 17:50:55 +10:00
Alice Harris
6ca9c10cda change some comments 2015-01-26 14:53:13 +10:00
Blade Barringer
32ed4dace7 Fixed triad bingo achievement not being awarded to people who already 
had it
 2015-01-20 19:24:46 -06: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
Blade Barringer
42e1020c60 Added back in showCompleted=false to display tags 2015-01-19 18:50:54 -06:00
Tyler Renelle
899de5fc25 grunt 2015-01-19 16:14:21 -07:00
Blade Barringer
8b864e114b Compiled spritesheets 2015-01-18 21:11:49 -06:00
Blade Barringer
2efadf7381 Removed white space on t-rex iamges closes #4531 2015-01-16 22:33:06 -06:00
Blade Barringer
75971b0f40 Added triad bingo check to releaseBoth function 2015-01-16 17:01:01 -06:00
Blade Barringer
8b1ba48bfe Merge branch 'mountmaster' into triad-bingo 2015-01-16 16:53:35 -06:00
Blade Barringer
d9fed69147 Corrected releasBoth function to reset current pet and deduct the 
correct amount of gems
 2015-01-16 16:52:59 -06:00
Blade Barringer
5b2c4d5a09 Compiled css 2015-01-16 12:23:25 -06:00
Blade Barringer
d4d18dcee5 Added triad bingo achievement 2015-01-16 12:14:51 -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
Sabe Jones
c1d1d7d4a5 chore(grunt): grunt full 2015-01-15 16:52:59 -06:00
Blade Barringer
2bd1af587b Compiled coffeescript 2015-01-13 20:18:06 -06:00
Alice Harris
4e2a79e69c change G to Gem to remove confusion with Gold 2015-01-11 10:58:47 +10: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
Sabe Jones
8bd32e0f35 chore(grunt): grunt full 2015-01-08 15:29:41 -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
d63cc4da8f merge cron-fix 2015-01-06 08:55:48 +01:00
Tyler Renelle
9ab3849502 grunt 2015-01-05 21:33:14 -07: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
Matteo Pagliazzi
5eda9a34b7 chore(grunt): compile 2015-01-05 19:20:22 +01:00
Blade Barringer
a54e1cd448 Compiled version of adjustment to spells 2015-01-04 16:15:36 -06:00
Blade Barringer
b042c3e723 Compiled coffeescript for release scripts 2015-01-02 14:13:56 -06: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
9b34cfe8c6 Compiled mountmaster achievement medal 2015-01-01 21:17:37 -06:00
Blade Barringer
3389d418ce Set up system to calculate if Mountmaster should be awarded 2015-01-01 16:51:58 -06: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
Blade Barringer
439f72cb91 Separated out the check for nyeRecieved and pushing to the array 2014-12-31 18:35:59 -06:00
Blade Barringer
3224cf6004 Corrected release2 script to actually release mounts 2014-12-31 17:20:22 -06:00
Blade Barringer
611e350b63 Compiled changes to spookdust and snowball in task view 2014-12-31 09:31:09 -06:00
Blade Barringer
015ab34a4f Compiled images with cards 2014-12-31 08:40:50 -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
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
Tyler Renelle
5fc001e4f6 feat(google-discount): add google discount 2014-12-30 20:05:51 -07:00
Blade Barringer
a6560d1651 Compiled fortify potion into spritesheet 2014-12-30 19:06:40 -06:00
Blade Barringer
3a0dd0417a Compiled panda skull image to spritesheet 2014-12-30 14:49:56 -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
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
Blade Barringer
627a9af3b9 Compiled css and images for cyrstal armor (shop). Closes #180 2014-12-29 23:04:30 -06:00
Blade Barringer
e2e3b3944b Compiled hydra pet and css. Closes #272 2014-12-29 22:41:08 -06:00
Blade Barringer
63ddd819f7 Compiled spritesheet for octopi 2014-12-29 22:10:11 -06:00