Commit Graph

152 Commits (4e9a2a5ef0e8eb1fb93767853dcf75f4e78f0f13)

Author SHA1 Message Date
Matisse 46577bd3aa Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-03-05 00:25:08 -08:00
Matisse 177ec8aa1b Revert "Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui"
This reverts commit c14e03f0aa, reversing
changes made to 80546752b3.
2023-03-03 23:49:33 -08:00
Matisse 1e91c01f57 Revert "reimplementation of max_f and t"
This reverts commit b222ca54f9.
2023-03-03 23:48:42 -08:00
Matisse b222ca54f9 reimplementation of max_f and t 2023-03-03 23:47:45 -08:00
hithereai fde2ea6cf6 p 2023-03-04 04:15:47 +02:00
hithereai 37a5665363 clean 2023-03-04 04:07:38 +02:00
hithereai 415a544c94 Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables 2023-03-04 03:54:50 +02:00
hithereai 686ea3c71e Revert "Merge pull request #410 from MatissesProjects/automatic1111-webui"
This reverts commit 5ab8cb21f6, reversing
changes made to 17692459e9.
2023-03-04 03:50:57 +02:00
hithereai 9da7930ead Revert "Merge pull request #416 from MatissesProjects/automatic1111-webui"
This reverts commit 37d3e210f1, reversing
changes made to 5016fb3163.
2023-03-04 03:50:36 +02:00
hithereai 96b24b3b36 Merge remote-tracking branch 'upstream/automatic1111-webui' into combine_cli_tables 2023-03-04 03:06:59 +02:00
hithereai 1a86431098 initial 2023-03-04 03:00:39 +02:00
Matisse f4f8518906 so much for the pretty 1 liner haha 2023-03-03 16:16:47 -08:00
Matisse 007ceb6e4d fix for prompt now showing fully in cli 2023-03-03 15:42:29 -08:00
hithereai 1558d17062 initial combine cli tables to one 2023-03-04 01:39:53 +02:00
Matisse ed38f9a202 Merge remote-tracking branch 'upstream/automatic1111-webui' into automatic1111-webui 2023-03-02 23:54:36 -08:00
hithereai e8cfb5039f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/408 2023-03-02 01:39:56 +02:00
Matisse 19a92fa6e2 adding back midas changes 2023-03-01 14:55:37 -08:00
Matisse 23c0863ddf attempt 2
added s & max_f. Variable schedule planner, and prompt printout uses numbers instead of variables t/60 = .6 (at t=6)
2023-03-01 14:49:05 -08:00
rewbs 0384fa29f6 Merge branch 'automatic1111-webui' into parseq-optional-prompts 2023-03-02 06:38:48 +11:00
rewbs ebcb75a0a7 Fix 'UnboundLocalError: local variable 'parseqName' referenced before assignment'. Allow Parseq to delegate prompt management back to Deforum. Summary table in console showing who's doing what between Deforum & Parseq. Initial unit test. 2023-03-02 06:36:33 +11:00
hithereai 1a8e18e92f Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/405 2023-03-01 19:00:46 +02:00
hithereai 83e9be7a77 Revert "Merge pull request #358 from MatissesProjects/automatic1111-webui"
This reverts commit ff7201b5a5, reversing
changes made to 6215a44d79.
2023-03-01 18:45:12 +02:00
hithereai eca026fefb print aspect ratio in cli's table if it's not static 1 for the whole animation 2023-03-01 18:12:15 +02:00
kabachuha 285a98f375 fix missed midas_weight in depth predict calls 2023-02-27 12:11:44 +03:00
kabachuha 74fc34e37e Revert "Revert "Merge pull request #339 from deforum-art/bad_apple!!""
This reverts commit 483a973e0a.
2023-02-27 11:56:23 +03:00
hithereai 483a973e0a Revert "Merge pull request #339 from deforum-art/bad_apple!!"
This reverts commit 6215a44d79, reversing
changes made to 27b508bd42.
2023-02-27 00:58:47 +02:00
kabachuha cf0872ecae Merge branch 'automatic1111-webui' of https://github.com/MatissesProjects/deforum-extensions into pr/358 2023-02-26 18:16:05 +03:00
kabachuha 1b7a78af1d Merge branch 'automatic1111-webui' into pr/358 2023-02-26 18:15:53 +03:00
kabachuha 513d6b7b65 Merge branch 'automatic1111-webui' into bad_apple!! 2023-02-26 13:57:45 +03:00
Matisse 6297e84a98 small cleanup, seems easier to understand 2023-02-25 17:45:59 -08:00
Matisse 12d01950d8 adding max_f into prompt setup 2023-02-25 17:24:54 -08:00
Matisse bca9cb0cd5 fix ) not showing up on where
this is due to it being not appended previously, now we can!
2023-02-25 16:34:05 -08:00
Matisse 1943459b99
Merge branch 'deforum-art:automatic1111-webui' into automatic1111-webui 2023-02-25 15:30:29 -08:00
reallybigname 07be6b01ed Fixed issue that prevented resume when using video mask
- unsharp_mask function was calling args.mask_image when mask_image is a local var at that point
- then, I realized that the routine shouldn't even be called if the amount is 0, so I added an if amount > 0 statement.
2023-02-24 14:02:09 -08:00
kabachuha f6c581e8c0 fix video mask loading
works with totally blank mask frames too

closes #89 and closes #281
2023-02-24 14:54:11 +03:00
hithereai 43b1e863be Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358 2023-02-23 23:11:21 +02:00
hithereai d4f1fc9b7e Merge remote-tracking branch 'upstream/automatic1111-webui' into pr/358 2023-02-20 09:13:46 +02:00
Matisse 077c769890 resolving variables in the prompts for cli 2023-02-19 22:25:16 -08:00
Matisse b6accfe79c move parsing into class. r to seed passed 2023-02-19 22:23:02 -08:00
kabachuha 434b29cef4 redirect to WIP conditional processing 2023-02-19 19:40:55 +03:00
kabachuha af5171b004 unpack controlnet input vids 2023-02-19 19:26:20 +03:00
kabachuha 9d6c3fbbe9 pass controlnet args to renders 2023-02-19 18:35:09 +03:00
kabachuha cecca529d6 Merge branch 'automatic1111-webui' into bad_apple!! 2023-02-19 13:18:13 +03:00
kabachuha 8044d45f47 wrap hijacking 2023-02-19 01:22:00 +03:00
kabachuha b2dc72387e ofc do these tricks only in 3D mode 2023-02-19 01:21:40 +03:00
kabachuha 7a39b4cab3 infer low vram depth mode from cmd opts 2023-02-19 01:08:41 +03:00
kabachuha 9c6bffe45b option to unload main ckpt while getting depth 2023-02-18 23:38:27 +03:00
hithereai 0d15d953c5 remove prettytable, move to rich tables instead, fix subseed val now showing in tables 2023-02-17 07:17:33 +02:00
kabachuha bcf23c02db add vid2depth
need fixing some thresh modes
2023-02-14 13:43:15 +03:00
hithereai 16b1ce243c finally, handle reg save sett when generating an animation 2023-02-12 20:17:43 +02:00