Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit 8ed9573
Author: Phillip Thelen <[email protected]>
Date:   Tue Jul 23 17:59:56 2024 +0200

    fix hatched dialog

commit 53242ad
Author: Phillip Thelen <[email protected]>
Date:   Tue Jul 23 17:38:13 2024 +0200

    fix popover not showing

commit ce4bfd2
Author: Phillip Thelen <[email protected]>
Date:   Wed Jul 3 17:28:30 2024 +0200

    move item popover to own component

commit 2e6a300
Author: Phillip Thelen <[email protected]>
Date:   Mon Jul 1 18:48:24 2024 +0200

    make scaled sprites look nice

commit a3cbadb
Author: Phillip Thelen <[email protected]>
Date:   Mon Jul 1 18:48:17 2024 +0200

    fix hatching dialog

commit 0e5126d
Author: Phillip Thelen <[email protected]>
Date:   Mon Jul 1 18:48:12 2024 +0200

    fix popover alignment

commit 7362af9
Author: Phillip Thelen <[email protected]>
Date:   Fri Jun 28 17:07:03 2024 +0200

    fix item display

commit cf353ef
Author: Phillip Thelen <[email protected]>
Date:   Fri Jun 28 16:59:13 2024 +0200

    fix pet display

commit caf0cba
Author: Phillip Thelen <[email protected]>
Date:   Fri Jun 28 15:24:39 2024 +0200

    fix background icon display

commit 3b06feb
Author: Phillip Thelen <[email protected]>
Date:   Wed Jun 26 12:30:04 2024 +0200

    fix sprites for notifications

commit 160b2de
Author: Phillip Thelen <[email protected]>
Date:   Wed Jun 26 10:35:13 2024 +0200

    fix gear display in profile

commit b200a2f
Author: Phillip Thelen <[email protected]>
Date:   Wed Jun 26 10:28:11 2024 +0200

    fix sprites for keys to the kennel

commit 3614e7a
Author: Phillip Thelen <[email protected]>
Date:   Wed Jun 26 10:28:00 2024 +0200

    fix sprites on avatar customization

commit 35f993d
Author: Phillip Thelen <[email protected]>
Date:   Wed Jun 26 09:18:41 2024 +0200

    fix hover icons

commit 28fc801
Author: Phillip Thelen <[email protected]>
Date:   Tue Jun 11 16:50:37 2024 +0200

    remove console

commit b041c67
Author: Phillip Thelen <[email protected]>
Date:   Tue Jun 11 15:18:44 2024 +0200

    more lint fixes

commit f4261d0
Author: Phillip Thelen <[email protected]>
Date:   Tue Jun 11 15:18:16 2024 +0200

    fix lint

commit 878ee8f
Author: Phillip Thelen <[email protected]>
Date:   Tue Jun 11 13:23:08 2024 +0200

    support gifs

commit aac2471
Author: Phillip Thelen <[email protected]>
Date:   Tue Jun 11 13:15:52 2024 +0200

    move avatar customization to sprites

commit f4d3663
Author: Phillip Thelen <[email protected]>
Date:   Fri Jun 7 17:25:19 2024 +0200

    Move more sprites out of css

commit 6e6b4c9
Author: Phillip Thelen <[email protected]>
Date:   Fri Jun 7 16:59:30 2024 +0200

    add new sprite to item and shopItem component

commit 8712413
Author: Phillip Thelen <[email protected]>
Date:   Fri Jun 7 16:37:24 2024 +0200

    use new sprites for pets list

commit 1172893
Author: Phillip Thelen <[email protected]>
Date:   Wed Jun 5 09:43:51 2024 +0200

    Begin building new system for loading sprites
  • Loading branch information
SabreCat committed Jul 29, 2024
1 parent e801547 commit 271f40e
Show file tree
Hide file tree
Showing 34 changed files with 30,170 additions and 47,057 deletions.
35 changes: 33 additions & 2 deletions gulp/gulp-sprites.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,41 @@ function cssVarMap (sprite) {
}
}

function createSpritesStream (name, src) {
function filterFile (file) {
if (file.relative.indexOf('Mount_Icon_') !== -1) {
return false;
}
if (file.path.indexOf('shop/') !== -1) {
return false;
}
if (file.path.indexOf('stable/eggs') !== -1) {
return false;
}
if (file.path.indexOf('stable/food') !== -1) {
return false;
}
if (file.path.indexOf('stable/potions') !== -1) {
return false;
}
if (file.relative.indexOf('shop_') === 0) {
return false;
}
if (file.relative.indexOf('icon_background') === 0) {
return false;
}
return true;
}

async function createSpritesStream (name, src) {
const stream = mergeStream();
// need to import this way bc of weird dependency things
// eslint-disable-next-line global-require
const filter = require('gulp-filter');

const f = filter(filterFile);

const spriteData = gulp.src(src)
.pipe(f)
.pipe(spritesmith({
imgName: `spritesmith-${name}.png`,
cssName: `spritesmith-${name}.css`,
Expand All @@ -63,7 +94,7 @@ function createSpritesStream (name, src) {
return stream;
}

gulp.task('sprites:main', () => {
gulp.task('sprites:main', async () => {
const mainSrc = sync('habitica-images/**/*.png');
return createSpritesStream('main', mainSrc);
});
Expand Down
68 changes: 68 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
"got": "^11.8.6",
"gulp": "^4.0.0",
"gulp-babel": "^8.0.0",
"gulp-filter": "^7.0.0",
"gulp-imagemin": "^7.1.0",
"gulp-nodemon": "^2.5.0",
"gulp.spritesmith": "^6.13.0",
Expand Down
Loading

0 comments on commit 271f40e

Please sign in to comment.