Commit graph

172 commits

Author SHA1 Message Date
Victor Seiji Hariki
ca3533c9e4
some more fixes and things
fixed scrolling on basically everything but the canvas, prompt fields
now automatically expand when focused, prompt, host and negprompt now
are stored on localstorage. on hover prompt and negprompt fields now
show full text in tooltips

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-25 20:27:44 -03:00
tim h
62cbf4b002 version bump for readme
Former-commit-id: e3b76a8be131ef5b02749f300f44fc78d7f060ab
2022-11-25 09:43:03 -06:00
tim h
317c921852 Merge branch 'pr/49' into main
Former-commit-id: d4295067d1ed96215cbe3d5bcc274e7b73ab388e
2022-11-25 09:14:26 -06:00
tim h
e92976d158 hacky re-addition of painted mask auto disappearance after image generation
Former-commit-id: f34d1d077f0be69fce3f3b339eac596863d5846a
2022-11-24 22:44:38 -06:00
Victor Seiji Hariki
7f1905061b remove old image upload
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 281286dfc3b040fb196dd0141278201c9d7036eb
2022-11-25 00:39:22 -03:00
Victor Seiji Hariki
70d1fda23d a big commit with the selection and stamping tools
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: b3f849f3fdb334916f1a4ee6c81ac6bdf42a8f52
2022-11-25 00:34:34 -03:00
Victor Seiji Hariki
42144ea577 allow shortcut deletion via callback
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0a46ffda9945ad95665634c21c9732e7d9d1497e
2022-11-24 12:30:13 -03:00
tim h
5550c7622e hey i thought i told you to get outta here
Former-commit-id: 2b4bbbaa12a08e88c0949fd1349b38a6f0d4af42
2022-11-24 00:38:57 -06:00
tim h
da95542c34 Merge pull request #43 from seijihariki/input-rework-2
non-broken version on input-rework

Former-commit-id: 44ae64a42f7bb11520e4e29180be4a67f2814b50
2022-11-23 23:54:07 -06:00
tim h
eb46b36afb moves overmask to txt2img/outpaint context menu
Former-commit-id: 0ee5c7946da0e037be950b3c3354e2cba87bdfca
2022-11-23 23:43:51 -06:00
Victor Seiji Hariki
951fbacd6c non-broken version on input-rework
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 3c337c8cf8d4a65cb2fe0845f6eaf9315eb21ae7
2022-11-24 01:53:14 -03:00
tim h
f9427fc681 version bump, prettierr.json update (sorry), ran it against index.html
Former-commit-id: 9916ee891738a56cb827e67f9fbe0cffab27fc60
2022-11-23 18:45:29 -06:00
tim h
617d8ee25c the inglorious return of overmasking
Former-commit-id: 1a81a3f783d0bf78f530b9a72db090f9ed65d8ae
2022-11-23 17:40:10 -06:00
Victor Seiji Hariki
89b1323cd9 Merge branch 'main' into img2img
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4a07944ebfb71076a6dfb9a83e45a07a30874abd
2022-11-23 19:03:15 -03:00
Kalekki
f8f322067d Seed under models and samplers
Former-commit-id: 741a935fe8058fd5a5042df76d6b1f53a5cdd0e2
2022-11-23 21:46:06 +02:00
Kalekki
43c6344507 Model switching, samplers from api
Former-commit-id: 78da6ff935a79ecbb00114c8e467d8996d2752af
2022-11-23 21:23:20 +02:00
Victor Seiji Hariki
f5b0369476 finally fix shortcuts triggering on prompt fields
Basically checks if focus is an input field, and transfer focus to
window as soon as mouse hovers over the canvas

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 5ce4877c69708a1ea981d9dac4b9102048152e58
2022-11-23 08:24:18 -03:00
Victor Seiji Hariki
678ab518ea Merge branch 'main' into toolbar
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 53bab7e5237fe54b7a3d421bef01c011499e0e74
2022-11-22 22:38:30 -03:00
tim h
9a796ecd67 reenables LDSR, ran prettier, version bump ( ͡° ͜ʖ ͡°)
Former-commit-id: 2c75f84ad9a88f7454a5469bba8c4c90ca09186a
2022-11-22 17:40:05 -06:00
Victor Seiji Hariki
250c833895 Added tool menu and migrated image generation ot new input
Also updates a lot of other things (brush size now independent from
scale factor, split some files, and a lot other things; removed erase
safeguard as now erase is supported by undo/redo; tried adding github
prettier autoformatting to pull requests;

may have some other things as well

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0ba21f23c69f9dca2c3189a838b945900b01f81d
2022-11-22 19:28:27 -03:00
Kalekki
837de404ee Upscaling
Former-commit-id: b8f0e47edd2f2f5ab2f8cae911c8739bd9d41b7f
2022-11-22 23:18:40 +02:00
tim h
3bd53cc8db bump version deservedly
Former-commit-id: 56db868d8b8d7a76a32510df6223022df836cad0
2022-11-22 01:05:20 -06:00
Victor Seiji Hariki
87ea1be32d add history list view and interaction
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 7064b38c9663c0219424b4864243f16d4aa68a24
2022-11-22 02:16:17 -03:00
tim h
fcc61c5710 Merge pull request #30 from seijihariki/keyboard_ìnput
Keyboard Input Support

Former-commit-id: 7559fa453face2012b0f0cd8d2b34fcf9aa31c1c
2022-11-21 20:30:19 -06:00
Victor Seiji Hariki
fb0c2f2443 add shortcuts to undo/redo
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-21 23:19:56 -03:00
tim h
3c3eb6b329 version bump for readme
Former-commit-id: b7571be02ef7f587e539b4be069ebe90d75e7e8f
2022-11-21 18:58:45 -06:00
tim h
2c120320ff Merge branch 'main' into checkerboard 2022-11-21 17:57:41 -06:00
Kalekki
2dedda5d29 clean up leftover chaotic borders 2022-11-21 14:15:11 +02:00
Victor Seiji Hariki
c1bc54a4eb add new history window and fix multi-window support
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-21 08:27:21 -03:00
Victor Seiji Hariki
096d8770f2 Merge branch 'main' into edit_utils
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-20 23:59:46 -03:00
Victor Seiji Hariki
c27da0f51a add target info to events and fix mask impl
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-20 23:42:07 -03:00
Victor Seiji Hariki
ea64c138c3 Add generic mouse input handler
input.js is now responsible for processing mouse input and translating
it to relevant events. This allows for less bloat on the main logic in
index.js and easy implementation of new functionality

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-20 23:03:07 -03:00
tim h
e88dc0acf9 bump version, remove pointless checkbox 2022-11-20 17:31:51 -03:00
Kalekki
eab96a448d fix 2022-11-20 17:31:51 -03:00
Kalekki
ff9d930956 Mask erasing 2022-11-20 17:31:51 -03:00
Kalekki
d563e8ba3a make draggable class for possible future re-use 2022-11-20 17:31:51 -03:00
tim h
aefd45f436 removed redundant overmask toggle
overmaskpx = 0 effectively disables it anyway
sets overmaskpx to a localstorage option
removes moot "plain" mask monitor
2022-11-20 17:31:51 -03:00
tim h
dc4e4a5752 version bump and readfish 2022-11-20 17:31:51 -03:00
tim h
3062766c13 right-click erase is now an option 2022-11-20 17:31:51 -03:00
tim h
772cc7552d completely rework and fix(?) overmasking 2022-11-20 14:08:48 -06:00
tim h
5304432062 a very deserving version bump, fishme updates 2022-11-20 12:22:51 -06:00
tim h
04e208ce04 Merge pull request #21 from seijihariki/edit_utils
Simple Edit History
2022-11-20 12:17:19 -06:00
Victor Seiji Hariki
fe508f8b21 simple command pattern and edit history
Implements command pattern for providing edit history capabilities to
editing. For now, no implementation is done to support keyboard
shortcuts, so the buttons are the only way to navigate. Also, only image
insertion is supported for now. Waiting for the masking updates to
implement masking history.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-20 14:59:11 -03:00
tim h
0906609da2 bump version, remove pointless checkbox 2022-11-20 11:56:37 -06:00
tim h
d276876bf0 Merge pull request #17 from Kalekki/erase_mask
Mask erasing
2022-11-20 11:48:14 -06:00
tim h
f43d072f60 Merge pull request #18 from Kalekki/main
make draggable class for possible future re-use
2022-11-20 11:41:46 -06:00
tim h
172e7dae0a removed redundant overmask toggle
overmaskpx = 0 effectively disables it anyway
sets overmaskpx to a localstorage option
removes moot "plain" mask monitor
2022-11-20 11:38:24 -06:00
Kalekki
ebf6900bfc make draggable class for possible future re-use 2022-11-20 18:24:17 +02:00
Kalekki
8c9a5f527e fix 2022-11-20 15:28:48 +02:00
Kalekki
ff68fcdeda Mask erasing 2022-11-20 14:26:33 +02:00
tim h
aa2c1956ee Merge branch 'pr/14' into main 2022-11-19 22:40:57 -06:00
tim h
884a2b1537 version bump and readfish 2022-11-19 22:40:18 -06:00
Victor Seiji Hariki
06c53e6062 Streamline and add text input to range pickers
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-20 00:49:51 -03:00
tim h
f92a7ff98e right-click erase is now an option 2022-11-19 21:32:35 -06:00
tim h
55ab68dee2 mask blur max value increase to 256 2022-11-19 19:24:22 -06:00
tim h
82c0cfe12c 🐠 2022-11-19 18:39:03 -06:00
tim h
f3c49a2714 set cfg scale step to .5 instead of .1, remove ludicrous cfg scale detents 2022-11-19 18:27:31 -06:00
tim h
ef7bc7e5ac update readme, move seed to SD settings in control panel 2022-11-19 16:23:44 -06:00
tim h
0abac48d3f version bump because Kalekki is a rockstar 2022-11-19 16:21:00 -06:00
tim h
7f6c42aa51 Merge pull request #11 from Kalekki/UI_rework
New draggable settings panel
2022-11-19 16:15:52 -06:00
tim h
9be9dd3479 fixes issue 10
adds new bug where dropped arbitrary images now do that annoying odd-number scale garbage

fixes that too
2022-11-19 16:11:48 -06:00
Kalekki
2a911e900e New draggable settings panel 2022-11-19 23:48:12 +02:00
tim h
dc472d49c3 right-click erase, ensure webUI is running on startup 2022-11-19 11:17:47 -06:00
tim h
1771954b90 0.0.5 - arbitrary image superimposition, etc 2022-11-18 18:04:27 -06:00
tim h
d5cca9276d back to updating that readme 2022-11-17 21:24:23 -06:00
tim h
3d45e549c0 remedial overmasking FINALLY 2022-11-17 21:21:48 -06:00
tim h
0469f81880 pull requests!!! <3 thanks everyone!
readme updates, downloaded image file name changes
2022-11-16 16:52:11 -06:00
tim h
fd6f3a0e73 i'll show that negative prompt who's boss 2022-11-15 23:49:31 -06:00
tim h
266d87938c teeny ui change, egotistical readme update 2022-11-15 23:19:09 -06:00
zero01101
695cd9c673 minor refactoring, typo fix 2022-11-15 21:15:52 -06:00
zero01101
1706ee391b --cruft 2022-11-15 20:48:47 -06:00
tim h
87e4ff4c2f initial commit 2022-11-15 17:31:11 -06:00