h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-13 14:12:56 +08:00
Code Issues Releases Wiki Activity

Import enum from old osu

Browse Source
This commit is contained in:
Drew DeVault 2016-11-02 19:37:52 -04:00
parent dd0cb5da01
commit 89d3f4c2be
2 changed files with 154 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

274
osu.Game/Configuration/OsuConfigManager.cs
View File

@ -14,7 +14,7 @@ namespace osu.Game.Configuration
{ {
Set(OsuConfig.Width, 1366, 640); Set(OsuConfig.Width, 1366, 640);
Set(OsuConfig.Height, 768, 480); Set(OsuConfig.Height, 768, 480);
Set(OsuConfig.MouseSensitivity, 1.0); Set(OsuConfig.MouseSpeed, 1.0);
Set(OsuConfig.Username, string.Empty); Set(OsuConfig.Username, string.Empty);
Set(OsuConfig.Password, string.Empty); Set(OsuConfig.Password, string.Empty);
@ -22,7 +22,7 @@ namespace osu.Game.Configuration
Set(OsuConfig.PlayMode, PlayMode.Osu); Set(OsuConfig.PlayMode, PlayMode.Osu);
Set(OsuConfig.VolumeGlobal, 0.8, 0, 1); Set(OsuConfig.VolumeUniversal, 0.8, 0, 1);
Set(OsuConfig.VolumeMusic, 1.0, 0, 1); Set(OsuConfig.VolumeMusic, 1.0, 0, 1);
Set(OsuConfig.VolumeEffect, 1.0, 0, 1); Set(OsuConfig.VolumeEffect, 1.0, 0, 1);
} }
@ -34,127 +34,159 @@ namespace osu.Game.Configuration
enum OsuConfig enum OsuConfig
{ {
// General // New osu:
// Sign in PlayMode,
Username, Token,
Password, // Imported from old osu:
// Language BeatmapDirectory,
Language, VolumeUniversal,
PreferOriginalForMetadata,
AlternativeChatFont,
// Updates
ReleaseStream,
// Graphics
// Renderer
FrameLimiter,
FPSCounter,
ReduceDroppedFrames,
DetectPerformanceIssues,
// Layout
Width,
Height,
EnableFullscreen,
EnableLetterboxing,
HorizontalPosition,
VerticalPosition,
// Detail settings
EnableSnakingSliders,
EnableBackgroundVideo,
EnableStoryboards,
EnableComboBursts,
EnableHitLighting,
EnableShaders,
EnableSofteningFilter,
ScreenshotFormat,
// Main menu
EnableMenuSnow,
EnableMenuParallax,
EnableMenuTips,
EnableInterfaceVoices,
EnableOsuMusicTheme,
// Song select
EnableSongSelectThumbnails,
// Gameplay
// General
BackgroundDim,
ProgressDisplay,
ScoreMeterType,
ScoreMeterSize,
AlwaysShowKeyOverlay,
ShowFirstHiddenApproachCircle,
ScaleManiaScrollSpeed,
RememberManiaScrollSpeed,
// Song select
SongSelectMinimumStars,
SongSelectMaximumStars,
// Audio
// Devices
OutputDevice,
// Volume
VolumeGlobal,
VolumeEffect, VolumeEffect,
VolumeMusic, VolumeMusic,
IgnoreBeatmapHitsounds, AllowPublicInvites,
// Offset AutoChatHide,
UniversalOffset, AutomaticDownload,
// Skin AutomaticDownloadNoVideo,
SelectedSkin, BlockNonFriendPM,
IgnoreBeatmapSkins, Bloom,
UseSkinAudioSamples, BloomSoftening,
UseTaikoSkin, BossKeyFirstActivation,
UseSkinCursor, ChatAudibleHighlight,
ChatChannels,
ChatFilter,
ChatHighlightName,
ChatMessageNotification,
ChatLastChannel,
ChatRemoveForeign,
ChatSortMode,
ComboBurst,
ComboFire,
ComboFireHeight,
ConfirmExit,
AutoSendNowPlaying,
CursorSize, CursorSize,
EnableAutomaticCursorSize, AutomaticCursorSizing,
// Input DimLevel,
// Mouse Display,
MouseSensitivity, DisplayCityLocation,
EnableRawInput, DistanceSpacingEnabled,
EnableMapRawInputToWindow, EditorTip,
MouseConfinementMode, VideoEditor,
DisableMouseWheelInPlay, EditorDefaultSkin,
DisableMouseButtonsInPlay, EditorSnakingSliders,
EnableCursorRipples, EditorHitAnimations,
// Keyboard EditorFollowPoints,
// TODO EditorStacking,
// Other ForceSliderRendering,
UseOSTabletSupport, FpsCounter,
EnableWiimoteDrumSupport, FrameTimeDisplay,
// Editor GuideTips,
EnableEditorBackgroundVideo, CursorRipple,
EnableEditorDefaultSkin, HighlightWords,
EnableEditorSnakingSliders, HighResolution,
EnableEditorHitAnimations, HitLighting,
EnableEditorFollowPoints, IgnoreBarline,
EnableEditorStacking, IgnoreBeatmapSamples,
// Online IgnoreBeatmapSkins,
// Alerts and Privacy IgnoreList,
EnableChatTicker, KeyOverlay,
HideChatDuringPlay, Language,
EnableNotifyOnMention, LastPlayMode,
EnableSoundOnMention, AllowNowPlayingHighlights,
EnableChatNotifications, LastVersion,
EnableCitySharing, LastVersionPermissionsFailed,
EnableSpectators, LoadSubmittedThread,
AutoLinkBeatmapsToSpectators, LobbyPlayMode,
ShowNotificationsDuringPlay, ShowInterface,
ShowFriendOnlineStatusNotifications, ShowInterfaceDuringRelax,
AllowAnyMultiplayerInvites, LobbyShowExistingOnly,
// Integration LobbyShowFriendsOnly,
EnableYahooIntegration, LobbyShowFull,
EnableMSNLiveIntegration, LobbyShowInProgress,
AutoStartOsuDirect, LobbyShowPassworded,
PreferNoVideo, LogPrivateMessages,
// In-game chat LowResolution,
EnableWordFilter, ManiaSpeed,
EnableForeignFilter, UsePerBeatmapManiaSpeed,
EnablePrivateMessageLog, ManiaSpeedBPMScale,
BlockStrangerPrivateMessages, MenuTip,
ChatIgnoreList, MouseDisableButtons,
ChatHighlightList, MouseDisableWheel,
// Maintenance MouseSpeed,
// (no persisted options) Offset,
// Misc (not mapped to user-visible options) ScoreMeterScale,
Token, DistanceSpacing,
PlayMode, EditorBeatDivisor,
EditorGridSize,
EditorGridSizeDesign,
Height,
Width,
HeightFullscreen,
CustomFrameLimit,
WidthFullscreen,
MsnIntegration,
MyPcSucks,
NotifyFriends,
NotifySubmittedThread,
PopupDuringGameplay,
ProgressBarType,
RankType,
RefreshRate,
OverrideRefreshRate,
ScaleMode,
ScoreboardVisible,
ScoreMeter,
ScreenshotId,
MenuSnow,
MenuTriangles,
SongSelectThumbnails,
ScreenshotFormat,
ShowReplayComments,
ShowSpectators,
ShowStoryboard,
Skin,
SkinSamples,
SkipTablet,
SnakingSliders,
Tablet,
UpdatePending,
UserFilter,
UseSkinCursor,
UseTaikoSkin,
Video,
Wiimote,
YahooIntegration,
ForceFrameFlush,
DetectPerformanceIssues,
Fullscreen,
MenuMusic,
MenuVoice,
MenuParallax,
RawInput,
AbsoluteToOsuWindow,
ConfineMouse,
ShowMenuTips,
HiddenShowFirstApproach,
ComboColourSliderBall,
AlternativeChatFont,
Password,
Username,
DisplayStarsMaximum,
DisplayStarsMinimum,
AudioDevice,
ReleaseStream,
UpdateFailCount,
SavePassword,
SaveUsername,
TreeSortMode,
TreeSortMode2,
Letterboxing,
LetterboxPositionX,
LetterboxPositionY,
FrameSync,
ShowUnicode,
PermanentSongInfo,
Ticker,
CompatibilityContext,
CanForceOptimusCompatibility,
} }
} }

2
osu.Game/OsuGame.cs
View File

@ -61,7 +61,7 @@ namespace osu.Game
Schedule(delegate { Beatmaps.Import(args); }); Schedule(delegate { Beatmaps.Import(args); });
//attach our bindables to the audio subsystem. //attach our bindables to the audio subsystem.
Audio.Volume.Weld(Config.GetBindable<double>(OsuConfig.VolumeGlobal)); Audio.Volume.Weld(Config.GetBindable<double>(OsuConfig.VolumeUniversal));
Audio.VolumeSample.Weld(Config.GetBindable<double>(OsuConfig.VolumeEffect)); Audio.VolumeSample.Weld(Config.GetBindable<double>(OsuConfig.VolumeEffect));
Audio.VolumeTrack.Weld(Config.GetBindable<double>(OsuConfig.VolumeMusic)); Audio.VolumeTrack.Weld(Config.GetBindable<double>(OsuConfig.VolumeMusic));