From c873a6b04cd970ba4f5cb7fb6894f6234760cab8 Mon Sep 17 00:00:00 2001 From: Cohee Date: Fri, 23 Jun 2023 13:53:37 +0300 Subject: [PATCH 01/51] Fix npm audit. --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 60cfacdd9..c83ebade9 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3035,9 +3035,9 @@ "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==" }, "node_modules/semver": { - "version": "7.5.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz", - "integrity": "sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==", + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" From fc9c90c4ee9b334556ec174f92a38ad7c0927a0d Mon Sep 17 00:00:00 2001 From: kingbri Date: Sun, 25 Jun 2023 00:36:40 -0400 Subject: [PATCH 02/51] World Info: Add global multi-selection/merging Global world info always involved some kind of merging leading to extremely large lorebook files that took a long time to import. This commit adds the ability to select more than one world info file and they will be merged together along with character world info. In short, multiple worlds can be meshed together to further contribute to context. You can also use this for world "DLCs" of sorts. Let's say someone else has more information to add regarding a world, but doesn't want to use a large world file. The JSONs can now be merged. Signed-off-by: kingbri --- public/index.html | 69 ++++++++-------- public/script.js | 2 +- public/scripts/world-info.js | 150 +++++++++++++++++++++-------------- 3 files changed, 125 insertions(+), 96 deletions(-) diff --git a/public/index.html b/public/index.html index 18d70de3f..749a3fd6c 100644 --- a/public/index.html +++ b/public/index.html @@ -1876,17 +1876,17 @@
-
-
-
- Active World -
-
- -
+
+
+ Active World
+
+ +
+
+
-
-
-
-
- Scan Depth -
-
-
- +
+
+
+ Scan Depth
-
-
- depth +
+
+ +
+
+
+ depth +
-
- -
-
- Context % -
-
-
- + +
+
+ Context %
-
-
- budget +
+
+ +
+
+
+ budget +
+
-
-
+
+
Active World
@@ -1886,7 +1886,7 @@
-
+
- +
Context % @@ -3399,4 +3399,4 @@ - + \ No newline at end of file diff --git a/public/style.css b/public/style.css index 6fe3f98f7..fbcff2cee 100644 --- a/public/style.css +++ b/public/style.css @@ -1372,6 +1372,10 @@ body.big-avatars .ch_description { align-items: flex-start !important; } +.alignSelfStart { + align-self: start; +} + .gap5px { gap: 5px !important; } @@ -3970,6 +3974,10 @@ toolcool-color-picker { margin: 0 auto; } +.justifyContentSpaceAround { + justify-content: space-around; +} + .spaceEvenly { justify-content: space-evenly; } @@ -4405,6 +4413,10 @@ body.waifuMode #avatar_zoom_popup { flex-direction: column; } + #WIMultiSelector { + align-self: normal; + } + .WIEntryContentAndMemo { flex-flow: column; } @@ -4724,4 +4736,4 @@ body.waifuMode #avatar_zoom_popup { #horde_model { height: unset; } -} +} \ No newline at end of file From 951e22ac8e3674c06322fc822417b8c3ab37d2bf Mon Sep 17 00:00:00 2001 From: Cohee Date: Sun, 25 Jun 2023 12:43:37 +0300 Subject: [PATCH 05/51] Fix scrolling and width of global WI --- public/index.html | 10 +++++----- public/scripts/world-info.js | 8 +++++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/public/index.html b/public/index.html index c7be99802..f47fc7c39 100644 --- a/public/index.html +++ b/public/index.html @@ -1876,9 +1876,9 @@
-
+
- Active World + Active World(s)
-
+
-
+