rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-03-06 12:47:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SillyTavern:staging' into staging

Browse Source
This commit is contained in:
Tony Ribeiro 2023-08-25 02:55:05 +02:00 committed by GitHub
commit 011834b8fc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/scripts/extensions/expressions/index.js
View File

@ -334,7 +334,7 @@ async function setImage(img, path) {
expressionHolder.css('min-height', imgHeight > 100 ? imgHeight : 100); expressionHolder.css('min-height', imgHeight > 100 ? imgHeight : 100);
//position absolute prevent the original from jumping around during transition //position absolute prevent the original from jumping around during transition
img.css('position', 'absolute'); img.css('position', 'absolute').width(imgWidth).height(imgHeight);
expressionClone.addClass('expression-animating'); expressionClone.addClass('expression-animating');
//fade the clone in //fade the clone in
expressionClone.css({ expressionClone.css({
@ -919,7 +919,7 @@ async function setExpression(character, expression, force) {
expressionHolder.css('min-height', imgHeight > 100 ? imgHeight : 100); expressionHolder.css('min-height', imgHeight > 100 ? imgHeight : 100);
//position absolute prevent the original from jumping around during transition //position absolute prevent the original from jumping around during transition
img.css('position', 'absolute'); img.css('position', 'absolute').width(imgWidth).height(imgHeight);
expressionClone.addClass('expression-animating'); expressionClone.addClass('expression-animating');
//fade the clone in //fade the clone in
expressionClone.css({ expressionClone.css({

4
public/scripts/openai.js
View File

@ -2687,8 +2687,8 @@ async function onModelChange() {
oai_settings.freq_pen_openai = Math.min(2.0, oai_settings.freq_pen_openai); oai_settings.freq_pen_openai = Math.min(2.0, oai_settings.freq_pen_openai);
$('#freq_pen_openai').attr('min', -2.0).attr('max', 2.0).val(oai_settings.freq_pen_openai).trigger('input'); $('#freq_pen_openai').attr('min', -2.0).attr('max', 2.0).val(oai_settings.freq_pen_openai).trigger('input');
oai_settings.freq_pen_openai = Math.min(2.0, oai_settings.pres_pen_openai); oai_settings.pres_pen_openai = Math.min(2.0, oai_settings.pres_pen_openai);
$('#pres_pen_openai').attr('min', -2.0).attr('max', 2.0).val(oai_settings.freq_pen_openai).trigger('input'); $('#pres_pen_openai').attr('min', -2.0).attr('max', 2.0).val(oai_settings.pres_pen_openai).trigger('input');
oai_settings.top_k_openai = Math.min(200, oai_settings.top_k_openai); oai_settings.top_k_openai = Math.min(200, oai_settings.top_k_openai);
$('#top_k_openai').attr('max', 200).val(oai_settings.top_k_openai).trigger('input'); $('#top_k_openai').attr('max', 200).val(oai_settings.top_k_openai).trigger('input');