Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable track activity by default #4710

Merged
merged 3 commits into from
May 14, 2024
Merged

Enable track activity by default #4710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
85e9dce
enable track Activity by default
cj12312021 Mar 20, 2024
dee93f3
Merge remote-tracking branch 'upstream/develop' into prs/4710
WithoutPants May 10, 2024
7bf06a5
Add v0.26.0 release notes and update "Track Activity" label
WithoutPants May 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/v2.5/src/components/ScenePlayer/ScenePlayer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ export const ScenePlayer: React.FC<IScenePlayerProps> = ({
const auto = useRef(false);
const interactiveReady = useRef(false);
const minimumPlayPercent = uiConfig?.minimumPlayPercent ?? 0;
const trackActivity = uiConfig?.trackActivity ?? false;
const trackActivity = uiConfig?.trackActivity ?? true;
const vrTag = uiConfig?.vrTag ?? undefined;

useScript(
Expand Down
2 changes: 1 addition & 1 deletion ui/v2.5/src/components/Settings/SettingsInterfacePanel/SettingsInterfacePanel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ export const SettingsInterfacePanel: React.FC = () => {
<BooleanSetting
id="track-activity"
headingID="config.ui.scene_player.options.track_activity"
checked={ui.trackActivity ?? undefined}
checked={ui.trackActivity ?? true}
onChange={(v) => saveUI({ trackActivity: v })}
/>
<StringSetting
Expand Down
6 changes: 6 additions & 0 deletions ui/v2.5/src/docs/en/ReleaseNotes/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import v0170 from "./v0170.md";
import v0200 from "./v0200.md";
import v0240 from "./v0240.md";
import v0250 from "./v0250.md";
import v0260 from "./v0260.md";

export interface IReleaseNotes {
// handle should be in the form of YYYYMMDD
Expand All @@ -11,6 +12,11 @@ export interface IReleaseNotes {
}

export const releaseNotes: IReleaseNotes[] = [
{
date: 20240510,
version: "v0.26.0",
content: v0260,
},
{
date: 20240228,
version: "v0.25.0",
Expand Down
1 change: 1 addition & 0 deletions ui/v2.5/src/docs/en/ReleaseNotes/v0260.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
The `Enable Scene Play History` setting has been set to true for existing systems. This setting enables play counts and resuming scenes from where they were previously played. If you do not want this enabled, please disable it explicitly in `Settings -> Interface -> Scene Player -> Enable Scene Play History`.
2 changes: 1 addition & 1 deletion ui/v2.5/src/locales/en-GB.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@
"enable_chromecast": "Enable Chromecast",
"show_ab_loop_controls": "Show AB Loop plugin controls",
"show_scrubber": "Show Scrubber",
"track_activity": "Track Activity",
"track_activity": "Enable Scene Play history",
"vr_tag": {
"description": "The VR button will only be displayed for scenes with this tag.",
"heading": "VR Tag"
Expand Down
Loading