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,360 Commits 63 Branches 1,225 Tags
ad57dedecb0064fe4fe08a2b1b0bad140cbec1c1
Commit Graph

573 Commits

Author SHA1 Message Date
Blade Barringer
ad57dedecb refactor: Swap out remarkable for habitica flavored markdown-it 2016-04-25 07:36:02 -05:00
Sabe Jones
867146dc19 fix(xss): Update site to use remarkable instead of marked 
https://snyk.io/vuln/npm%3Amarked%3A20150520
https://github.com/chjj/marked/pull/592
 2016-04-21 13:23:53 -05:00
Sabe Jones
62f44771af fix(stable): rename Bumblebees throughout code 2016-04-18 21:02:24 +00:00
Blade Barringer
10936d9a4d chore: Switch to custom eslint-config 2016-04-15 09:03:59 -05:00
Sabe Jones
7bb6f968b4 feat(content): Pet Quest 2016-04 (#7071) 
Also renames the Be-Wilder special pet/mount rewards to "Magical Bee" from "Bumblebee".
 2016-04-13 12:15:38 -05:00
Sabe Jones
1f6eef0082 Sabrecat/armoire 201604 
* WIP(content): add sprites

* feat(content): Armoire and Backgrounds 2016-04
 2016-04-05 15:30:01 -05:00
Alys
0ba47de43d adjust cron so that it prevents a double cron when timezone decreases (timezoneOffset increases) 
* start to fix cron for when timezones change

* add some incomplete code

* change cron to identify when timezone changes and run only if both zones agree it should run - BAD - does cron an hour early one day later

* change timezone offset variable names

* improve handling of each individual timezone change possibility

* remove unnecessary casting to number

* remove duplicated code

* finish code for dangerous timezone change

* fix linting errors

* remove console.log lines and other testing code

* add a TODO comment for further actions for timezone changes in the "safe" direction
 2016-04-02 11:42:15 +10:00
Sabe Jones
a07aed331c fix(world-boss): add chat message, Bailey handling, animation 2016-03-31 19:38:43 -04:00
Sabe Jones
f51653b7a5 WIP(world-boss): partial build 2016-03-31 17:29:21 -04:00
Sabe Jones
95fa91522a Merge pull request #6955 from HabitRPG/wheelchair 
Wheelchair
 2016-03-30 14:25:12 -05:00
Alys
ae9e6fbe30 allow cron to record user's current timezone offset in preferences.timezoneOffsetAtLastCron (initial stage of cron timezone fix for https://github.com/HabitRPG/habitrpg/issues/3806 ) 2016-03-29 22:34:23 +10:00
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
Matteo Pagliazzi
b948fc031f fix typo in common code 2016-03-13 21:12:19 +01:00
Matteo Pagliazzi
6fa23ae49f make sure to clone drop so original properties do not change 2016-03-11 19:11:46 +01:00
Matteo Pagliazzi
05676d834e remove git conflict data 2016-03-10 17:13:13 +01:00
Matteo Pagliazzi
c39967767c Merge branch 'develop' into split-shared 2016-03-10 17:00:59 +01:00
Sabe Jones
d92614844a Merge pull request #6849 from HabitRPG/sabrecat/pets-201603 
Pet quest March 2016
 2016-03-09 15:11:14 -06:00
Sabe Jones
cc53e6e9dc Merge pull request #6733 from vIiRuS/mobileStorage 
Store data for next mobile update
 2016-03-09 14:56:15 -06:00
Sabe Jones
d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Matteo Pagliazzi
986bfd8035 split remaining utilities from shared 2016-03-08 19:35:02 +01:00
Blade Barringer
155cd6c626 fix: Correct how faq module is exported 2016-03-08 11:59:45 -06:00
Matteo Pagliazzi
bb6f0f4252 split user.fns 2016-03-08 18:58:39 +01:00
Matteo Pagliazzi
393a26e51a fix typo: reroll -> rebirth 2016-03-08 18:02:23 +01:00
Matteo Pagliazzi
a351cb5f4e change references to imported libs 2016-03-08 17:49:18 +01:00
Matteo Pagliazzi
5a2daabada remove all changes from eslint --fix 2016-03-08 17:45:14 +01:00
Matteo Pagliazzi
eeebe4c342 wip: split shared ops 2016-03-07 23:02:42 +01:00
Matteo Pagliazzi
8437c21a51 start splitting ops (readCard has tests) 2016-03-07 19:32:49 +01: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
8c6d8163bc refactor: adjust path to cron module in common code 2016-03-03 18:09:07 -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
Blade Barringer
c96ddaeebe refactor: Remove unused common script src files 2016-03-01 08:49:25 -06:00
Alys
3464914655 Revert "remove common/script/src" 
This reverts commit 7c5572608f.
 2016-03-01 05:30:44 +10:00
Matteo Pagliazzi
7c5572608f remove common/script/src 2016-02-29 16:35:35 +01: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