Dean Herbert
bbda20c90d
Merge pull request #310 from Tom94/better-option-sliders
...
Re-use checkbox nub for option sliders and slightly re-structure.
2017-02-04 20:13:01 +09:00
Thomas Müller
1913ec659a
Merge branch 'master' of github.com:ppy/osu into better-option-sliders
2017-02-04 12:07:21 +01:00
Thomas Müller
d6714324df
OsuNub -> Nub.
2017-02-04 12:06:53 +01:00
Dean Herbert
5fcad99682
Merge pull request #311 from Tom94/better-smoothness
...
Use MaskingSmoothness to make masked diagonal edges smoother.
2017-02-04 20:02:41 +09:00
Thomas Müller
42ea3ea04f
Update framework.
2017-02-04 11:51:46 +01:00
Thomas Müller
6db70f8850
Use MaskingSmoothness to make masked diagonal edges smoother.
2017-02-04 11:06:26 +01:00
Thomas Müller
f4dfc477f4
Update framework.
2017-02-04 10:04:01 +01:00
Thomas Müller
0edc64a08c
Re-use checkbox nub for option sliders and slightly re-structure.
2017-02-04 09:50:58 +01:00
Dean Herbert
e00581d838
Merge pull request #309 from peppy/general-fixes
...
Uncomment corner radius post-fix.
2017-02-04 16:09:07 +09:00
Dean Herbert
c24edb583f
Uncomment corner radius post-fix.
2017-02-04 16:05:24 +09:00
Dean Herbert
db34448602
Merge pull request #307 from peppy/general-fixes
...
Fix autosize issues.
2017-02-04 16:00:40 +09:00
Dean Herbert
448f4d2a10
Update framework.
2017-02-04 15:57:29 +09:00
DrabWeb
0d8815bd37
Added back current work
2017-02-03 15:22:02 -04:00
Dean Herbert
9f9278c837
Fix background colour of dropdown menu item area.
2017-02-03 19:23:14 +09:00
Dean Herbert
4504440f80
Fix much dropdown shit.
2017-02-03 19:13:10 +09:00
Dean Herbert
ddea76927f
Better SearchTextBox focus handling.
2017-02-03 19:12:57 +09:00
Dean Herbert
2ffab66184
Update framework.
2017-02-03 19:12:38 +09:00
Dean Herbert
fc9badf20f
Fix autosize issues.
2017-02-03 15:22:00 +09:00
Dean Herbert
3f9b5ee6cb
Merge pull request #303 from peppy/options-refactor
...
Global shadows and more sane font size setting.
2017-02-03 13:20:51 +09:00
Dean Herbert
36cfe54e59
Missing namespace.
2017-02-03 13:16:45 +09:00
Dean Herbert
16a01abc4d
Merge remote-tracking branch 'upstream/master' into options-refactor
...
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/KeyCounter.cs
2017-02-03 13:16:07 +09:00
Dean Herbert
1f8df447c7
Merge pull request #302 from peppy/login-updates
...
Move login screen to toolbar and update design (still not fully implemented).
2017-02-03 13:10:05 +09:00
Dean Herbert
a6fd7f46c3
Merge remote-tracking branch 'upstream/master' into login-updates
2017-02-03 12:48:52 +09:00
Dean Herbert
4f89cc0784
Merge pull request #298 from peppy/skip-button
...
Make skip button work.
2017-02-03 12:47:53 +09:00
Dean Herbert
e0868d2edf
Merge pull request #299 from SirCmpwn/song-select-filtering
...
Song select filtering
2017-02-03 12:37:51 +09:00
Drew DeVault
52fb345e79
Merge branch 'master' into song-select-filtering
2017-02-02 09:25:27 -08:00
Drew DeVault
437cc834eb
@Tom94 pointed out this problem
2017-02-02 12:23:06 -05:00
Drew DeVault
5136d10e0e
Merge pull request #1 from peppy/song-select-filtering-fixes
...
Fixes inconsistencies and shortcomings of filtering.
2017-02-02 06:54:26 -08:00
Dean Herbert
30801b24c1
Merge pull request #305 from EVAST9919/cursor_size
...
Cursor scale
2017-02-02 21:19:30 +09:00
Andrey Zavadskiy
16dc1460ad
Cursor scale
2017-02-02 14:44:56 +03:00
Dean Herbert
7337ac93f4
Framework update.
2017-02-02 19:38:01 +09:00
Dean Herbert
966121a438
Fix keyboard controls not respecting search filter.
2017-02-02 19:37:35 +09:00
Dean Herbert
0c887d3a46
Fix deselected group remaining visible after search.
2017-02-02 19:24:43 +09:00
Dean Herbert
aec84ae725
Fix laggy animations, incorrect hiding logic.
2017-02-02 19:24:14 +09:00
Drew DeVault
c88a2fbf8a
Replace incorrectly removed background logic
...
I had earlier thought that removing this would solve the weirdness with
starting the beatmap on any but the first difficulty, and forgot to
replace it when I found the actual cause.
2017-02-01 19:32:30 -05:00
Drew DeVault
9f9245cee3
Fix use of previous value in Alpha check
...
Frustratingly, this does not fix the problem of ghost groups
2017-02-01 19:28:08 -05:00
Drew DeVault
5003b3738a
Remove constant boolean expressions
2017-02-01 19:15:22 -05:00
Drew DeVault
3c7c3d1cb9
Tidy up GetEnumerable
2017-02-01 19:12:24 -05:00
Drew DeVault
2d691ca8d5
Use OnChange instead of OnCommit
...
OnCommit only gets fired when focus is lost
2017-02-01 19:12:24 -05:00
Dean Herbert
90fd9d9132
Merge branch 'master' into options-refactor
2017-02-01 14:07:49 +09:00
Dean Herbert
7ce5fc08ee
Merge branch 'master' into skip-button
...
# Conflicts:
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
Dean Herbert
e94c92b920
Merge branch 'master' into login-updates
2017-02-01 13:23:22 +09:00
Dean Herbert
42eef9c19a
Merge pull request #304 from DrabWeb/master
...
Fixed quitting not working
2017-02-01 11:47:11 +09:00
DrabWeb
0d53d3c4ff
Fixed quitting not working
2017-01-31 22:33:28 -04:00
Dean Herbert
046732b7e3
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-02-01 10:09:14 +09:00
Dean Herbert
ea204ad606
Merge pull request #301 from DrabWeb/pause-overlay
...
Pause overlay
2017-02-01 10:07:12 +09:00
Drew DeVault
3143e9d35e
Fix poorly written BeatmapGroup logic
2017-01-31 20:04:17 -05:00
DrabWeb
c92418e000
Made Player.canPause one line
2017-01-31 21:02:58 -04:00
Drew DeVault
0861eb79e4
Minor cleanups
2017-01-31 19:55:36 -05:00
DrabWeb
2c12568a0d
Moved TestCasePauseOverlay's PauseOverlay action setting to the initialiser
2017-01-31 20:51:26 -04:00
