Commit graph

682 commits

Author SHA1 Message Date
tim h
8667f94f12 change default prompt again, less quietly
gotta get those AWARD WINNER people outta there
2022-11-25 21:06:15 -06:00
tim h
4fb754ec9d
Merge pull request #52 from seijihariki/quick-patches
Quick patches 2
2022-11-25 18:16:47 -06:00
Victor Seiji Hariki
b5f9113d74
Merge branch 'zero01101:main' into quick-patches 2022-11-25 20:30:54 -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
5db4ccace2
Merge pull request #51 from seijihariki/quick-patches
some fixes and comments
2022-11-25 16:56:46 -06:00
Victor Seiji Hariki
059c0759fe
fix border mask rendering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-25 19:39:38 -03:00
Victor Seiji Hariki
bc19de9c4e
fix border mask
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2022-11-25 19:29:50 -03:00
Victor Seiji Hariki
72ebe5ba21
some fixes and comments
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
(cherry picked from commit 6299b561f196a7c78c66a8d21b2e1b27cecdee77)
2022-11-25 19:23:22 -03:00
tim h
e19f7af581
Update README.md 2022-11-25 10:58:19 -06:00
tim h
905a815cf2 Merge pull request #50 from seijihariki/quick-patches
Dream and Selection - Resource Manager Interaction and Selected Area saving

Former-commit-id: d361b4731686b52d5dc48a4717d637569a03180a
2022-11-25 10:28:28 -06:00
Victor Seiji Hariki
7bb2238056 clear canvas now has history
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 6ec970f947ee6a7472a6e376c236885d26f5b276
2022-11-25 13:26:44 -03:00
Victor Seiji Hariki
df5dc32eee Some quick lunch patches
Allows for selections and dreams to be sent to the resource manager,
allows resource deselection when clicking on the currently selected
item, put some extra comments and allow saving of a selected canvas area

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

Former-commit-id: 963312115d4827de1c8d4fac88a97dd64db7fa15
2022-11-25 13:16:22 -03:00
tim h
5a633e1aeb update readme
Former-commit-id: d9bedc7812d8797bbccdb3da6fad77c027687453
2022-11-25 09:44:09 -06:00
tim h
62cbf4b002 version bump for readme
Former-commit-id: e3b76a8be131ef5b02749f300f44fc78d7f060ab
2022-11-25 09:43:03 -06:00
tim h
3336c66a00 Merge branch 'main' of github.com:zero01101/openOutpaint into main
Former-commit-id: d7280b3397ea488247020c2924d20a728c76f95d
2022-11-25 09:18:51 -06:00
tim h
7155e3d5ef Merge pull request #49 from seijihariki/image-editing-tools
Image editing tools

Former-commit-id: bbdfef937d28f607b601013c75de0f9049739488
2022-11-25 09:17:46 -06:00
tim h
317c921852 Merge branch 'pr/49' into main
Former-commit-id: d4295067d1ed96215cbe3d5bcc274e7b73ab388e
2022-11-25 09:14:26 -06:00
Victor Seiji Hariki
db73982df2 some general fixes
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4434e218c4f67ac3c63c3a5b645013588a7ce770
2022-11-25 01:46:49 -03: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
8419f52f43 fix cancel action for select tool
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 0bfa9a2cae4aa080571ae8eca576c94c023b6d44
2022-11-25 00:59:10 -03:00
Victor Seiji Hariki
97f3a54644 Make pasting lock the toolbar
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 4b236153eb7b61af5d7ec8703069709aeea684a3
2022-11-25 00:55:16 -03:00
Victor Seiji Hariki
ded2e448bb focus on dream again
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: a07d53d6f1a2fa469da81054084ad67a174b21b6
2022-11-25 00:41:30 -03:00
Victor Seiji Hariki
36eceb3245 Merge branch 'main' into image-editing-tools
Former-commit-id: 670e430366937b5dc9e43a5d4e29afdd62139a1c
2022-11-25 00:40:56 -03: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
tim h
869bb6d126 Merge pull request #48 from seijihariki/img2img-fix
Img2img fix

Former-commit-id: 41e77e074e5ff68b933dff66b85a119bdde71014
2022-11-24 09:35:51 -06: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
Victor Seiji Hariki
2fdcdc7f0c remove usebordermask box
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: f194ab10ed3caa63d3e8468de035b70d414244bf
2022-11-24 12:17:29 -03:00
Victor Seiji Hariki
65961ad0a9 Merge branch 'main' into img2img-fix
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: 61d27f561539a40e64da7218f022f846ed9727d4
2022-11-24 12:08:35 -03:00
Victor Seiji Hariki
76938b535f img2img fix and better custom slider rendering
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: eb961230a2eeb352dd6097c7010ed0775f1dd3ce
2022-11-24 11:54:30 -03:00
tim h
9417ba7902 fix issue 47
Former-commit-id: ac5e43439e0a1b56243c522c750ecd7b8e0323fc
2022-11-24 08:46:02 -06:00
tim h
231c7f56d3 correct attribution error, my sincerest apologies :(
Former-commit-id: 6b030025bb6757d3af813cb784829fc68e626773
2022-11-24 01:13:44 -06: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
9a21d4f786 tweak to overmask """formula""", updates it for fancy new slider
Former-commit-id: 9ecd7c40e154270e66eb36677f64656cc616cdb0
2022-11-24 00:02:04 -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
tim h
9557c78fd2 Update README.md
Former-commit-id: 94b8343c856732f292151e5697acb03618ab6c40
2022-11-23 23:15:28 -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
45b267737c Update README.md
typo -_-

Former-commit-id: a82e0022a72c29abd4afc604ccb4b03e4278145e
2022-11-23 19:17:07 -06:00
tim h
c192ff98bb update readme
Former-commit-id: aa65ecd13d0ae4de3fbd8ddba0dd98a73eabd92b
2022-11-23 18:48:03 -06: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
tim h
42adf68610 Merge pull request #37 from seijihariki/img2img
Add tool for img2img

Former-commit-id: 4e6f088cd99e9274b7e0ca9413ba7e8c3503540e
2022-11-23 17:36:02 -06:00
Victor Seiji Hariki
79c2fd9c02 add lucide licensing agreement for the icons
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>

Former-commit-id: c58d306a8e5dd54cfae4c83f10430a631cdb4e1f
2022-11-23 19:32:37 -03:00
Victor Seiji Hariki
d7c42510ad well, that was painful
Seems history was actually working until I decided to put a pretty
"removing ###" message

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

Former-commit-id: a40f1d6e0d53e7186aa2d85832906280331f4aad
2022-11-23 19:06:59 -03: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
tim h
8e3ef9162e Merge pull request #39 from Kalekki/model_switching
Model switching, samplers from api

Former-commit-id: 122e518141f05bc6f139f23bf259fe40ca815cb7
2022-11-23 14:45:15 -06:00
Kalekki
f8f322067d Seed under models and samplers
Former-commit-id: 741a935fe8058fd5a5042df76d6b1f53a5cdd0e2
2022-11-23 21:46:06 +02:00
Kalekki
53635fc26f prettier
Former-commit-id: 25e8a310d47a5e34e269b31e75699e99b1c8888b
2022-11-23 21:34:42 +02:00
Kalekki
43c6344507 Model switching, samplers from api
Former-commit-id: 78da6ff935a79ecbb00114c8e467d8996d2752af
2022-11-23 21:23:20 +02:00