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
1580 commits 3 branches 0 tags 1.6 GiB
Commit graph

1580 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sabe Jones
9d279b7a77 chore(grunt): grunt full 2014-12-25 17:43:31 -06:00
Sabe Jones
9471393776 feat(event): 2014 Mystery Items 2014-12-25 16:08:06 -06:00
Sabe Jones
41f4ab7b8a feat(event): Implement Seasonal Shop 2014-12-25 14:58:25 -06:00
Blade Barringer
aeceb70b54 Merge pull request #411 from lacrimae/develop 
Corrected wording
 2014-12-25 08:35:06 -06:00
lacrimae
17233ef5df Corrected wording 
"may become grow more severe" -> "may grow more severe"
 2014-12-25 15:21:29 +01:00
Matteo Pagliazzi
a7b648102b Merge pull request #407 from HabitRPG/add-flag-to-chat 
Add flag to chat
 2014-12-23 18:35:55 +01:00
Blade Barringer
6f410f59ce Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into add-flag-to-chat 2014-12-22 13:28:01 -06:00
Matteo Pagliazzi
d079ebbee9 chore(i18n): update locales 2014-12-22 20:09:45 +01:00
Sabe Jones
be62f4bb7f Merge pull request #403 from SabreCat/Bailey 
Promo art
 2014-12-21 15:47:36 -06:00
Sabe Jones
eb0d19fa29 chore(grunt): grunt full 2014-12-21 15:45:13 -06:00
Sabe Jones
0ec9e5b1e1 feat(news): Promo images 2014-12-21 15:40:07 -06:00
Sabe Jones
ef02e059c7 chore(grunt): grunt full 2014-12-21 15:24:55 -06:00
Sabe Jones
649e207769 Merge pull request #402 from SabreCat/winter2015/hair 
Wintery Hair Colors for Wonderland 2015
 2014-12-21 15:16:10 -06:00
Sabe Jones
1ff25dfd5b Merge pull request #401 from SabreCat/winter2015/gear 
Winter Wonderland 2015 Gear
 2014-12-21 15:09:51 -06:00
Sabe Jones
784850f934 Merge pull request #400 from SabreCat/winter2015/npcs 
Winter 2015 NPCs
 2014-12-21 15:08:46 -06:00
Sabe Jones
d0a97fb20f feat(event): Wintery Hair Colors 
Also removes an accidental duplication of a prior hair resource.
 2014-12-21 13:55:23 -06:00
Sabe Jones
e62cb74ad0 fix(event): head, not helm 2014-12-21 12:43:44 -06:00
Sabe Jones
8ec9f79188 feat(event): Winter Wonderland 2015 gear 2014-12-21 12:37:37 -06:00
Sabe Jones
8d645bcafd chore(grunt): grunt full 
Also flips Ian NPC to standard spritesmith instead of animated GIF.
 2014-12-21 10:57:02 -06:00
Sabe Jones
c8aadf296e feat(event): Winter NPCs 2014-12-21 10:44:08 -06:00
Blade Barringer
eeff8a80d6 Brought in groups.json from original branch 2014-12-18 22:01:52 -06:00
Matteo Pagliazzi
486d8a9bbf chore(i18n): update locales 2014-12-18 22:56:34 +01:00
Blade Barringer
1fe3664731 ran grunt to compile coffeescript 2014-12-18 14:01:31 -06:00
Ben Lind
e1d44cc54f HabitRPG/habitrpg#3260 Buttonless habit full width 
When the user has neither a plus nor a minus button on
one of their habits, the habit’s title will now span the entire
width of the task div instead of having a gap to the left.
 2014-12-18 14:01:31 -06:00
Alice Harris
4f5e813fcf Merge pull request #396 from jamesleonis/develop 
Incorrect grammar in Vice 2 quest notes
 2014-12-18 19:48:46 +10:00
James Leonis
c308f6cf9f Incorrect grammar in Vice 2 quest notes 
"makes it's way to Mt. Habitica" to "makes its way to Mt. Habitica"
 2014-12-18 01:01:18 -08:00
Tyler Renelle
30e5e2096a grunt full 2014-12-17 21:53:27 -07:00
Sabe Jones
09ba5384f8 Merge pull request #395 from SabreCat/seasonal 
fix(seasonal): Leslie link
 2014-12-17 18:38:32 -06:00
Sabe Jones
6e77392e7a fix(seasonal): Leslie link 2014-12-17 18:26:52 -06:00
Sabe Jones
cbfd043b2c Merge pull request #394 from SabreCat/seasonal 
Seasonal Shop Basics
 2014-12-16 21:52:28 -06:00
Tyler Renelle
059f719461 Merge pull request #231 from wc8/patch-1 
innText update of groups.json to call username
 2014-12-16 14:16:26 -07:00
Sabe Jones
19930226c7 chore(grunt): grunt 2014-12-14 14:24:37 -06:00
Sabe Jones
c7ee171ee4 feat(seasonal): Seasonal shop 
Initial commit of resources for the Seasonal Shop feature.
 2014-12-14 13:33:10 -06:00
Blade Barringer
0352adfd47 Merge pull request #393 from SabreCat/timetravel 
Translate Time Travelers
 2014-12-14 13:27:48 -06:00
Sabe Jones
8d042745be fix(I18N): Translate Time Travelers 2014-12-14 12:57:36 -06:00
Blade Barringer
fd3cbf481d Merge pull request #390 from lacrimae/develop 
Streamlined "Confers no benefit" placements
 2014-12-14 11:02:45 -06:00
lacrimae
ff8a508860 Streamlined "Confers no benefit" placements 2014-12-14 13:32:44 +01:00
Alice Harris
5368d3b760 Merge pull request #389 from lacrimae/develop 
Pull req: Clarifying spell effects on attributes
 2014-12-13 10:31:50 +10:00
lacrimae
118a5432e5 Merge branch 'develop' of https://github.com/lacrimae/habitrpg-shared into develop 2014-12-13 00:16:24 +01:00
lacrimae
a15c57c275 Accidentally a dash 2014-12-13 00:15:46 +01:00
lacrimae
63263bbf3a Spells now mention which attribute they affect 
https://github.com/HabitRPG/habitrpg-shared/issues/380
 2014-12-13 00:15:46 +01:00
Blade Barringer
d2e5f60dd4 Added inbox as a env.t var 2014-12-10 10:46:36 -06:00
Sabe Jones
842289ffdf Merge pull request #384 from SabreCat/penguin 
Penguin quest
 2014-12-09 21:23:19 -06:00
Sabe Jones
ac2ce59873 chore(grunt): grunt 2014-12-09 21:16:00 -06:00
Sabe Jones
c6d3d72e00 fix(sprites): Move penguins 3px 2014-12-09 21:08:13 -06:00
Sabe Jones
5cd6c02e8a fix(quest): Dapper to perspicacious 2014-12-09 20:56:38 -06:00
Sabe Jones
7fd4cebbdc fix(quest): Penguin corrections 
Fix missing egg item and line breaks in quest text
 2014-12-09 20:44:10 -06:00
Sabe Jones
d25455fa5a feat(quest): Implement Penguin pet quest 2014-12-09 20:21:20 -06:00
Paul Klipp
3d2c7e8854 Fixed a grammar error in the Golden Knight 2 quest 
Changed “Perhaps I will shall . . . “ to “Perhaps I will . . . “
 2014-12-08 12:19:08 -06:00
lacrimae
9a60fc7ca8 Accidentally a dash 2014-12-08 01:02:14 +01:00