sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-08-05 12:02:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1672 commits 3 branches 0 tags 1.6 GiB
Commit graph

1672 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
a40d820d56 Salt spell doesn't check to see if you have enough Gold #4454 adding immediate use varible to spell 2015-01-01 14:34:15 -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
0b57d42e2a Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into develop 2014-12-31 09:32:29 -06:00
Blade Barringer
611e350b63 Compiled changes to spookdust and snowball in task view 2014-12-31 09:31:09 -06:00
Blade Barringer
f2bf3efc5c Adjusted position of ghost and snowball 2014-12-31 09:14:29 -06:00
Blade Barringer
008f79ad84 Resized shop versions of snowball and spookdust to match gold coins 2014-12-31 09:08:58 -06:00
Blade Barringer
8fb22c5301 Merge pull request #422 from crookedneighbor/resize-special-items 
Resize special items
 2014-12-31 08:49:49 -06:00
Blade Barringer
92ad91d545 Reverted gruntfile back 2014-12-31 08:41:11 -06:00
Blade Barringer
015ab34a4f Compiled images with cards 2014-12-31 08:40:50 -06:00
Blade Barringer
7cd9674d97 Resized cards 2014-12-31 08:39:35 -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
Matteo Pagliazzi
c3283483e3 chore(i18n): update locales 2014-12-31 13:35:49 +01: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
Sabe Jones
8fabcc4ffd Merge pull request #425 from SabreCat/nye 
New Year's event features
 2014-12-30 22:17:23 -06:00
Sabe Jones
dd3ec20e5e feat(NYE): Silly Party Hat 2014-12-30 21:20:07 -06:00
Tyler Renelle
5fc001e4f6 feat(google-discount): add google discount 2014-12-30 20:05:51 -07: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
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
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
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
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
Blade Barringer
aca7a039c4 Updated crystal armor 2014-12-29 22:51:06 -06:00
Blade Barringer
e2e3b3944b Compiled hydra pet and css. Closes #272 2014-12-29 22:41:08 -06:00
Blade Barringer
a80e0322ee Updated hydra pet to use standard pet dimensions 2014-12-29 22:19:24 -06:00
Blade Barringer
c7c35e4d64 Merge pull request #420 from crookedneighbor/octo-fix 
Octo fix
 2014-12-29 22:13:24 -06:00