sudoxreboot/habitica-self-host
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-self-host.git synced 2026-08-03 12:40:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
12237 commits 1 branch 0 tags 1.6 GiB
Commit graph

1420 commits

Author SHA1 Message Date
Blade Barringer
3f16cd4fbf refactor: Adjust stat allocation modal 2016-03-16 22:07:00 -05:00
Josh Holland
952d9ec929 Quick allocation of attribute points from level-up modal 
Resolves #6720.
 2016-03-16 22:06:54 -05:00
Blade Barringer
a150dbc9ca chore(i18n): update locales 2016-03-16 20:32:15 -05:00
Blade Barringer
be0bcad24b chore(i18n): update locales 2016-03-15 19:51:47 -05:00
Blade Barringer
1c811dbc82 refactor: Extract orderBy equipment button into mixin 2016-03-15 19:41:24 -05:00
Blade Barringer
146810a3e9 feat: Add set property to content 2016-03-15 19:41:19 -05:00
Matt Harrington
a6fb945120 inventory sorting 
Add inventory sorting buttons based on name, attribute, and set (armoire):
-  Each gear[klass] has its own sorting buttons and sorting state including costume classes
-  The attributes sort descending when selected, then by sum of all attributes
-  There is no default sort
-  The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
-  Name sorts by .text() ascending
 2016-03-15 19:41:11 -05:00
Sabe Jones
beb86ea4bd Merge branch 'khipkin/party-badges' into develop 
Conflicts:
	common/dist/sprites/spritesmith-main-10.png
	common/dist/sprites/spritesmith-main-11.png
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.png
 2016-03-15 14:57:38 -04: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
Kaitlin Hipkin
997fe155e2 fix blurry upscale of achievement-partyUp img 2016-03-10 20:49:54 -05:00
Sabe Jones
d28219e90d fix(content): Pfeffernusse typo, again 2016-03-10 17:35:36 -06: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
2a5011b648 fix(content): don't be clever with quest names 2016-03-09 16:57:43 -06: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
45b8dbc1a6 feat(content): snails complete 2016-03-09 15:55:22 -05:00
Sabe Jones
d153df7805 feat(content): snail pet quest WIP 2016-03-09 15:34:57 -05:00
Kaitlin Hipkin
b0fe5f4081 add 2x party up/on achieve images and recompile spritesheets 2016-03-09 12:43:54 -05:00
Kaitlin Hipkin
6642a8e131 add party up/on achiev images and recompile spritesheets 2016-03-09 12:02:43 -05:00
Kaitlin Hipkin
167eb8973a add strings for new partyUp and partyOn achievs 2016-03-08 20:45:33 -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
Alys
612d455fe1 Merge pull request #6782 from andrewcham/issue6779 
update community guidelines - fixes #6779
 2016-03-06 17:42:08 +10:00
Blade Barringer
a007effddd chore(i18n): update locales 2016-03-05 07:46:08 -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
9447a6ce10 feat: pre-compile babel when used in production 2016-03-04 07:44:22 -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
Nick Bunn
b6255e9240 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into menu_name_change 2016-02-29 20:23:24 -06:00
Nick Bunn
251dd3cb8e Changed submenu from Hall of Heroes to Hall of Contributors 2016-02-29 20:23:05 -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
Josh Holland
fae0bbc8f6 Add Moonstone Chain quest art 2016-02-28 19:37:07 -06:00
Nick Bunn
075ed9f172 updated menu names for better description 2016-02-28 16:10:26 -06:00
Josh Holland
e2ca21f935 Add Message in a Bottle quest art 2016-02-28 17:12:57 +00:00
Alys
6cd861dcdc Merge pull request #6742 from murraybd/develop 
Display attribute info in Character Build
 2016-02-28 19:39:20 +10:00
Andrew Cham
bf64c6503d #6779 Update community guidelines 2016-02-27 02:47:58 -08:00