merge: resolve conflicts with upstream/main
Merged upstream/main into feat/v2-widget-dashboard-system branch. Key conflict resolutions: - index.js: Added renderQuests() to Dashboard v2 fallback rendering - state.js: Combined memoryMessagesToProcess with Dashboard v2 config - apiClient.js: Combined refreshDashboard() and renderQuests() calls - style.css: Kept Dashboard v2 mobile refresh button styles New features from upstream: - Quest tracking system (renderQuests, quests.js) - Memory recollection system - Lorebook limiter feature - Various parser and prompt builder improvements
This commit is contained in:
@@ -30,6 +30,7 @@ import { renderUserStats } from '../rendering/userStats.js';
|
||||
import { renderInfoBox } from '../rendering/infoBox.js';
|
||||
import { renderThoughts, updateChatThoughts } from '../rendering/thoughts.js';
|
||||
import { renderInventory } from '../rendering/inventory.js';
|
||||
import { renderQuests } from '../rendering/quests.js';
|
||||
|
||||
// Dashboard
|
||||
import { refreshDashboard } from '../dashboard/dashboardIntegration.js';
|
||||
@@ -177,6 +178,7 @@ export async function onMessageReceived(data) {
|
||||
renderInfoBox();
|
||||
renderThoughts();
|
||||
renderInventory();
|
||||
renderQuests();
|
||||
|
||||
// Refresh dashboard widgets (v2 dashboard)
|
||||
refreshDashboard();
|
||||
@@ -237,6 +239,7 @@ export function onCharacterChanged() {
|
||||
renderInfoBox();
|
||||
renderThoughts();
|
||||
renderInventory();
|
||||
renderQuests();
|
||||
|
||||
// Refresh dashboard widgets (v2 dashboard)
|
||||
refreshDashboard();
|
||||
@@ -311,6 +314,7 @@ export function onMessageSwiped(messageIndex) {
|
||||
renderInfoBox();
|
||||
renderThoughts();
|
||||
renderInventory();
|
||||
renderQuests();
|
||||
|
||||
// Update chat thought overlays
|
||||
updateChatThoughts();
|
||||
|
||||
Reference in New Issue
Block a user