793 Commits

Author	SHA1	Message	Date
Craftplacer	4e56981554	Merge remote-tracking branch 'upstream/master' into update-button ... # Conflicts: # osu.Game/Overlays/Settings/Sections/General/UpdateSettings.cs	2020-06-07 22:43:53 +02:00
Dean Herbert	f989f1aa00	Change event flow to avoid firing store delete events on update	2020-05-27 16:08:47 +09:00
Dean Herbert	8ab65e4c5d	Move implementation into own class	2020-05-24 23:15:24 +09:00
Dean Herbert	c071fe6140	Add the ability to export skins	2020-05-24 13:44:11 +09:00
Dean Herbert	052ad79fc6	Convert dangerous events to IBindables	2020-05-19 16:44:22 +09:00
Dan Balasescu	533010f168	Merge branch 'master' into avoid-host-disable	2020-05-17 15:59:39 +09:00
Dean Herbert	9d3df14179	Remove unused variable	2020-05-16 11:03:27 +09:00
Dean Herbert	c47f02c3b7	Update second instance of disabling bindable	2020-05-16 08:24:02 +09:00
Dean Herbert	aec2520ef4	Avoid disabling a host-level bindable from osu! code	2020-05-15 17:31:06 +09:00
Dean Herbert	155e918ca3	Remove unused parameter	2020-05-14 21:40:28 +09:00
Dean Herbert	42f446faa9	Fix remaining test failure	2020-05-14 21:10:04 +09:00
Dean Herbert	a582611647	Add test coverage	2020-05-14 19:05:35 +09:00
Dean Herbert	4e4a779d68	Improve overall UI	2020-05-14 17:41:55 +09:00
Dean Herbert	0b73063a89	Add basic (working) migration UI	2020-05-14 17:41:55 +09:00
Craftplacer	0d6f531183	Merge branch 'update-button' of https://github.com/Craftplacer/osu into update-button	2020-05-08 02:56:33 +02:00
Craftplacer	ebd1df8c28	Change property name to CanCheckForUpdate	2020-05-08 02:50:58 +02:00
Craftplacer	7f61f27be1	Use null-conditional operator when checking against UpdateManager ... Co-authored-by: Dean Herbert <pe@ppy.sh>	2020-05-08 02:33:12 +02:00
Craftplacer	e6ad28a1cb	Use property instead of type checking	2020-05-08 02:09:37 +02:00
Craftplacer	a7792070bc	Final changes to DI fields and values	2020-05-08 01:08:17 +02:00
Craftplacer	477bd7fa61	Change to Resolved attribute	2020-05-08 00:35:27 +02:00
Craftplacer	72b6bb25a5	Allow nulls and hide if missing dependencies	2020-05-08 00:33:33 +02:00
Craftplacer	92872496b8	Convert to method groups ... because Inspector said so.	2020-05-07 23:27:28 +02:00
Craftplacer	c025814f40	Finalize changes	2020-05-07 23:04:18 +02:00
Craftplacer	836efe3f7c	Initial commit	2020-05-07 08:07:22 +02:00
Shane Woolcock	9477a5373c	Merge branch 'master' into display-modes	2020-04-28 12:04:20 +09:30
Bartłomiej Dach	a436f8e6d4	Trim other leftover RelativeSizeAxes	2020-04-26 22:54:01 +02:00
Lucas A	801968ed51	Remove un-needed RelativeSizeAxes specifications.	2020-04-26 21:17:40 +02:00
Lucas A	a756486a4d	Make settings section icons actual drawables.	2020-04-25 20:35:46 +02:00
Dan Balasescu	ac8a3efc46	Merge branch 'master' into low-hp-red-layer	2020-04-14 14:47:01 +09:00
Endrik Tombak	d9c91fb943	Merge branch 'master' of https://github.com/ppy/osu into no-video-option ... Conflicts: osu.Game/Overlays/Direct/PanelDownloadButton.cs	2020-04-13 17:40:28 +03:00
Endrik Tombak	633b969017	Apply review suggestions	2020-04-12 21:57:35 +03:00
Endrik Tombak	df76636ffc	Implement "prefer no video" option	2020-04-11 14:08:16 +03:00
Fire937	2201e9b4ae	Add stereo shifted hitsound playback support ... There is now a setting in the general settings called "Positional hitsounds". If the setting is enabled, the hitsounds playback will be shifted according to their position on the beatmap.	2020-04-09 18:12:15 +02:00
Dean Herbert	52c9762651	Remove pointless keywords	2020-04-09 14:36:04 +09:00
Shane Woolcock	2fec8b7b85	Use DisplayModes rather than AvailableResolutions	2020-04-05 13:01:10 +09:30
Lucas A	ab01111c36	Fix merge conflicts.	2020-03-30 17:39:11 +02:00
Lucas A	3cae0cedee	Add a game setting to disable the layer	2020-03-30 12:59:39 +02:00
Dean Herbert	5be8934c8c	Merge pull request #8407 from peppy/disable-raw-input ... Disable raw input toggle on all but windows	2020-03-27 21:10:02 +09:00
Dean Herbert	997ce397ef	Disable raw input toggle on all but windows	2020-03-23 12:48:05 +09:00
Dean Herbert	729e006c3a	Merge branch 'master' into video-offset	2020-03-21 20:03:46 +09:00
Joehu	f7ea20a926	Limit font weight to bold	2020-03-16 16:32:25 -07:00
voidedWarranties	c27751050b	Switch back to strings and update setting labels	2020-03-12 23:29:11 -07:00
voidedWarranties	48282dea8b	Remove individual setting to disable videos, fix tests	2020-03-07 22:08:38 -08:00
Andrei Zavatski	6631b07442	Refactor to replace existing panels	2020-03-04 14:58:15 +03:00
Dean Herbert	394b88aa65	Add thread mode dropdown	2020-02-28 22:17:45 +09:00
Dean Herbert	4ad2d0cfb6	Remove deprecated debug setting	2020-02-28 22:17:45 +09:00
Dean Herbert	92f6f0207c	Rename LoadingAnimation to LoadingSpinner	2020-02-21 15:33:31 +09:00
recapitalverb	ee14a275a2	Make IAPIProvider instances nullable	2020-02-14 22:02:44 +07:00
recapitalverb	10798aeab3	Fix code formatting	2020-02-14 20:30:27 +07:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
unknown	894642d588	add xmldoc and formatting	2020-01-28 18:04:00 +08:00
unknown	aa264cd2a8	allow tooltip to show as percentage as needed	2020-01-28 12:32:30 +08:00
Dean Herbert	bc75290655	Ensure min and max stars are correctly ordered	2020-01-25 00:11:20 +09:00
smoogipoo	d1684a3c92	Duplicate keywords for better UX	2020-01-24 19:50:16 +09:00
smoogipoo	75d0fd0bab	Rename class	2020-01-24 19:43:23 +09:00
smoogipoo	2643b6fca3	Add additional keywods	2020-01-24 19:12:48 +09:00
smoogipoo	62fa619ad4	Display "no limit" for maximum stars	2020-01-24 19:08:14 +09:00
Dean Herbert	da65fff48e	Merge remote-tracking branch 'upstream/master' into collapse-graph-option	2020-01-24 13:55:42 +09:00
Craftplacer	dd5478fe1f	Remove highlighted/mentioned words	2020-01-19 17:26:43 +01:00
Craftplacer	2b5d541857	Merge remote-tracking branch 'upstream/master' into chat-mention	2020-01-16 23:15:39 +01:00
Revel	a86fb2113e	fix tooltip capitalization	2020-01-14 14:26:54 -05:00
Joehu	19033e0ef8	Fix user status dropdown having no padding around items	2020-01-10 19:25:33 -08:00
Craftplacer	b6c31e7764	Remove ignore list, move code to MessageNotifier and add it to DI ... This also adds countable private message notifications.	2019-12-17 06:59:27 +01:00
Craftplacer	81d994abed	Change ChatMessageNotification's LabelText	2019-12-16 03:22:14 +01:00
Craftplacer	28d1fb181f	Add missing license header for InGameChatSettings.cs ... My unit tests fail at a solution filter, let's hope AppVeyor says yes.	2019-12-16 01:14:51 +01:00
Craftplacer	15c25c571d	Merge remote-tracking branch 'upstream/master' into chat-mention	2019-12-16 00:59:06 +01:00
Craftplacer	6e812ebd56	Reimplement chat settings from stable	2019-12-16 00:45:33 +01:00
Salman Ahmed	b93bbf81aa	Add lighten background during breaks setting	2019-12-10 15:10:35 +03:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Dean Herbert	1fd5ed3c0f	Change login placeholder text to ask for username	2019-11-25 21:35:25 +09:00
Dean Herbert	d0002cc1c2	Update performance logging setting	2019-11-22 19:50:30 +09:00
Dean Herbert	ab42fac43a	Improve naming	2019-11-22 02:38:31 +09:00
Dean Herbert	a97d760afa	Merge remote-tracking branch 'upstream/master' into menu-background-modes	2019-11-22 02:23:02 +09:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Dean Herbert	d7cb23a909	Remove redundant keyword	2019-11-21 22:51:00 +09:00
Dean Herbert	8b1fb2d5a1	Standardise keyword specifications	2019-11-21 22:35:15 +09:00
Andrei Zavatski	f066d8434c	Apply suggestions	2019-11-21 00:26:39 +03:00
Andrei Zavatski	6b3010535f	Simplify Keywords usage for SettingsSubsection	2019-11-20 21:03:31 +03:00
Andrei Zavatski	f3d9abc84a	Capitalize Bar for consistency	2019-11-20 19:57:02 +03:00
Andrei Zavatski	e820ddd3e8	Implement settings keywords	2019-11-20 19:27:34 +03:00
Huo Yaoyuan	e5e8e70704	Use pattern matching.	2019-11-12 19:55:19 +08:00
Ganendra Afrasya	5c2917d303	Place sign in button inside ShakeContainer	2019-10-30 00:50:04 +07:00
Roman Kapustin	e00992dfd8	Remove FollowPlayback setting	2019-10-07 19:44:22 +03:00
Roman Kapustin	eda4a27b45	Move FollowPlayback setting to User Interface subsection	2019-10-06 15:06:25 +03:00
Roman Kapustin	bdea75b995	Autoscroll playlist on song change	2019-10-05 23:53:05 +03:00
HDragonHR	faf8fe132e	Change bindable int to float	2019-10-02 12:26:46 +08:00
LeNitrous	b8d147a3b4	introduce main menu background modes	2019-09-24 17:42:06 +08:00
Dean Herbert	b41ac543c5	Allow changing logged in user	2019-09-23 04:46:50 +09:00
Dean Herbert	ead3ee3b41	Merge branch 'master' into hold-to-press-setting	2019-09-19 20:05:14 +09:00
Dan Balasescu	027d6194f2	Merge branch 'master' into add-hit-lighting	2019-09-19 18:07:29 +09:00
Dean Herbert	177a789d79	Add setting to adjust hold-to-confirm activation time	2019-09-19 14:06:25 +09:00
Dean Herbert	63cc8d4f90	Add hit lighting setting	2019-09-18 02:16:57 +09:00
Dean Herbert	b5b29a21e7	Move menu cursor rotation to more appropriate settings section	2019-09-18 02:15:18 +09:00
Andrei Zavatski	437e121056	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video	2019-09-13 13:39:58 +03:00
iiSaLMaN	cb55159b28	Use float types for cursor sizes	2019-09-03 01:28:51 +03:00
Andrei Zavatski	94512fea8e	Apply naming suggestions	2019-08-31 16:20:33 +03:00
Andrei Zavatski	fa3591e5ec	Add setting to turn on/off the video	2019-08-31 00:42:20 +03:00
Andrei Zavatski	a59a14c9e6	Add setting to enable/disable hit error visibility	2019-08-18 15:01:04 +03:00
Dean Herbert	cb0cd7ed58	Add triangles intro	2019-08-09 20:05:28 +09:00
Dean Herbert	4c6cccb3a3	Update settings in line with framework changes	2019-07-30 23:31:21 +09:00
smoogipoo	fab3ec3e5b	Add maximum height to skin dropdown	2019-07-30 19:28:02 +09:00
Dean Herbert	df5abd9651	Merge branch 'master' into shuffle-skin	2019-07-29 01:55:57 +09:00
Dean Herbert	27e79d56ec	Merge branch 'master' into collapse-graph-option	2019-07-09 23:40:43 +09:00
Salman Ahmed	b10c35b6ab	Update label text ... Co-Authored-By: Aergwyn <aergwyn@t-online.de>	2019-07-07 06:13:27 +03:00
Dean Herbert	84919d70bb	Health bar -> Health display ... Also inverts logic	2019-07-07 05:30:30 +09:00
Salman Ahmed	dfabed3d85	Merge branch 'master' into applicable-to-hud	2019-07-06 16:30:02 +03:00
iiSaLMaN	530e07110f	Use a descriptive name for the setting	2019-07-06 06:32:25 +03:00
Unknown	ee44caf964	better setting description	2019-07-05 08:52:44 +02:00
Dean Herbert	99da04527d	Replays -> scores	2019-07-05 14:07:14 +09:00
Unknown	608223cbb4	Add setting to collapse the song progress graph	2019-07-04 11:59:38 +02:00
Dean Herbert	7575047db8	Merge branch 'master' into import-stable-scores	2019-07-04 01:00:42 +09:00
Salman Ahmed	744e651a37	Merge branch 'master' into applicable-to-hud	2019-07-02 05:24:56 +03:00
Salman Ahmed	72e5cbb07f	Add checkbox for hiding health bar	2019-07-02 01:45:09 +03:00
Dean Herbert	3902da9135	Merge remote-tracking branch 'upstream/master' into abstract-menu	2019-06-28 18:13:44 +09:00
Dean Herbert	6d0cc1f770	Remove GC debug setting	2019-06-28 15:59:19 +09:00
smoogipoo	23df1a5d42	Merge remote-tracking branch 'HollyHacker/master' into abstract-menu	2019-06-28 13:42:56 +09:00
HoLLy	55216dffb7	Merge remote-tracking branch 'origin/master' into import-stable-scores	2019-06-27 14:07:17 +02:00
Dean Herbert	9e1cb90dd8	Remove existing argument for ItemAdded event ... For all usages, it looks like this was unnecessary.	2019-06-26 11:40:41 +09:00
smoogipoo	fb94cd43a4	Remove unnecessary local item storage in SettingsDropdown	2019-06-25 12:00:05 +09:00
jorolf	4d8f49b9bc	update code to work with https://github.com/ppy/osu-framework/pull/2568	2019-06-24 23:17:07 +02:00
HoLLy	d99f4d1a87	Change import button to mention replays instead of scores	2019-06-21 17:42:54 +02:00
HoLLy	15c75b4442	Add basic score import from stable	2019-06-19 18:33:51 +02:00
Dean Herbert	f358fce9ab	Move activity (writable) bindable to APIAccess so it correctly transfers between users	2019-06-12 18:04:57 +09:00
Dean Herbert	a9c229b1ec	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-12 16:00:35 +09:00
Dean Herbert	b29b1bf254	Merge branch 'master' into mod-grow-improvement	2019-06-12 13:18:02 +09:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
Lucas A	141775d98c	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-10 21:41:00 +02:00
Shane Woolcock	807d434be0	Access WindowModes via IBindableList	2019-06-09 17:52:02 +09:30
Ganendra Afrasya	49193a2703	Rename the setting label	2019-06-09 13:12:41 +07:00
Ganendra Afrasya	afc3a08953	Use existing setting instead ... Now it read IncreaseFirstObjectVisibility bindable instead	2019-06-09 13:11:40 +07:00
Ganendra Afrasya	f326264a85	Adding increase first object grow mod visibility setting	2019-06-08 00:42:57 +07:00
smoogipoo	4d035afcc6	Add setting to bypass front-to-back	2019-06-06 16:49:42 +09:00
Lucas A	2d966682dc	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-14 18:09:58 +02:00
Dean Herbert	7553e2da25	Fix incorrect DI reference and update naming of SettingsOverlay classes	2019-05-14 10:45:05 +09:00
Lucas A	a5f758b977	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-07 18:27:14 +02:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
Lucas A	88b8afbb6a	Make UserPanel show current user activity when ... user status is online.	2019-05-05 20:51:55 +02:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	f0114d776d	Use interface to access API ... Allows for better testability.	2019-03-13 12:58:18 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
Shane Woolcock	f1912a281c	Use Count property	2019-02-28 21:46:49 +09:00
Shane Woolcock	dfb3fef9e1	Hide WindowMode dropdown if only one is selectable	2019-02-28 21:38:55 +09:00
Shane Woolcock	b159e3ec31	Fix headless tests	2019-02-28 20:39:55 +09:00
Shane Woolcock	94199e628c	Only display SupportedWindowModes in settings	2019-02-28 20:20:12 +09:00
Dean Herbert	d10ad3c8a7	Fix warnings	2019-02-28 18:59:05 +09:00
Dean Herbert	5b53cf0961	Merge branch 'master' into hide-desktop-only-elements	2019-02-28 18:50:16 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Shane Woolcock	ce17e37c74	Conditionally add some UI elements only on desktop ... Prevents crashes from trying to access features that are not applicable to mobile.	2019-02-28 13:10:53 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
Dean Herbert	1550908edb	Add tooltip to key configuration button	2019-02-15 11:56:33 +09:00
Dean Herbert	a5f1aa644b	Fix cursor sensitivity tooltip not updating instantly	2019-01-25 17:30:35 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	7baff750de	Consolidate layout, wording and ordering with VisualSettings	2019-01-22 10:06:30 +09:00
Bear Daniel	7cdb823c87	Moved "Use beatmap hitsounds" button	2019-01-21 08:04:06 -06:00
Bear Daniel	858541bcf4	Added "Use beatmap hitsounds" button to volume section of settings	2019-01-18 02:33:39 -06:00
nwabear	42fa04beee	Update SkinSection.cs ... Added "Use beatmap skins" button to general settings	2019-01-17 14:40:22 -06:00
Dean Herbert	93a08bdb23	Remove stray using	2019-01-17 20:23:15 +09:00
Dean Herbert	d16f4af92b	Use TransferValueOnCommit for mouse sensitivity	2019-01-17 19:18:40 +09:00
Dean Herbert	5e4bea9d99	Fix extra newline	2019-01-10 12:11:14 +09:00
Dean Herbert	4f5c208672	Add UI scale ... Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.	2019-01-09 19:01:33 +09:00
smoogipoo	2c44b928d3	Remove unused references	2019-01-08 16:38:34 +09:00
smoogipoo	daeba63242	Remove more unused code	2019-01-08 16:37:18 +09:00
Dean Herbert	a2a7aa708f	Use better logic for setting slider bar settings	2019-01-08 14:56:42 +09:00
Dean Herbert	01aa4c2a72	Use TransferOnCommit	2019-01-08 13:48:38 +09:00
Dean Herbert	3a10dd47d5	Add preview for gameplay region	2019-01-04 15:28:35 +09:00
Dean Herbert	9c7830d83b	Size -> scale	2019-01-04 14:58:44 +09:00
Dean Herbert	35a6257642	Delay updates when changes would affect mouse position	2019-01-04 14:55:59 +09:00
Dean Herbert	3953f829c8	Add letterbox/screen scaling support	2019-01-04 13:36:02 +09:00
Dean Herbert	63847890d1	Add better messaging when connecting or failing	2018-12-26 18:07:33 +09:00
Dean Herbert	fc5d5a7752	Merge branch 'master' into user-registration	2018-12-14 19:45:27 +09:00
Dean Herbert	4fc9902cd2	Fix reverting to default skin via settings button causing a hard crash	2018-12-12 21:30:21 +09:00
Dean Herbert	1a974f64de	Initial design for user registration dialog	2018-12-05 12:57:26 +09:00
Jan Jurzitza	3f6656e2cd	Merge branch 'master' into shuffle-skin	2018-12-04 12:59:31 +01:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
WebFreak001	89ded824b3	Style fixes	2018-11-28 12:49:17 +01:00
WebFreak001	c4c2191500	Apply requested changes	2018-11-28 12:36:21 +01:00
smoogipoo	a88b69ec43	Notify of existing imports	2018-11-28 20:19:35 +09:00
WebFreak001	17a11212e8	Style fixes	2018-11-25 14:41:39 +01:00
WebFreak001	2b05a61806	Fix crash when reseting skin while in dropdown	2018-11-25 14:24:20 +01:00
WebFreak001	edb45e4e47	Only show random skin button with more than one skin	2018-11-25 14:23:53 +01:00
WebFreak001	6a9187ece0	Fixed style warnings	2018-11-25 04:01:30 +01:00
WebFreak001	f38b68a590	Add action to pick random skin	2018-11-25 03:50:26 +01:00
smoogipoo	cadfe41f83	Merge remote-tracking branch 'origin/master' into external_link_warning	2018-11-23 15:19:52 +09:00
Dean Herbert	7755242a43	Merge branch 'master' into osuTK	2018-11-21 18:53:11 +09:00
smoogipoo	5ad96afea0	Fix crashes when importing/deleting from model managers	2018-11-20 18:09:23 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Roman Kapustin	376e76e00d	Resolve merge conflicts	2018-11-18 16:10:36 +03:00
smoogipoo	f1f2fc133a	Use SkinInfo directly	2018-11-14 19:29:20 +09:00
smoogipoo	aff5fa6169	Update with osu!-side dropdown changes	2018-11-14 18:02:38 +09:00
Roman Kapustin	b4809f4417	External link warning code cleanup	2018-11-01 23:52:07 +03:00
Roman Kapustin	805f8d98c4	Implement warn about opening external links option	2018-10-22 23:57:37 +03:00
Dean Herbert	841b2e8692	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
Dan Balasescu	b1450b1f1a	Merge branch 'master' into fix-3514	2018-10-02 09:24:58 +09:00
AtomCrafty	6c55efdf20	Add true to BindValueChanged call to hide resolution dropdown when starting in windowed mode	2018-10-01 13:12:34 +02:00
Hanamuke	b983e20067	Merge branch 'master' into AR_Catch	2018-09-30 16:01:55 +02:00
Dean Herbert	dafbabec31	Fix import buttons having incorrect mappings when setting disabled states	2018-09-21 21:08:21 +09:00
Dean Herbert	1861547c86	Apply review	2018-09-20 19:01:04 +09:00
Hanamuke	e7d78b94ae	Remove ScrollingVisualisation from settings	2018-09-19 18:30:25 +02:00
smoogipoo	73fb3fa3a4	Fix macOS crashing in fullscreen mode	2018-09-19 17:52:35 +09:00
Joehu	f99eff1192	Use consistent terminology format	2018-09-15 07:30:11 -07:00
Dean Herbert	c1cdff8505	Add default resolution to avoid crashing	2018-09-07 19:29:51 +09:00
Dean Herbert	81da7ce298	Merge branch 'master' into add-skin-import-delete	2018-09-07 16:48:01 +09:00
Dean Herbert	bf0ad723f5	Add default fallback for headless operation	2018-09-07 14:35:38 +09:00
Dean Herbert	f76d00e8ae	Simplify null checks	2018-09-07 14:31:38 +09:00
Dean Herbert	581da108fc	Rewrite to not suck	2018-09-05 11:32:38 +09:00
Dean Herbert	46b6601cbf	Merge remote-tracking branch 'upstream/master' into select_resolution_in_fullscreen_mode	2018-09-05 10:47:34 +09:00
Dean Herbert	5efa9c7652	Fix items in skin settings not always being removed corrrectly	2018-09-03 11:51:03 +09:00
Dean Herbert	144e80dff6	Add "import all skins from stable" option (and mass delete)	2018-09-03 10:10:04 +09:00
smoogipoo	ce367bcc42	Fix invalid GC latency mode being set	2018-08-22 12:02:14 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Roman Kapustin	8f9bf4bd3e	Remove redundant DesktopGameWindow cast	2018-07-10 22:07:32 +03:00
HoutarouOreki	dd20663192	Lesser keyboard steps	2018-07-10 17:28:56 +02:00
Roman Kapustin	699702f8d0	Use DesktopGameWindow.GetCurrentDisplay method	2018-07-09 21:57:31 +03:00
Roman Kapustin	3dbdfcc1e2	Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode	2018-07-09 21:31:46 +03:00
smoogipoo	9f405b0894	Don't hard-bail if config skin doesn't exist anymore	2018-07-02 16:49:07 +09:00
Roman Kapustin	4af45b7518	Do not display resolutions lower than 800x600	2018-06-30 20:06:11 +03:00
Roman Kapustin	5076fe4c20	LayoutSettings: inject OsuGameBase instead of OsuGame	2018-06-23 12:45:13 +03:00
Roman Kapustin	5d26d5d4ed	Fix resolutionDropdown	2018-06-21 20:42:22 +03:00
Roman Kapustin	71371dc4b8	ValueChanged parameters quickfix	2018-06-12 19:27:55 +03:00
UselessToucan	b6c0aa3f26	Merge branch 'master' into select_resolution_in_fullscreen_mode	2018-06-12 18:01:30 +03:00
Roman Kapustin	de7e4328c5	Use bindable size	2018-06-10 16:17:57 +03:00
UselessToucan	4233211fb3	Merge branch 'master' into select_resolution_in_fullscreen_mode	2018-06-08 21:13:41 +03:00
Dean Herbert	0b4f5af52e	Add setting to toggle standardised or exponential scoring display ... Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.	2018-06-08 03:17:12 +09:00
Dean Herbert	1dd5bdcf72	Move setting to new "mods" section	2018-06-06 12:32:59 +09:00
Roman Kapustin	e98f9f1323	Add dropdown for selecting fullscreen resolution	2018-06-02 21:02:45 +03:00
Dean Herbert	9e17eb2342	Reword settings text to be ruleset agnostic	2018-05-21 16:03:08 +09:00
Dean Herbert	76e58a51b9	Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting	2018-04-25 17:28:21 +09:00
Dean Herbert	e395a47112	Changes to naming and text	2018-04-18 19:47:13 +09:00
Dean Herbert	bd834dd487	Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling	2018-04-18 19:46:59 +09:00
Dean Herbert	c9615f837a	Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot	2018-04-16 00:20:06 +09:00
Dean Herbert	a0f9f8d512	Update frramework again	2018-04-13 21:47:50 +09:00
smoogipoo	733f70cbd5	Merge remote-tracking branch 'origin/master' into instant-hide-screenshot	2018-04-13 21:13:09 +09:00
Dean Herbert	9f5a52b641	Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler	2018-04-13 19:54:15 +09:00
Dean Herbert	81f0649e44	Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling	2018-04-13 19:50:44 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
tgi74000	e3cd0ef200	Add right click scrolling in song select (and its option)	2018-04-13 11:09:49 +02:00
smoogipoo	826a8552e5	Reword options item to include "screenshot"	2018-04-13 17:30:02 +09:00
TocoToucan	7c3441e2d0	ActiveInputHandlers -> IgnoredInputHandler	2018-04-12 17:06:35 +03:00
Dean Herbert	903dd7a015	Fix regression causing hard crash ... Regressed in #2373. My bad.	2018-04-11 19:24:19 +09:00
UselessToucan	9225c06872	Merge branch 'master' into hide_menu_cursor	2018-04-09 21:41:54 +03:00
smoogipoo	b97c4e8b44	Fix all possible cases of crossthread import data races	2018-04-09 12:45:44 +09:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	b593c47809	Add setting to toggle performance logging	2018-03-24 05:07:48 +09:00
TocoToucan	dd5cc59250	Introduce 'Capture menu cursor' setting	2018-03-23 22:53:06 +03:00
Dean Herbert	74191e1b73	Merge remote-tracking branch 'upstream/master' into take_screenshot	2018-03-22 20:49:17 +09:00
Dean Herbert	f944c29505	Merge remote-tracking branch 'upstream/master' into take_screenshot	2018-03-21 12:32:27 +09:00
Dean Herbert	ec851648da	Add better ToString output from SkinInfo	2018-03-19 20:06:44 +09:00
TocoToucan	604e725f3f	Remove redundant code	2018-03-16 20:42:05 +03:00
Dean Herbert	afc3646450	Move API configuration hooks out of OsuGameBase ... Also makes username more private, and password completely private.	2018-03-14 10:15:05 +09:00
Vidalee	6d9e78a3a3	Review changes	2018-03-11 22:40:49 +01:00
Vidalee	eed0f3a1de	Added setting to not hide the first object in Hidden mod	2018-03-11 21:02:14 +01:00
TocoToucan	e6c22e2287	Taking screenshot support initial commit	2018-03-10 21:59:20 +03:00
Dean Herbert	402d71a8d9	Add user skin setting storage	2018-02-22 16:29:05 +09:00
Dean Herbert	659cf629b6	Add skin seleciton dropdown to settings	2018-02-22 15:46:11 +09:00
Joseph Madamba	3d4bed462b	Reword sign in text	2018-02-21 20:54:47 -08:00
Dean Herbert	d07ab1fbea	Fix undelete all	2018-02-15 15:14:55 +09:00
Dean Herbert	d3dd31dadb	Make deletion and purging logic even more global	2018-02-15 14:22:39 +09:00
smoogipoo	b500b76407	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +09:00
Dean Herbert	30b9439263	Fix default mouse sensitivity not reverting correctly	2018-02-05 20:00:36 +09:00
Dean Herbert	7e56519d6a	Add setting for absolute input mapping	2018-02-05 16:13:39 +09:00
Dean Herbert	335f0d577c	Add the ability to duck volume when the game is inactive	2018-01-31 18:16:55 +09:00
smoogipoo	441e8aced5	Better namings for the speed change "algorithms"	2018-01-12 17:18:34 +09:00
smoogipoo	6a5a3b01b2	Fix license headers	2018-01-11 12:39:06 +09:00
smoogipoo	86b5591583	Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite	2018-01-10 18:02:49 +09:00
Dean Herbert	c2fadcfc1f	Merge branch 'master' into background-blur	2018-01-09 21:20:05 +09:00
smoogipoo	c4d1922c8b	Add scrolling algorithm to global settings	2018-01-08 11:34:37 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	36e9232472	Merge master into netstandard	2018-01-05 00:42:48 +09:00
Dean Herbert	2354163900	Change icon for audio settings	2018-01-02 12:30:55 +09:00
smoogipoo	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09:00
ColdVolcano	bc90793b1c	Trim whitespace	2017-12-25 19:18:57 -06:00
ColdVolcano	044e4d0acd	Add blur to background in Player	2017-12-25 19:11:49 -06:00
Dean Herbert	3c8d30f8e6	Add a dialog offering to import beatmaps from stable	2017-12-26 00:52:11 +09:00
Dean Herbert	38703e6b85	Merge branch 'master' into add-confirmation-dialog	2017-12-21 22:56:31 +09:00
Aergwyn	bfe986230d	Merge branch 'master' into add-confirmation-dialog	2017-12-18 17:29:06 +01:00
Aergwyn	6ac33e3c00	made DeleteAll-button pink	2017-12-18 17:04:35 +01:00
FreezyLemon	d2b80fdbfc	Moved "undelete all" logic to BeatmapManager and added a progress notification	2017-12-18 10:55:07 +01:00
Dean Herbert	4c45102d61	Merge branch 'master' into undelete-button-add	2017-12-18 16:28:32 +09:00
Dean Herbert	b9298325a3	Rename weird config setting	2017-12-15 14:36:51 +09:00
Dean Herbert	99b00143eb	More clean-ups and event bindings	2017-12-15 14:36:51 +09:00
Aergwyn	59e8536ff7	moved action to construction arguments	2017-12-14 17:33:56 +01:00
Aergwyn	cdf9ea0d01	removed unnecessary variable ... and fixed the test because of new DI letting it fail	2017-12-09 13:39:11 +01:00
Aergwyn	114604a642	removed unused DI	2017-12-08 14:45:40 +01:00
Aergwyn	c97646bea6	added confirmation dialog for Delete ALL beatmaps	2017-12-08 14:27:07 +01:00
FreezyLemon	d93a1fdaae	Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add	2017-12-08 10:30:42 +01:00
smoogipoo	d52b84df46	Move KeyboardStep assignment to ctor	2017-12-07 20:53:28 +09:00
FreezyLemon	bf386598b6	Added a new "undelete" button that restores every beatmap with "DeletePending" set to true.	2017-11-30 10:58:32 +01:00
Nicolas Brassard	36cfa552f4	Fix SensitivitySlider keyboard control	2017-11-29 23:03:26 -08:00
smoogipoo	267bb75458	Merge remote-tracking branch 'Aergwyn/master' into netstandard	2017-11-29 23:45:29 +09:00
Dean Herbert	7877f42763	Merge remote-tracking branch 'upstream/master' into new-sounds-and-more	2017-11-27 17:59:24 +09:00
Dean Herbert	af499df6dd	Make a base OsuButton class to handle default samples	2017-11-26 17:17:48 +09:00
Dean Herbert	09facdc838	Add a setting to toggle showing converted beatmaps	2017-11-24 18:34:20 +09:00
smoogipoo	d2ab0621f3	Make osu.Game + rulesets compile with netstandard	2017-11-19 13:46:51 +09:00
smoogipoo	f461f03b08	Make osu! compile with framework changes	2017-11-16 14:51:31 +09:00
Dean Herbert	c765785d00	Mark several long-running tasks as long-running	2017-10-25 11:42:55 +09:00
Dean Herbert	00bb82215b	Merge branch 'master' into revert-to-default-glow	2017-10-24 10:48:08 +09:00
Dan Balasescu	9eab2deee7	Merge branch 'master' into config-slider-keyboardstep	2017-10-24 10:10:39 +09:00
Dean Herbert	df20845fbb	Share one context per file store for performance reasons ... There is now a CreateContext method for retrieving a stand-alone context for threaded use. We may want to add safety against this context being disposed (or just return a fresh one if it is).	2017-10-23 16:35:35 +09:00
Shane Woolcock	ea2934d92c	Add KeyboardStep values for configuration options	2017-10-23 16:06:08 +10:30
Shane Woolcock	5785af9f6a	Reenable revert indicator on audio device since the potential crash was addressed in #1101	2017-10-22 14:22:57 +10:30
Shane Woolcock	b4d575fbcd	Fix namespace and unnecessary using	2017-10-21 13:22:21 +10:30
Shane Woolcock	290fac8990	Temporarily disable revert functionality for audio device, since it crashes	2017-10-21 13:17:03 +10:30
Shane Woolcock	98044a17d3	Fix misaligned settings buttons	2017-10-21 13:16:06 +10:30
Dean Herbert	acc299c7b9	Correct and simplify RulesetStore	2017-10-16 17:02:31 +09:00
Damnae	2c245f4c22	Merge branch 'master' into storyboard_integration ... # Conflicts: # osu.Game/Configuration/OsuConfigManager.cs # osu.Game/Overlays/Settings/Sections/Graphics/DetailSettings.cs	2017-09-22 12:45:34 +02:00
Dean Herbert	98c22e8111	Merge branch 'master' into master	2017-09-22 15:19:23 +08:00
gabixdev	8438ea1267	Fix formatting ;_;	2017-09-21 22:11:35 +02:00
Damnae	fcaabf7fdf	Merge branch 'master' into storyboard_integration	2017-09-19 17:36:29 +02:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +09:00
gabixdev	e8462ac134	Add option to disable cursor rotation.	2017-09-17 00:47:55 +02:00
Damnae	cb8029af9e	Add a setting to hide storyboards.	2017-09-15 09:16:56 +02:00
Dean Herbert	b7c9819680	Add context menus to chat names and user panels	2017-09-14 15:43:47 +09:00
Dean Herbert	b1145272d1	Update code to support new inspectcode analysis rules	2017-09-14 12:58:32 +09:00
smoogipooo	57678a13d9	Update in-line with framework changes.	2017-09-04 09:32:35 +09:00
Dean Herbert	8e0d18d36f	Add a button to restore all hidden difficulties	2017-09-01 18:26:01 +09:00
Dean Herbert	39b5b04700	Don't use Bindable for AccentColour ... Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.	2017-08-29 18:17:01 +09:00
smoogipooo	fc6c682d88	Update in-line with framework changes.	2017-08-28 14:42:52 +09:00
smoogipooo	66db3389f6	Update in line with framework changes.	2017-08-28 12:49:33 +09:00
Dean Herbert	ee85515d95	Changes in line with framework changes	2017-08-25 19:18:07 +09:00
smoogipooo	b42c9d21fe	Update LoginSettings in line with framework.	2017-08-25 15:57:43 +09:00
Dean Herbert	e4b832e8a6	Fix a possible nullref when login fails	2017-08-18 10:49:41 +09:00
Dean Herbert	71f83dbdfa	Add null check for safety	2017-08-16 22:56:32 +09:00
Dean Herbert	5ebec53970	Integrate key binding config with main settings	2017-08-16 22:56:32 +09:00
Dean Herbert	6ded194c53	Remove all usage of DI to retrieve InputManager ... Uses GetContainingInputManager instead, as per framework changes.	2017-08-15 14:30:50 +09:00
Dean Herbert	fe2911f165	Fix some formatting issues	2017-08-13 10:36:57 +09:00
Dean Herbert	48d4ed55e9	Move a lot of code to framework	2017-08-11 16:11:46 +09:00
Dean Herbert	0d9ea97828	Allow Rulesets to create a non-FontAwesome icon ... This also - Renames TextAwesome to SpriteIcon. - Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).	2017-08-03 14:36:21 +09:00
Dean Herbert	f67822a59b	Add progress for deleting all maps	2017-07-31 18:52:59 +09:00
Dean Herbert	7d4218ea6c	Add option to import from osu-stable ... Also adds an option to delete all beatmaps for testing purposes.	2017-07-28 12:58:35 +09:00
Dean Herbert	5f53426a9a	*Database -> *Store ... Welcome back BeatmapManager	2017-07-27 16:56:41 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Thomas Müller	e68675f970	Rename EasingTypes to Easing	2017-07-22 20:53:53 +02:00
Huo Yaoyuan	6cf36da389	Merge branch 'master' into profile	2017-07-14 22:52:19 +08:00
Dean Herbert	b13e8599f1	Hide the login overlay when the user panel container by it is clicked	2017-07-13 14:46:17 +09:00
Jorolf	f7c9e449d4	add ruleset settings	2017-07-11 20:25:24 +02:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
Dean Herbert	1b0e96f411	Fix some discrepancies when changing settings	2017-06-08 20:57:21 +09:00
Dean Herbert	83cdec3ee6	Merge remote-tracking branch 'upstream/master' into raw-input-osd	2017-06-08 20:41:04 +09:00
Dean Herbert	a454ca606f	Merge remote-tracking branch 'upstream/master' into johnneijzen-master	2017-06-08 20:33:39 +09:00
Dean Herbert	028364b2d9	Add on-screen display support for RawInput and CursorSensitivity ... Also allows resetting both at once using Ctrl+Alt+R. - Depends on https://github.com/ppy/osu-framework/pull/807	2017-06-08 17:58:57 +09:00
Tom94	5f7270ee4b	Use new invalidation rules	2017-06-08 09:53:45 +02:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
John Neijzen	d9a9616125	EOF remove blank spaces	2017-06-08 14:56:03 +08:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
Dean Herbert	09e075e3fb	Allow adjusting mouse sensitivity at 0.01 increments	2017-06-05 20:22:39 +09:00
Dean Herbert	ae7388e68f	Don't update sensitivity when dragging slider	2017-06-05 13:25:18 +09:00
Dean Herbert	ff0888449f	Disable ability to adjust sensitivity when raw input is disabled	2017-06-05 12:13:15 +09:00
Dean Herbert	edead2ad3a	Add settings for toggling raw input and adjusting sensitivity	2017-06-02 20:24:18 +09:00
Patrick Andersson	1dd85b5986	Add alternative for random beatmap selection ... "Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button	2017-05-31 20:11:26 +02:00
Dean Herbert	bab3f1b89a	Merge branch 'master' into user-dropdown-arrow	2017-05-31 15:39:52 +09:00
DrabWeb	cd57343191	Text -> Label	2017-05-31 02:03:13 -03:00
DrabWeb	4fd7405fb8	Fix user dropdown menu item chevron alignment	2017-05-31 01:57:32 -03:00
Dean Herbert	8544b45443	Update in line with framework	2017-05-30 22:23:51 +09:00
Dean Herbert	3644198c6e	Fix CI issues	2017-05-28 21:20:11 +09:00
Dean Herbert	d749fc516d	Update focus handling in line with framework changes	2017-05-28 20:08:46 +09:00
Dean Herbert	9eec2edd30	Fix initial login state not being reflected in user panel	2017-05-25 22:43:33 +09:00
Dean Herbert	1a255fdf48	Fix display order regression	2017-05-25 19:47:18 +09:00
Dean Herbert	be81346573	Attempt to fix inner scope warning	2017-05-25 14:47:25 +09:00
DrabWeb	e22eb1f205	CI fixes	2017-05-24 22:39:07 -03:00
DrabWeb	ec3c92fc3c	Trim whitespace	2017-05-24 22:26:48 -03:00
DrabWeb	9cad344401	Revert back header for login form, fix incorrect spacing on header	2017-05-24 22:02:32 -03:00
DrabWeb	8e09b738b0	Remove magic numbers	2017-05-24 21:51:00 -03:00
DrabWeb	9b863f60ab	Adjust dropdown layout	2017-05-24 21:32:46 -03:00
DrabWeb	efd4c57431	Dropdown actions, +User.Status, +UserStatusDoNotDisturb, properly align UserDropdownMenuItem	2017-05-24 21:09:18 -03:00
DrabWeb	b57a3f2056	Initial layout of user panel and user dropdown	2017-05-24 19:44:48 -03:00
Dean Herbert	3134f92051	Merge branch 'master' into user-panel	2017-05-24 16:32:09 +09:00
DrabWeb	2be1b00a76	Hide status bar when Status is null	2017-05-24 00:45:56 -03:00
DrabWeb	247d8e9b21	Replace "Connected as _" in login form with a UserPanel	2017-05-24 00:23:48 -03:00
EVAST9919	564abc1a5b	using autosize instead of constant height	2017-05-23 14:32:45 +03:00
EVAST9919	165d6ef1bb	Make transition a bit smoother	2017-05-23 12:30:39 +03:00
EVAST9919	c7a241246e	Better letterbox settings transition	2017-05-23 12:09:32 +03:00
Dean Herbert	a34d9d8b09	Oops	2017-05-20 01:14:51 +09:00
Dean Herbert	9c9c0a64fd	Merge branch 'master' into debug-config-rename	2017-05-20 00:45:16 +09:00
Dean Herbert	528d79be51	FrameworkDebugConfig -> DebugSetting	2017-05-19 22:53:26 +09:00
Dean Herbert	04f7acb68a	Add setting checkbox to toggle debug logs	2017-05-19 22:47:15 +09:00
Dean Herbert	1f3039926f	Reword settings text slightly	2017-05-15 12:57:55 +09:00
Dean Herbert	3b87a938db	Merge branch 'master' into cursor_size.	2017-05-15 12:23:49 +09:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
Dean Herbert	eaaba11586	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00