Commit graph

178 commits

Author SHA1 Message Date
seijihariki
1fbde7ed69 Fixed resource hashes 2022-12-30 10:28:16 +00:00
Victor Seiji Hariki
6d31640ae5 now only adds html files
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-30 07:27:26 -03:00
Victor Seiji Hariki
a95906dc8a sync should now work a bit better; #116
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-29 02:39:32 -03:00
Victor Seiji Hariki
a628c45717 Add restore faces option
Add restore faces option; Resolves #129

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-29 00:37:18 -03:00
Github Actions
5972e1d761 Fixed resource hashes
test7

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

test8

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

Fixed resource hashes
2022-12-28 23:32:02 -03:00
Victor Seiji Hariki
23a1b234e3 test for action when wrong hash
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-28 23:32:02 -03:00
seijihariki
428baa4b83 Prettified Code! 2022-12-28 23:32:02 -03:00
Victor Seiji Hariki
2f58f79b7d add cache busting hash update and update html file
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-28 23:32:02 -03:00
Victor Seiji Hariki
44e760f37d fix config setup order
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-27 18:08:06 -03:00
Victor Seiji Hariki
61da4b9d58 fix some errors/better dragging + evaluate
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-27 18:05:09 -03:00
tim h
8fbc42744e
Merge pull request #123 from zero01101/testing
An easy fix for mouse wheel scrolling
2022-12-26 16:49:56 -06:00
Victor Seiji Hariki
3d298473b7 An easy fix for mouse wheel scrolling
Relates to #116

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-25 23:29:03 -03:00
Victor Seiji Hariki
14aed51a89 debugging button to help get information
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-24 11:56:30 -03:00
tim h
cf6a1c0b38 version bump, update issue template a little
GPU could be handy for gtx16xx series and black screen issues
2022-12-23 17:45:17 -06:00
tim h
29321a9467 version bump, update readme
yay extension!!
2022-12-22 18:17:50 -06:00
Victor Seiji Hariki
518e60f44a fix select interaction with layers and wrong sampler
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-21 14:30:35 -03:00
Victor Seiji Hariki
3afb35e5ee Add some simple messaging for parent interaction
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-19 09:30:39 -03:00
tim h
4bcacf6353 version bump, readme update 2022-12-18 17:24:43 -06:00
tim h
c0ccc9c4f0 version bump, update readme 2022-12-15 21:55:54 -06: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
tim h
9b8b432f52 Merge branch 'main' into i90 2022-12-12 19:53:30 -06:00
tim h
8e5d48f97b think it makes more sense here 2022-12-12 18:25:02 -06:00
Victor Seiji Hariki
1d089f2213 prompt history closed by default
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-12 18:27:47 -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
tim h
e3be9010f2 version bump 2022-12-11 18:26:02 -06:00
Victor Seiji Hariki
bf025d2ab8 multiselect now also custom autocomplete
This is mainly to free space for the prompt history on #87

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-11 16:01:22 -03:00
tim h
34a34cffce version bump, readme crash diet 2022-12-10 13:45:06 -06:00
Victor Seiji Hariki
ec59cf5538 Very crude settings interface
Very crude settings interface with only canvas size for now. Canvas size
only affects canvas on next page load. Dynamic resizing in the horizon,
but will take a while.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 18:38:55 -03:00
Victor Seiji Hariki
57a2debe5d Merge branch 'main' into testing
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 18:29:34 -03:00
Victor Seiji Hariki
2cda410b41 add custom select element with autocomplete
Same as a select, but you can kind of search for the item you want. Good
for when you have a lot of models.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-08 18:23:17 -03:00
tim h
09d3cb11c2 move upscalerX 2022-12-06 21:30:00 -06:00
tim h
8818a355f6 upscale amount
probably should've put this in testing first but it's pretty bulletproof so far
2022-12-06 21:12:10 -06:00
tim h
ed99ec9f73 version bump, readme update, tiny tiny fixes so small they could be considered typos 2022-12-06 18:05:43 -06:00
Victor Seiji Hariki
2c82c0468f some visual changes to image generation
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-06 18:28:34 -03:00
Victor Seiji Hariki
62ddc38f01 layer history and finally layer delete/merge
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-05 23:22:19 -03:00
tim h
b796ad0848 version bump, update readme 2022-12-05 00:26:52 -03:00
tim h
4a76eecd92 surprise interrogate tool 2022-12-05 00:26:52 -03:00
Victor Seiji Hariki
14df643326 layers?
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-04 16:22:35 -03:00
Victor Seiji Hariki
aec096b856 layers... now exist?
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-04 08:00:39 -03:00
Victor Seiji Hariki
0c6ffffdc3
Merge pull request #65 from zero01101/bleeding-edge
fix chrome giant icon/add pipette tool (shift)
2022-12-03 20:01:59 -03:00
Victor Seiji Hariki
4549e21293 fix chrome giant icon/add pipette tool (shift)
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 20:00:10 -03:00
tim h
9cc445522a version bump, readme update 2022-12-03 12:08:34 -06:00
Victor Seiji Hariki
59e783d159 no more scale factor, support for dream cursor size
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 10:05:14 -03:00
Victor Seiji Hariki
51c90f0466
split settingsbar.js file
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-03 01:13:13 -03:00
Victor Seiji Hariki
e4340835ba
tiny
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-02 15:42:09 -03:00
Victor Seiji Hariki
ac70691cff
little things
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-02 14:31:49 -03:00
tim h
2e668b4a16 more tiny QOL things
upscaler select no longer escapes floating control panel boundary, simple "reset to defaults" button to clear localstorage if desired, maybe get prettier action to stop complaining about where i put the ref :|
2022-12-01 20:31:49 -06:00
Victor Seiji Hariki
c63003e1cf
a quick try at a tool for painting
From yesterday night, just finished some final touches; should be
enough for some cool things.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-12-01 18:22:12 -03:00
Victor Seiji Hariki
e84ea7a8f4 Merge branch 'main' into bleeding-edge
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-29 23:54:09 -03:00
zero01101
d33edaa8cf Prettified Code! 2022-11-30 02:08:43 +00:00
Victor Seiji Hariki
44cf9c0e70 Layers.
Been working on this when I could the last few days.
Not quite infinity. Middle mouse button drag, ctrl mouse wheel zoom.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-29 17:55:25 -03:00
Victor Seiji Hariki
4e27770284 some layer upgrades
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 20:03:58 -03:00
Victor Seiji Hariki
c1b17c1b0e Some start for layering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 20:03:58 -03:00
Victor Seiji Hariki
54c381de8e added jsdoc to commands
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 12:17:07 -03:00
Victor Seiji Hariki
42a1266da5 Add custom errors
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-28 10:08:47 -03:00
Victor Seiji Hariki
73c441534b improved network handling
Detects if it is a CORS problem, checks for invalid saved host
configuration, webui connection status indicator

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-26 13:10:37 -03:00
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