krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
12,300 Commits 63 Branches 1,225 Tags
a9d227b490ba041a6ab243e6d834b99b1d154018
Commit Graph

138 Commits

Author SHA1 Message Date
Blade Barringer
a9d227b490 Merge branch 'develop' into wheelchair 2016-03-28 21:12:52 -05:00
Nick Bunn
0f9cf57613 feat: Add wheelchair to avatar customization 2016-03-24 07:57:13 -05:00
Sabe Jones
be159adf77 fix(event): pastel skin, not hair 2016-03-23 15:36:24 -04:00
Sabe Jones
1286b6fbee fix(event): make spring hair/skin available server side 2016-03-23 15:36:24 -04:00
Sabe Jones
f7027b5cf3 feat(event): subscriber items 2016-03 2016-03-23 15:36:24 -04:00
Sabe Jones
8447259016 Merge pull request #6921 from HabitRPG/sabrecat/spring-2016 
Spring Fling 2016
 2016-03-18 16:08:46 -05:00
Sabe Jones
10a8476aaf WIP(event): Spring Fling cont'd 2016-03-17 13:10:05 -04:00
Sabe Jones
4effa79e17 WIP(event): Spring Fling partial 2016-03-17 13:04:12 -04:00
Blade Barringer
c7310b97ec Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues." 
This reverts commit 9d50201180.
 2016-03-17 08:09:18 -05:00
Alys
9d50201180 Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues. 
This reverts commits 1c811dbc82, 146810a3e9, 9508ed45df, a6fb945120.
 2016-03-17 21:47:29 +10:00
Blade Barringer
146810a3e9 feat: Add set property to content 2016-03-15 19:41:19 -05:00
Sabe Jones
d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Blade Barringer
155cd6c626 fix: Correct how faq module is exported 2016-03-08 11:59:45 -06:00
Blade Barringer
511b003ec5 Merge pull request #6811 from crookedneighbor/upgrade_babel 
chore: upgrade babel to v6
 2016-03-04 08:36:08 -06:00
Blade Barringer
0406142e0e chore: upgrade babel to v6 2016-03-02 21:36:27 -06:00
Alys
c3107ad3fb improve commenting style 2016-03-03 13:35:55 +10:00
Alys
56e53cc95f fix Burst of Flames / fireball skill - was doing too much boss damage; add human-friendly names to skills for ease of searching 2016-03-03 08:30:49 +10:00
Matteo Pagliazzi
5b012750bb convert spells to es6 2016-03-02 12:46:06 +01:00
Sabe Jones
ea6abbfabc feat(content): Armoire and BGs 2016-03 2016-03-01 15:59:25 -05:00
Sabe Jones
3270cbf89f fix(events): revert missed sprite and quest availability 2016-02-24 19:49:17 -05:00
Sabe Jones
ca57fad0b9 feat(time-travel): add Phoenixes 
Also adds Bailey news for the above and the subscriber set.
 2016-02-24 17:23:42 -05:00
Sabe Jones
5c1d379f41 feat(subscription): mystery items 201602 2016-02-23 17:00:55 -05:00
Sabe Jones
e1b13db6e8 feat(quests): pets 201602 
Also enables the Valentine's Day card for selection in the Market.
 2016-02-08 16:20:05 -05:00
Sabe Jones
d8e9b781c8 feat(content): BGs and Armoire 201602 2016-02-02 16:02:50 -05:00
Sabe Jones
0fcdc49adb chore(event): end Winter Wonderland 2016-02-01 17:01:17 -05:00
Sabe Jones
b7ee6f7da0 fix(event): award old Robes to new users, not 2016 2016-01-29 15:12:07 -05:00
Sabe Jones
91c6ce27c5 feat(event): Habit Birthday 2016 
Also adds AWS Elastic Beanstalk local config file to .gitignore.
 2016-01-28 17:16:01 -05:00
Sabe Jones
c6d6e73ae6 feat(subscription): January 2016 mystery items 2016-01-26 15:20:55 -05:00
Phillip Thelen
8e8c28725a Add avatar customizations to content API 2016-01-25 21:59:13 -06:00
Sabe Jones
14a6d0dabf feat(quests): January 2016 pet 2016-01-13 17:15:02 -05:00
Alys
0d47f8d116 allow purchase of Find the Cub evilsanta2 quest scroll before completing previous quest - fixes https://github.com/HabitRPG/habitrpg/issues/6405 2016-01-12 02:58:33 +10:00
Sabe Jones
adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Sabe Jones
cc00602112 fix(event): remove magic potions 2016-01-04 11:56:34 -05:00
Blade Barringer
874f319d95 fix: Corrects logic where it was possible to customize avatar 
with gem purchasable items without purchasing them.

Closes #6427
Closes #6448

lint(common): Add unnecessary quotes to make object look less weird
 2016-01-03 10:41:44 -06:00
Sabe Jones
2c6f600703 fix(event): NYE hat for new users 2015-12-31 21:35:17 -05:00
Sabe Jones
054e3cb361 feat(event): New Year's Eve 2015 2015-12-29 14:55:05 -05:00
Sabe Jones
7a41d36834 fix(mystery): add event timeframe 2015-12-23 20:33:45 -05:00
Sabe Jones
468198b9e2 feat(mystery): subscriber items 2015-12 
Also enables the Snowball in the Seasonal Shop.
 2015-12-22 16:16:30 -05:00
Sabe Jones
1e1f15b495 fix(content): linting errors 2015-12-18 17:27:27 -05:00
Sabe Jones
493ae6f26a feat(event): Winter Wonderland complete 2015-12-18 15:48:14 -05:00
Sabe Jones
6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones
3cc2866c76 Merge pull request #6368 from HabitRPG/sabrecat/pets-201512 
December Pet Quest
 2015-12-15 11:55:08 -06:00
Nathan Maton
35a921bf43 feat(content): Make mystery set strings translatable 
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
 2015-12-15 08:47:13 -06:00
Sabe Jones
fe1de12494 feat(pets): December quest 2015-12-14 16:28:39 -05:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions 
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
 2015-12-04 17:20:33 -05:00
Sabe Jones
5b943b4ab9 feat(event): Enable GaymerX armor 2015-12-01 18:11:04 -05:00
Sabe Jones
03222bf084 feat(content): Armoire and backgrounds 2015/12 2015-12-01 16:29:22 -05:00
Sabe Jones
29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Blade Barringer
f94394127a Remove unused var 2015-11-18 08:00:14 -06:00
Blade Barringer
9e557c43d3 Fix bug where seasonal items could not be purchased. 2015-11-18 07:58:01 -06:00