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
smoogipoo
78d73d4c11
Additional fixes for flow ordering after framework changes
2018-03-06 17:20:58 +09: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
67bd375bfa
Merge remote-tracking branch 'upstream/master' into raw-input-fixes
2018-02-07 22:05:44 +09:00
Shane Woolcock
e0c52c69cf
Prevent revert-to-default OnHover from hiding visual settings at beatmap load
2018-02-06 22:31:30 +10:30
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
39160d895c
Update design of "revert to default" button
...
Also fixes some inconsistencies in padding
2018-02-02 15:18: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
Dean Herbert
188b26472c
Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision
2018-01-12 18:54:36 +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
smoogipoo
c010b48b29
Remove number format specified from OsuSliderBar, override ToolTipText
...
Better/cleaner solution.
2018-01-10 17:29:16 +09:00
smoogipoo
17e7f75aca
More osu!-side bindable fixes
2018-01-10 15:41:13 +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
a1d94d7adf
Merge branch 'master' into sliderbar-tooltip-precision
2018-01-05 20:48:30 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
1571c10c42
Fix up replay settings sliderbar formatting
2018-01-05 14:37:32 +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
Aergwyn
2e196661bb
Merge branch 'master' into add-confirmation-dialog
2017-12-15 18:11:13 +01: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
TocoToucan
219bdbc4e1
Populate HandleInput automatically
2017-12-09 22:21:17 +03: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
0ec10ba32d
CI fixes
2017-11-30 00:11:00 +09: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
8d7c891882
Add hover and click sound effects to settings sidebar buttons
2017-11-26 17:17:49 +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
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +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
smoogipoo
cd8d7af9db
Clean up a few warnings in preparation for net-standard
2017-11-14 13:06:25 +09:00
smoogipoo
04b271cce9
Migrate osu.Game project to VS2017 project structure
2017-10-30 22:24:11 +09:00
Shane Woolcock
22d222354c
Change SettingsItem to use GetBoundCopy to ensure it has the right class for numeric bindables
2017-10-26 18:45:20 +10:30
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
2e6a68d358
Rename indicator class, add colour/fade easing, and add tooltip
2017-10-22 16:12:30 +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
59b10981dc
CI fixes
2017-10-21 17:06:28 +10:30
Shane Woolcock
f5946c0e07
Fix wrong license header
2017-10-21 16:28:03 +10:30
Shane Woolcock
840ba9f48e
Allow the default indicator colour to be specified, and fix bug where disabled bindables could be reset
2017-10-21 16:05:37 +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
Shane Woolcock
2c7343e965
Add revert-to-default glow for settings items
2017-10-21 12:44:47 +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
096f53d769
Use new static IsDebug method
2017-09-19 16:07:00 +09: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
MrTheMake
89b5a6670e
Changed type of IHasFilterTerms.FilterTerms according to framework update
2017-09-13 16:18:02 +02:00
smoogipooo
19db7a8f72
Update in line with framework changes.
2017-09-07 22:46:21 +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
smoogipooo
38a4c84163
Load SettingsSubsection in load()
...
Fixes header not being displayed with variant bindings. This follows what SettingsSection does.
2017-08-23 12:48:53 +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
Thomas Müller
16372d9b45
Merge branch 'master' into key-config-settings
2017-08-16 17:48:00 +09:00
Dean Herbert
25a3835c3c
Cancel pending sidebar expansion when a button is clicked
2017-08-16 17:06:20 +09:00
Dean Herbert
89987229de
Merge remote-tracking branch 'origin/is-alive' into key-config-settings
2017-08-16 15:49:43 +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
dccefe1c0e
Make the settings sidebar optional
...
Also removes an unnecessary secondary list of SidebarButtons by using generic containers.
2017-08-14 14:40:48 +09:00
Dean Herbert
66fa84a451
Make settings more modular
2017-08-14 13:09:59 +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
Thomas Müller
4d8261fe0b
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Huo Yaoyuan
6cf36da389
Merge branch 'master' into profile
2017-07-14 22:52:19 +08:00
Dean Herbert
9dba363b08
Use button boundaries to decide when to expand sidebar
2017-07-14 17:57:01 +09:00
Dean Herbert
2ff92ac25a
Contract sidebar on click
...
Also makes queueing of expand more correct.
2017-07-13 17:09:12 +09:00
Dean Herbert
8460e29bcb
Sidebar now pushes full settings out further
2017-07-13 17:09:12 +09:00
Dean Herbert
fc28617099
Merge remote-tracking branch 'upstream/master' into ruleset-settings
2017-07-13 15:35:53 +09:00
Dean Herbert
de46f3ab07
Remove all unnecessary parenthesis where object initialisers are used
...
Enforces at CI.
2017-07-13 15:11:33 +09: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
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Jorolf
f7c9e449d4
add ruleset settings
2017-07-11 20:25:24 +02:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10: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
Dean Herbert
4ee11764b8
Merge branch 'master' into osu-direct
2017-05-24 12:16:34 +09: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
0634a3a5c5
Merge branch 'master' into osu-direct
2017-05-23 17:33:20 +09:00
Huo Yaoyuan
f06f8b4dcd
Make sidebar buttons working.
2017-05-21 04:33:05 +08:00
Huo Yaoyuan
aa409ac1a9
Move SearchTextBox out of SettingsHeader.
2017-05-21 04:12:16 +08:00
Dean Herbert
0b987be600
Merge branch 'master' into osu-direct
2017-05-20 16:17:59 +09:00
DrabWeb
0a90965a5b
CI formatting
2017-05-19 19:22:42 -03:00
DrabWeb
1d61fc84c7
Remove duplicate code in SettingsEnumDropdown
2017-05-19 17:04:59 -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
Huo Yaoyuan
f1d5a92950
Use generic IEqutable to avoid typeless Equals.
2017-05-16 21:49:38 +08:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +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
