Commit graph

521 commits

Author SHA1 Message Date
tim h
c0e936f216 Merge branch 'main' into manual-scripts
# Conflicts:
#	index.html
2023-02-25 09:06:50 -06:00
tim h
ccd6bd8430
Merge pull request #196 from ribawaja/main
Add ability to mark images
2023-02-25 08:50:03 -06:00
tim h
0b4618a789 Merge remote-tracking branch 'origin/seijihariki/issue188' into manual-scripts 2023-02-25 07:33:31 -06:00
tim h
eb8946266f update loopback script to include interrogator "telephone" option, "remove" user script saving because i don't think JS can even silently write to one of its own files.... prove me wrong? please? 2023-02-25 07:30:52 -06:00
tim h
0e54435f4c WIP really remedial attempts at getting user-savable scripts happening
computer crashing sigh
2023-02-19 09:49:48 -06:00
tim h
769182508f Merge branch 'main' into manual-scripts
# Conflicts:
#	index.html
2023-02-19 09:41:46 -06:00
Victor Seiji Hariki
fe0095421a fixes #195
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-02-19 10:16:15 -03:00
tim h
610f82174f rearrange tool params to fit with array order 2023-02-18 21:50:48 -06:00
tim h
86c2fbca05 tiny changes 2023-02-18 21:45:04 -06:00
tim h
2598cb9c41 fixes deleted layer ghosts 2023-02-18 12:56:53 -06:00
tim h
0e63efc847 ghostbustin' 2023-02-18 12:56:06 -06:00
tim h
fad101184c bugfix 2023-02-18 12:02:21 -06:00
tim h
34bdfbf1b7 adds controls for background removal parameters
also exposes a bug with how layer deletion works, will file bug report
2023-02-18 12:00:10 -06:00
tim h
b17c8baa0e bugfix, whoops
my computer crashed 3 times because of thread APIC ID 4 and my forgetting that i set a NEGATIVE bias so i was choking it instead of feeding it -_-
2023-02-18 11:50:54 -06:00
tim h
a71b52464d merges all the recent awesome, adds stamp vertical flip too because I'M HELPING 2023-02-18 10:43:49 -06:00
Victor Seiji Hariki
77a6137855 adds stamp mirror option (button and '=' shortcut)
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-02-15 00:37:06 -03:00
Victor Seiji Hariki
3caacdb803 brush opacity
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-02-15 00:16:28 -03:00
Victor Seiji Hariki
c19b9f48b4 fixes https://github.com/zero01101/openOutpaint-webUI-extension/issues/34
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-02-15 00:03:42 -03:00
Victor Seiji Hariki
995478c662 custom alerts and notifications
Adds custom notifications and dialog boxes. prompt() calls still not
updated

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-02-14 23:45:24 -03:00
tim h
ba56052ec1 Merge branch 'testing' into manual-scripts because i wanted the iP2P in scripts branch and probably did this backwards but oh well
# Conflicts:
#	index.html
#	js/index.js
2023-02-09 19:21:40 -06:00
ribawaja
bd94f51526 Add ability to mark images 2023-02-06 23:26:55 -05:00
tim h
6148bf8e10 ...is this even working? 2023-02-04 15:25:53 -06:00
tim h
e6c54d4b56 initial changes for instruct-pix2pix img2img
i'd still like the new slider to disappear if not using an iP2P model ergo not in main yet but also not "new" enough of a feature to deserve its own branch, literally just a new field to pass along with POSTs and an associated slider input
2023-02-04 14:28:01 -06:00
tim h
c41ec4be46 puts default scripts into separate file, begins possibility of user-defined script file 2023-02-04 10:34:26 -06:00
tim h
c8ef073531 not even fixes 2023-01-31 18:14:52 -06:00
tim h
ec1699e0a3 Merge branch 'main' into manual-scripts 2023-01-31 18:06:16 -06:00
tim h
a0e7608d06 quick hacky fix for save vis/vis to res 2023-01-31 18:02:14 -06:00
tim h
02bf04c257 kinda janky identical pixel removal?
surprise

"manual scripts" has kinda become inadequate for all this branch is doing now lol
2023-01-29 16:39:00 -06:00
tim h
0400b9b284 Merge branch 'main' into manual-scripts
# Conflicts:
#	index.html
2023-01-29 00:55:54 -06:00
Victor Seiji Hariki
26a370eee8 add styles to logs
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-29 02:59:30 -03:00
Victor Seiji Hariki
ef09e357d4 remove console log
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-29 02:54:41 -03:00
Victor Seiji Hariki
794ddcc275 fix #185 janky layer things
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-29 02:52:31 -03:00
tim h
759b396f6d Merge branch 'main' into manual-scripts
# Conflicts:
#	index.html
2023-01-28 23:34:06 -06:00
Victor Seiji Hariki
833e817dc0 remove useless workspaces.js
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-29 02:15:39 -03:00
tim h
5cb27b890d Merge branch 'main' into manual-scripts 2023-01-28 14:37:24 -06:00
tim h
abde86d6b6 quick bandaid to let new installs work at least
should probably be fixed better
2023-01-28 14:34:04 -06:00
tim h
8eef3392ed Merge branch 'main' into manual-scripts
# Conflicts:
#	index.html
#	js/ui/tool/dream.js
2023-01-28 09:47:41 -06:00
tim h
545c02b0db autolayers for stamps too
this has confirmed a layers bug that i'm too stupid to ... debug but i'll sure try to make an issue for it
2023-01-27 22:58:15 -06:00
tim h
03b40a3f47 a few more commandLog values for dreams 2023-01-27 22:15:51 -06:00
tim h
464da36e2a unrelated to scripts but kinda neato autolayers option 2023-01-27 20:00:48 -06:00
tim h
fc0d6d136d silly script default adjustments because why not 2023-01-27 17:01:12 -06:00
Victor Seiji Hariki
2868f63941 fix save
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-27 01:46:34 -03:00
Victor Seiji Hariki
64085b09ac Merge branch 'main' into workspaces
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-27 01:42:20 -03:00
Victor Seiji Hariki
c4ef6ccce4 Workspaces now fully functional (using indexedDB)
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-27 01:40:27 -03:00
Victor Seiji Hariki
827349bf05 slimmer host text field
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-26 21:35:33 -03:00
tim h
69b3039976 xy -> xyz plot script 2023-01-25 19:00:33 -06:00
tim h
958dca6b1a Merge branch 'main' into manual-scripts
# Conflicts:
#	index.html
2023-01-24 22:12:50 -06:00
Victor Seiji Hariki
d42837d597 Merge branch 'main' into workspaces
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-24 23:54:30 -03:00
Victor Seiji Hariki
f064719515 add some logging for #133
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-24 23:48:09 -03:00
Victor Seiji Hariki
af5b9b9680 Add history logging
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-24 23:37:38 -03:00
tim h
bd5581fdbf working upscaler API endpoint! 2023-01-24 16:55:45 -06:00
tim h
2d8e3d36b1 sure just change where everything goes that's cool and fun 2023-01-23 23:47:51 -06:00
tim h
06f4e82347 Merge branch 'main' into manual-scripts
# Conflicts:
#	index.html
2023-01-23 21:36:50 -06:00
Victor Seiji Hariki
aabc35dc87 removed useless code
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-23 23:13:00 -03:00
tim h
85776d8637 "emergency" fix to just get upscalers working again
temporary as hell hardcoded list of "should be available to everyone from a fresh install" upscalers, subject to change upon bug reports
2023-01-23 17:58:16 -06:00
Victor Seiji Hariki
cb36c2b599 Maybe better than using new Image?
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-23 19:24:50 -03:00
tim h
94e6a7b90c list defaults in tooltips for some reason 2023-01-22 17:50:49 -06:00
tim h
72f1e813b1 handy dandy tooltips for parameters 2023-01-22 17:25:06 -06:00
tim h
5fd90818eb oops, fixes bad param for loopback 2023-01-22 13:34:30 -06:00
tim h
da317229c0 some silly default values for a few built-in scripts 2023-01-22 13:29:24 -06:00
Victor Seiji Hariki
fc8e6fb557 Quick fix for zoom to cursor and brush erase blur
Quick fix to some issues pointed out by @raivshard at #177

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-22 09:18:47 -03:00
Victor Seiji Hariki
006aa608e8 we have working workspaces!!
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-22 02:48:56 -03:00
Victor Seiji Hariki
59188a64bd Merge branch 'main' into workspaces 2023-01-21 13:51:58 -03:00
Victor Seiji Hariki
13e29898a3 fix param type issue
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-21 13:06:21 -03:00
Victor Seiji Hariki
e92d8fa9b6 fixes #179
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-21 10:18:55 -03:00
tim h
6889affcad even better single image discard handling
sorry for pushing to main but these are tiny and don't deserve PRs lol
2023-01-20 19:33:42 -06:00
tim h
025d50a10e got it passing scripts and params but wtf is it bitching about with
x_opt = axis_options[x_type]
TypeError: list indices must be integers or slices, not str
2023-01-20 18:53:16 -06:00
Victor Seiji Hariki
b1c52a859e Allow quick access by layer id
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-20 21:09:20 -03:00
Victor Seiji Hariki
fa82cfd35d Merge branch 'main' into workspaces
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-20 21:04:40 -03:00
tim h
b52e3dc2ba better single-image removal handling 2023-01-20 16:19:01 -06:00
Victor Seiji Hariki
09b4ce3151 Merge branch 'testing' 2023-01-18 22:44:37 -03:00
Victor Seiji Hariki
643f79fb84 Optimize background drawing by leveraging CSS
We now use CSS to background tile the grid

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-18 20:55:04 -03:00
Victor Seiji Hariki
9064a006d5 add send image to parent interface
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-17 00:03:43 -03:00
Victor Seiji Hariki
874e39de4b add Ctrl+A and Ctrl+Shift+A shortcuts to select
selects all layer content and all visible (still only on current layer)

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-16 23:21:16 -03:00
Victor Seiji Hariki
4596d4cc8d fixes #174
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-16 20:54:46 -03:00
zero01101
47a028b495 Prettified Code! 2023-01-16 23:08:23 +00:00
Patrick Abi Salloum
875d911aaa
Add default when ctrl is clicked while expanding
When the user Clicks the buttons to expand canvas, they get a prompt where they pick the value to expand by.
This makes it so that control click just expands the canvas by the default value without showing the prompt.
2023-01-16 23:43:20 +02:00
tim h
bea3c0fbe4 honestly not sure if hacky
refresh button on right-hand side of model selector is definitely better
GUARANTEE css is distressingly hacky
2023-01-15 10:31:27 -06:00
Victor Seiji Hariki
ff687c5f64 Merge branch 'main' into workspaces
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-15 01:30:49 -03:00
Victor Seiji Hariki
f5210b29b6 did bad
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-14 20:17:49 -03:00
Victor Seiji Hariki
28988f84bb no recreating div
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-14 20:08:02 -03:00
tim h
1556f8d792 fixes issue 167? 2023-01-14 16:33:39 -06:00
Victor Seiji Hariki
a591b20914 fix infinite recursion on zoom
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-14 18:53:46 -03:00
Victor Seiji Hariki
c30314b2ac remove now irrelevant TODO
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-14 18:46:01 -03:00
tim h
4f73aba5c2 lmao you are really making me feel guilty about not merging your version ;) 2023-01-14 09:47:50 -06:00
Victor Seiji Hariki
51095160f1 fix scaled rotate handle
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 23:41:01 -03:00
Victor Seiji Hariki
b590b6d124 remove debugging by default
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 23:03:15 -03:00
Victor Seiji Hariki
e198cf9af4 allow stamp rotation(drag) and scaling(wheel)
also adds shift as a 'finetune' for wheel. works for dream and stamp. if
shift is pressed, wheel will scale slower (not snapping to 128 for
dream, or 0.1 for stamp)

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 23:00:34 -03:00
Victor Seiji Hariki
c4d6826369 Merge branch 'main' into rotate
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 21:51:25 -03:00
Victor Seiji Hariki
d764221d63 support select tool rotation
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 21:49:06 -03:00
Victor Seiji Hariki
5078265d14 fix select click
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 20:32:53 -03:00
Victor Seiji Hariki
e2afee3432 fix send to buttons
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 01:04:59 -03:00
Victor Seiji Hariki
9186d2a387 Merge branch 'testing' into rotate
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 01:03:07 -03:00
Victor Seiji Hariki
35a62ae9fe back to original transform tool state
But way more flexible implementation

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-12 01:00:06 -03:00
Victor Seiji Hariki
d7e20f87dc putting back selection 1
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-11 00:36:14 -03:00
tim h
16c2b36c1b ...also implements 164 quite similarly 2023-01-10 17:00:45 -06:00
Victor Seiji Hariki
487f3bed0c implements #164
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-10 14:30:09 -03:00
Victor Seiji Hariki
8d88ca6632 Merge branch 'transform-vp' into rotate
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-10 01:08:48 -03:00
Victor Seiji Hariki
d3cc6ea8da revert layers
Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-10 01:05:59 -03:00
Victor Seiji Hariki
857cb29c12 migrates vp to DOMMatrix implementation
breaks select, but it was broken anyway.

Signed-off-by: Victor Seiji Hariki <victorseijih@gmail.com>
2023-01-10 01:03:28 -03:00