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

1615 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sabe Jones
9e74d94e48 WIP(NYE): New Year's Cards 2014-12-29 20:57:12 -06:00
Sabe Jones
c14285dbd9 feat(NYE): Image resources 2014-12-29 20:17:47 -06:00
Sabe Jones
f7d45c951e feat(seasonal): Implement snowball 
Minor refactoring of special spell purchasing, and turns snowball into Gold- instead of Gem-purchasable.
 2014-12-29 19:38:43 -06:00
Matteo Pagliazzi
e93754e50b Merge pull request #414 from Verabird/dateformat 
Dateformat
 2014-12-29 21:23:29 +01:00
Alice Harris
ba9a10f688 Merge pull request #408 from sbreiler/develop 
Fix #4296 (Subscription "Update Card" message is cut off)
 2014-12-27 12:46:32 +10:00
Alice Harris
5e168c41ce Merge pull request #305 from Alys/deathGear-Sep10 
prevent off-class items and free items being lost on death
 2014-12-27 08:31:50 +10:00
Alice Harris
9d8a234fe1 update dist/habitrpg-shared.js 2014-12-27 08:02:14 +10:00
Alice Harris
7d74f36466 improve code for user.items.gear.owned.toObject as lefnire suggested in https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55528155 2014-12-27 07:28:06 +10:00
Alice Harris
71269a762f reinsert comment that was accidentally removed 2014-12-27 07:28:06 +10:00
Alice Harris
8678e10958 improve iteration over all owned items to correctly handle mogoose toObject - ref https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55469925 2014-12-27 07:28:06 +10:00
Alice Harris
27ef50fe26 fix typo in comment characters - sorry for commit spam 2014-12-27 07:28:05 +10:00
Alice Harris
ac233a2b04 update death "doesn't break unbreakables" test to match the new code behaviour 2014-12-27 07:28:05 +10:00
Alice Harris
0391d1afc4 add mostly pointless comment to trigger a new Travis build test since the last one didn't do what I wanted :) 2014-12-27 07:28:05 +10:00
Alice Harris
abc2f59b57 allow the free weapon_warrior_0 equipment to be lost on death so that new players can experience equipment loss 2014-12-27 07:28:05 +10:00
Alice Harris
d7f9760c0f fix typo so that Ryan doesn't make pointed comments at me 2014-12-27 07:28:05 +10:00
Alice Harris
87f51913d0 prevent off-class items and free items being lost on death 2014-12-27 07:28:05 +10:00
Verabird
baa528fe7b Add dateFormat phrase for translation 2014-12-26 15:48:20 -05:00
Verabird
a3f0d4dea5 Add default values for shortdate and mediumdate formats 2014-12-26 15:48:19 -05:00
Matteo Pagliazzi
971ea8a495 chore(i18n): update locales 2014-12-26 11:33:21 +01:00
Sabe Jones
2cac24ebe9 chore(grunt): grunt full 2014-12-25 18:09:29 -06:00
Sabe Jones
37db763fc2 fix(event): Mystery sprite error 2014-12-25 18:08:14 -06:00
Sabe Jones
6c8f9e39b6 fix(event): Mystery typo 2014-12-25 18:05:04 -06:00
Sabe Jones
620fcd1144 Merge pull request #413 from SabreCat/seasonal 
Winter Wonderland 2015 Cont'd
 2014-12-25 17:48:12 -06:00
Sabe Jones
9d279b7a77 chore(grunt): grunt full 2014-12-25 17:43:31 -06:00
Alice Harris
5836436b7b Merge pull request #404 from Alys/develop 
Style Guide for Equipment Descriptions
 2014-12-26 08:26:20 +10: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
Alice Harris
6fcf6b7d05 Merge pull request #412 from lacrimae/develop 
Restored missing quote
 2014-12-26 06:47:14 +10:00
lacrimae
93119d7eab ... and the quote I missed :P 2014-12-25 21:41:11 +01:00
lacrimae
772994c8a0 Restored missing quote 2014-12-25 21:40:24 +01: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
Steffen Breiler
e33101b762 Fix #4296 (Subscription "Update Card" message is cut off) 2014-12-24 00:06:17 +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
Alice Harris
d34b116732 update formatting for gear style guidelines 2014-12-23 06:43:05 +10:00
Alice Harris
d6354007f1 update formatting for gear style guidelines 2014-12-23 06:42:10 +10:00
Alice Harris
9d7bf26988 update formatting for gear style guidelines 2014-12-23 06:38:21 +10:00
Alice Harris
36a552b4a3 update formatting for gear style guidelines 2014-12-23 06:34:57 +10:00
Alice Harris
e30ff2eebb create style guide for gear/equipment descriptions based on ShilohT's suggestions in https://github.com/HabitRPG/habitrpg-shared/pull/372 2014-12-23 06:28:34 +10: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