Commit graph

476 commits

Author SHA1 Message Date
tim h
072e81ce5e Merge branch 'main' into testing 2022-12-17 15:07:26 -06:00
tim h
79ee0655b1 fixes resolution changing while scrolling through returned images if sync cursor size is enabled 2022-12-17 15:07:10 -06:00
tim h
b50b6f0ce4 come back progress bar, i miss you 2022-12-17 09:35:26 -06:00
Victor Seiji Hariki
8a0b9d2e8d fix saving canvas negative images
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 02:07:10 -03:00
Victor Seiji Hariki
fc7302f8fa fix snapping for negative i values
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 01:20:51 -03:00
Victor Seiji Hariki
9a8b064ab2 no need for this anymore
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 01:15:27 -03:00
Victor Seiji Hariki
a941056db4 fix viewport location limits
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 01:07:02 -03:00
Victor Seiji Hariki
2ee01e71c9 fix some tools
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 00:55:53 -03:00
Victor Seiji Hariki
701e1573bc fix fully negative values on cropCanvas
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 00:43:36 -03:00
Victor Seiji Hariki
ea68e25cf0 canvas scaling?
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 00:21:28 -03:00
tim h
56c2a6740a
Merge pull request #106 from zero01101/testing
rename keepMask to keepUnmask
2022-12-16 20:05:46 -06:00
tim h
6d9155261e RFC- rename keepMask to keepUnmask
simple search/replace for keepMask[ed]
2022-12-16 19:59:30 -06:00
tim h
1057d577c0
Update README.md 2022-12-15 22:34:22 -06:00
Victor Seiji Hariki
7bf0be44ad
Merge pull request #105 from zero01101/testing
fix img2img mask canvas weirdness
2022-12-16 01:29:26 -03:00
Victor Seiji Hariki
34ef37869f fix img2img mask canvas weirdness
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-16 01:28:03 -03:00
tim h
c0ccc9c4f0 version bump, update readme 2022-12-15 21:55:54 -06:00
tim h
ebe6e63e5d
Merge pull request #104 from zero01101/testing
brings back interrogate reticle
2022-12-15 21:16:50 -06:00
tim h
b30f7f23a9 brings back interrogate reticle 2022-12-15 21:15:50 -06:00
Victor Seiji Hariki
b038059ffb
Merge pull request #100 from zero01101/testing
2022-12-13 Testing Pull
2022-12-15 22:47:33 -03:00
Victor Seiji Hariki
5872f2c3a4 fix duplicate mousewheel events
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-15 22:37:21 -03:00
tim h
065b3062a6 whoops 2022-12-15 09:51:08 -06:00
tim h
a7e02cd76d fixes use seed button for multiple dream queues 2022-12-15 09:25:20 -06:00
Victor Seiji Hariki
3207e86566 makes ctrl + middle be move canvas
This is for consistency with zoom and to avoid conflict with middle
mouse click for extra image generation

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-15 11:59:01 -03:00
Victor Seiji Hariki
c6a6342a8c This should be a bit better
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-15 11:51:18 -03:00
Victor Seiji Hariki
9a81946eef now selection dream compatible with mouse functions
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-15 09:57:41 -03:00
Victor Seiji Hariki
ec05084d71 ignore wheel on ctrl key and remove debug
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-14 15:45:41 -03:00
Victor Seiji Hariki
5e6b18503b Should mostly solve #94
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-14 15:12:44 -03:00
Victor Seiji Hariki
0c5ed4a17e select handle scaling
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-14 14:02:36 -03:00
Victor Seiji Hariki
6cdd9495e3 keep masked option added
a fix for #99

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-14 00:17:17 -03:00
Victor Seiji Hariki
7a96d77a7e fix autocomplete value reader and now use blob
It should fix #93

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 23:54:38 -03:00
tim h
59b2d451fe whoops jr 2022-12-13 20:08:46 -06:00
tim h
a350842dfd whoops
at least it fixes fixed-seed makeMore() too
2022-12-13 20:03:58 -06:00
tim h
9b23e3aa92 reuse random seeds 2022-12-13 19:30:40 -06:00
Victor Seiji Hariki
2e151d2bbc fix resolution not bound to cursor size anymore (again)
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 20:22:16 -03:00
Victor Seiji Hariki
e2afb48703 fix loading empty prompts from local storage
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 17:07:30 -03:00
Victor Seiji Hariki
fb83b126c7 supports drag and drop for non-square resolutions
Has a lot of duplicate code... will try refactoring someday. Adding
mouse wheel on selection to scale generation resolution is also a
possibility.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 15:17:02 -03:00
Victor Seiji Hariki
58b5805bd7 remove debug
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:47:30 -03:00
Victor Seiji Hariki
3ef2bce9f0 fixed loading of boolean values from localStorage
It seems we were doing localStorage wrong for boolean values. It just
worked for enable_hr by chance. Now it should work properly.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:24:22 -03:00
Victor Seiji Hariki
cb6d9ac7d8 now it should work?
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:16:26 -03:00
Victor Seiji Hariki
b1a42c4cd7 seems I failed to save the file before closing merge
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:13:46 -03:00
Victor Seiji Hariki
5cb3617907 Merge remote-tracking branch 'zero/main' into testing
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:11:06 -03:00
Victor Seiji Hariki
9e0541bf0c view generation resolution too
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:10:13 -03:00
Victor Seiji Hariki
8a7e0a08f8 enable sync cursor size by default
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-13 11:09:57 -03:00
Victor Seiji Hariki
35afbfa766
Merge pull request #98 from zero01101/i90
i think this should fix issue 90 - optional resolution/reticle sync
2022-12-13 11:08:38 -03:00
tim h
41e57d28cf whoops 2022-12-12 21:05:04 -06:00
tim h
9b8b432f52 Merge branch 'main' into i90 2022-12-12 19:53:30 -06:00
tim h
55e361b6e3 i am not smart enough for this lol 2022-12-12 19:52:14 -06:00
Victor Seiji Hariki
74041b78a8
Merge pull request #97 from zero01101/testing
Pull Request for 2022-12-12
2022-12-12 22:35:13 -03:00
tim h
4241cbd4f9 why does the callback work fine on dream but breaks img2img 2022-12-12 19:30:28 -06:00
tim h
8e5d48f97b think it makes more sense here 2022-12-12 18:25:02 -06:00