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
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
2ee01e71c9
fix some tools
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-17 00:55:53 -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
6d9155261e
RFC- rename keepMask to keepUnmask
...
simple search/replace for keepMask[ed]
2022-12-16 19:59:30 -06: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
b30f7f23a9
brings back interrogate reticle
2022-12-15 21:15:50 -06: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
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
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
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
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
tim h
228bd3d9a0
updates reticle size upon manually entered resolution
2022-12-12 17:09:27 -06:00
tim h
82e943b12d
option to sync resolution and reticle size (issue 90)
2022-12-12 16:25:49 -06:00
Victor Seiji Hariki
f63bbafe0f
add cancel button to future generations
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-12 18:49:53 -03:00
Victor Seiji Hariki
0a73687556
add prompt history as suggested in #87
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-12 18:25:32 -03:00
Victor Seiji Hariki
b71731b7ca
stamp now uses indexed DB for resources
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-12 10:03:05 -03:00
Victor Seiji Hariki
f279c8457b
dream queueing now supported
...
- Image navigation shortcuts work for all simultaneously (probably not
optimal)
This is for #89 . Some things should be ironed out, such as adding a
cancel button for future jobs and an order indicator maybe?
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-12 00:55:54 -03:00
Victor Seiji Hariki
460130396f
add button to dream to save current image (no sc)
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-11 21:01:55 -03:00
Victor Seiji Hariki
d65f3185c4
resource now use dblclick to rename; download
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-11 20:54:38 -03:00
Victor Seiji Hariki
57e2e6a9f3
dream image generation failed typo
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-10 23:13:14 -03:00
Victor Seiji Hariki
ba7c7608c0
index 0 not counted as an image anymore
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-09 23:18:24 -03:00
Victor Seiji Hariki
0e6a5c8d4a
adds index 0 to image gen
...
image gen has now index 0 to show what was before the image generation.
this is especially useful for img2img
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-09 22:07:18 -03:00
Victor Seiji Hariki
f446cf3784
fixed color brush cursor rendering
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 23:33:51 -03:00
Victor Seiji Hariki
c2e0cf4615
expand input field relative to drawable canvas
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 12:17:59 -03:00
Victor Seiji Hariki
458df53fac
fix pixel alingment on select for scaling
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 23:17:46 -03:00
Victor Seiji Hariki
3701eb110b
fix some more issues in selectjs pixel alignment
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 23:09:41 -03:00
Victor Seiji Hariki
aee812b70a
fix mouse for chrome (for now)
...
Seems scroll delta is inconsistent between browsers, so for my chromium
installation it was simply not working at all due to snapping. Made it
so every event is a cursor size change for now. probably bad for smooth
mouse wheels, but for a complete fix we would have to keep track of
pixels scrolled and probably add a mouse wheel sensitivity setting
somewhere.
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 17:32:43 -03:00
Victor Seiji Hariki
3373d2964e
fix selection box when not grid-aligned
...
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 16:26:23 -03:00
Victor Seiji Hariki
3c0eed68ce
fix slider strange behavior when mouse left
...
also added / to all res references
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-07 13:32:33 -03:00