Skip to content

Commit

Permalink
Merge branch 'develop' into steam-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
Raphiiko committed Sep 24, 2024
2 parents e5eee7a + f631be6 commit 87302a4
Show file tree
Hide file tree
Showing 44 changed files with 485 additions and 64 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Option for the shutdown sequence to only trigger for being alone in your instance while the sleep mode is enabled
- Option for audio volume automations to apply on start
- Support for VRChat parameters in OSC scripts that have been automatically renamed by VRCFury or Modular Avatar
- Event log filters
- Workaround for VRChat not automatically reloading your avatar after all trackers have been turned off
- German language support (thanks to community contributions by [Nicer Dicer](https://github.com/XNicerDicerX) and [Aron](https://github.com/imaron85))
- Exposed HMD activity level over MQTT
Expand Down
37 changes: 18 additions & 19 deletions src-core/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion src-ui/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ import { SliderComponent } from './components/slider/slider.component';
import { EventLogService } from './services/event-log.service';
import { debug, error, info, warn } from 'tauri-plugin-log-api';
import { EventLogComponent } from './components/event-log/event-log.component';
import { EventLogEntryComponent } from './components/event-log-entry/event-log-entry.component';
import { EventLogEntryComponent } from './components/event-log/event-log-entry/event-log-entry.component';
import { LocalizedDatePipe } from './pipes/localized-date.pipe';
import localeEN from '@angular/common/locales/en';
import localeFR from '@angular/common/locales/fr';
Expand Down Expand Up @@ -233,6 +233,7 @@ import { BrightnessAdvancedModeToggleComponent } from './components/brightness-a
import { FBTAvatarReloadWorkaroundService } from './services/workarounds/f-b-t-avatar-reload-workaround.service';
import { AvatarContextService } from './services/avatar-context.service';
import { LighthouseV1IdWizardModalComponent } from './components/lighthouse-v1-id-wizard-modal/lighthouse-v1-id-wizard-modal.component';
import { EventLogFilterDialogComponent } from './components/event-log/event-log-filter-dialog/event-log-filter-dialog.component';

[
localeEN,
Expand Down Expand Up @@ -377,6 +378,7 @@ export function createTranslateLoader(http: HttpClient) {
SettingsBrightnessCctViewComponent,
BrightnessAdvancedModeToggleComponent,
LighthouseV1IdWizardModalComponent,
EventLogFilterDialogComponent,
],
exports: [SelectBoxComponent],
imports: [
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogAcceptedInviteRequest, EventLogType } from '../../../models/event-log-entry';
import { EventLogAcceptedInviteRequest, EventLogType } from '../../../../models/event-log-entry';

export class EventLogAcceptedInviteRequestEntryParser extends EventLogEntryParser<EventLogAcceptedInviteRequest> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogBSBFanSpeedChanged, EventLogType } from '../../../models/event-log-entry';
import { EventLogBSBFanSpeedChanged, EventLogType } from '../../../../models/event-log-entry';

export class EventLogBSBFanSpeedChangedEntryParser extends EventLogEntryParser<EventLogBSBFanSpeedChanged> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogBSBLedChanged, EventLogType } from '../../../models/event-log-entry';
import { EventLogBSBLedChanged, EventLogType } from '../../../../models/event-log-entry';

export class EventLogBSBLedChangedEntryParser extends EventLogEntryParser<EventLogBSBLedChanged> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogCCTChanged, EventLogType } from '../../../models/event-log-entry';
import { EventLogCCTChanged, EventLogType } from '../../../../models/event-log-entry';
import { getCSSColorForCCT } from 'src-shared-ts/src/cct-utils';

export class EventLogCCTChangedEntryParser extends EventLogEntryParser<EventLogCCTChanged> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogChangedAudioDeviceVolume, EventLogType } from '../../../models/event-log-entry';
import { EventLogChangedAudioDeviceVolume, EventLogType } from '../../../../models/event-log-entry';

export class EventLogChangedAudioDeviceVolumeEntryParser extends EventLogEntryParser<EventLogChangedAudioDeviceVolume> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { EventLogEntryParser } from '../event-log-entry-parser';
import {
EventLogChangedSystemMicControllerButtonBehavior,
EventLogType,
} from '../../../models/event-log-entry';
} from '../../../../models/event-log-entry';

export class EventLogChangedSystemMicControllerButtonBehaviorEntryParser extends EventLogEntryParser<EventLogChangedSystemMicControllerButtonBehavior> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogChangedSystemMicMuteState, EventLogType } from '../../../models/event-log-entry';
import {
EventLogChangedSystemMicMuteState,
EventLogType,
} from '../../../../models/event-log-entry';

export class EventLogChangedSystemMicMuteStateEntryParser extends EventLogEntryParser<EventLogChangedSystemMicMuteState> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogChangedVRChatMicMuteState, EventLogType } from '../../../models/event-log-entry';
import {
EventLogChangedVRChatMicMuteState,
EventLogType,
} from '../../../../models/event-log-entry';

export class EventLogChangedVRChatMicMuteStateEntryParser extends EventLogEntryParser<EventLogChangedVRChatMicMuteState> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogHardwareBrightnessChanged, EventLogType } from '../../../models/event-log-entry';
import {
EventLogHardwareBrightnessChanged,
EventLogType,
} from '../../../../models/event-log-entry';

export class EventLogHardwareBrightnessChangedEntryParser extends EventLogEntryParser<EventLogHardwareBrightnessChanged> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { EventLogEntryParser } from '../event-log-entry-parser';
import {
EventLogChaperoneFadeDistanceChanged,
EventLogType,
} from '../../../models/event-log-entry';
} from '../../../../models/event-log-entry';
import { ensurePrecision } from 'src-ui/app/utils/number-utils';

export class EventLogFadeDistanceChangedEntryParser extends EventLogEntryParser<EventLogChaperoneFadeDistanceChanged> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogGpuPowerLimitChanged, EventLogType } from '../../../models/event-log-entry';
import { EventLogGpuPowerLimitChanged, EventLogType } from '../../../../models/event-log-entry';

export class EventLogGpuPowerLimitChangedEntryParser extends EventLogEntryParser<EventLogGpuPowerLimitChanged> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogSoftwareBrightnessChanged, EventLogType } from '../../../models/event-log-entry';
import {
EventLogSoftwareBrightnessChanged,
EventLogType,
} from '../../../../models/event-log-entry';

export class EventLogSoftwareBrightnessChangedEntryParser extends EventLogEntryParser<EventLogSoftwareBrightnessChanged> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogLighthouseSetPowerState, EventLogType } from '../../../models/event-log-entry';
import { EventLogLighthouseSetPowerState, EventLogType } from '../../../../models/event-log-entry';

export class EventLogLighthouseSetPowerStateEntryParser extends EventLogEntryParser<EventLogLighthouseSetPowerState> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogMsiAfterburnerProfileSet, EventLogType } from '../../../models/event-log-entry';
import { EventLogMsiAfterburnerProfileSet, EventLogType } from '../../../../models/event-log-entry';

export class EventLogMsiAfterburnerProfileSetEntryParser extends EventLogEntryParser<EventLogMsiAfterburnerProfileSet> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogMutedAudioDevice, EventLogType } from '../../../models/event-log-entry';
import { EventLogMutedAudioDevice, EventLogType } from '../../../../models/event-log-entry';

export class EventLogMutedAudioDeviceEntryParser extends EventLogEntryParser<EventLogMutedAudioDevice> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogTurnedOffOpenVRDevices, EventLogType } from '../../../models/event-log-entry';
import { EventLogTurnedOffOpenVRDevices, EventLogType } from '../../../../models/event-log-entry';

export class EventLogTurnedOffOpenVRDevicesEntryParser extends EventLogEntryParser<EventLogTurnedOffOpenVRDevices> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogRenderResolutionChanged, EventLogType } from '../../../models/event-log-entry';
import { EventLogRenderResolutionChanged, EventLogType } from '../../../../models/event-log-entry';

export class EventLogRenderResolutionChangedEntryParser extends EventLogEntryParser<EventLogRenderResolutionChanged> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogShutdownSequenceCancelled, EventLogType } from '../../../models/event-log-entry';
import {
EventLogShutdownSequenceCancelled,
EventLogType,
} from '../../../../models/event-log-entry';

export class EventLogShutdownSequenceCancelledEntryParser extends EventLogEntryParser<EventLogShutdownSequenceCancelled> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogShutdownSequenceStarted, EventLogType } from '../../../models/event-log-entry';
import { EventLogShutdownSequenceStarted, EventLogType } from '../../../../models/event-log-entry';

export class EventLogShutdownSequenceStartedEntryParser extends EventLogEntryParser<EventLogShutdownSequenceStarted> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogSimpleBrightnessChanged, EventLogType } from '../../../models/event-log-entry';
import { EventLogSimpleBrightnessChanged, EventLogType } from '../../../../models/event-log-entry';

export class EventLogSimpleBrightnessChangedEntryParser extends EventLogEntryParser<EventLogSimpleBrightnessChanged> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import {
EventLogSleepDetectorEnableCancelled,
EventLogType,
} from '../../../models/event-log-entry';
} from '../../../../models/event-log-entry';
import { EventLogEntryParser } from '../event-log-entry-parser';

export class EventLogSleepDetectorEnableCancelledEntryParser extends EventLogEntryParser<EventLogSleepDetectorEnableCancelled> {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogSleepModeDisabled, EventLogType } from '../../../models/event-log-entry';
import { EventLogSleepModeDisabled, EventLogType } from '../../../../models/event-log-entry';

export class EventLogSleepModeDisabledEntryParser extends EventLogEntryParser<EventLogSleepModeDisabled> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogSleepModeEnabled, EventLogType } from '../../../models/event-log-entry';
import { EventLogSleepModeEnabled, EventLogType } from '../../../../models/event-log-entry';

export class EventLogSleepModeEnabledEntryParser extends EventLogEntryParser<EventLogSleepModeEnabled> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogStatusChangedOnGeneralEvent, EventLogType } from '../../../models/event-log-entry';
import {
EventLogStatusChangedOnGeneralEvent,
EventLogType,
} from '../../../../models/event-log-entry';
import { UserStatus } from 'vrchat';
import { vrcStatusToString } from '../../../utils/status-utils';
import { vrcStatusToString } from '../../../../utils/status-utils';

export class EventLogStatusChangedOnGeneralEventEntryParser extends EventLogEntryParser<EventLogStatusChangedOnGeneralEvent> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import { EventLogEntryParser } from '../event-log-entry-parser';
import {
EventLogStatusChangedOnPlayerCountChange,
EventLogType,
} from '../../../models/event-log-entry';
} from '../../../../models/event-log-entry';
import { UserStatus } from 'vrchat';
import { vrcStatusToString } from '../../../utils/status-utils';
import { vrcStatusToString } from '../../../../utils/status-utils';

export class EventLogStatusChangedOnPlayerCountChangeEntryParser extends EventLogEntryParser<EventLogStatusChangedOnPlayerCountChange> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogBase, EventLogType } from '../../../models/event-log-entry';
import { EventLogBase, EventLogType } from '../../../../models/event-log-entry';

export class EventLogTemplateEntryParser extends EventLogEntryParser<EventLogBase> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogType, EventLogUnmutedAudioDevice } from '../../../models/event-log-entry';
import { EventLogType, EventLogUnmutedAudioDevice } from '../../../../models/event-log-entry';

export class EventLogUnmutedAudioDeviceEntryParser extends EventLogEntryParser<EventLogUnmutedAudioDevice> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogType, EventLogVRChatAvatarChanged } from '../../../models/event-log-entry';
import { EventLogType, EventLogVRChatAvatarChanged } from '../../../../models/event-log-entry';

export class EventLogVRChatAvatarChangedEntryParser extends EventLogEntryParser<EventLogVRChatAvatarChanged> {
entryType(): EventLogType {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { EventLogEntryParser } from '../event-log-entry-parser';
import { EventLogType, EventLogWindowsPowerPolicySet } from '../../../models/event-log-entry';
import { EventLogType, EventLogWindowsPowerPolicySet } from '../../../../models/event-log-entry';
import { TranslateService } from '@ngx-translate/core';
import { inject } from '@angular/core';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { EventLogBase, EventLogType } from '../../models/event-log-entry';
import { EventLogBase, EventLogType } from '../../../models/event-log-entry';

export abstract class EventLogEntryParser<T extends EventLogBase> {
abstract entryType(): EventLogType;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { Component, DestroyRef, Input, OnChanges, OnInit } from '@angular/core';
import { EventLogEntry } from '../../models/event-log-entry';
import { EventLogEntryParser } from './event-log-entry-parser';
import { EventLogSleepModeEnabledEntryParser } from './entry-parsers/sleep-mode-enabled';
import { EventLogSleepModeDisabledEntryParser } from './entry-parsers/sleep-mode-disabled';
Expand Down Expand Up @@ -32,6 +31,7 @@ import { EventLogBSBLedChangedEntryParser } from './entry-parsers/bsb-led-change
import { EventLogStatusChangedOnGeneralEventEntryParser } from './entry-parsers/status-changed-on-general-event';
import { EventLogVRChatAvatarChangedEntryParser } from './entry-parsers/vrchat-avatar-changed';
import { EventLogCCTChangedEntryParser } from './entry-parsers/cct-changed';
import { EventLogEntry } from '../../../models/event-log-entry';

@Component({
selector: 'app-event-log-entry',
Expand Down
Loading

0 comments on commit 87302a4

Please sign in to comment.