Dean Herbert
fe86a9e431
Merge pull request #317 from Tom94/fix-login-button
...
Fix incorrect sizing of login button.
2017-02-05 23:43:15 +09:00
Dean Herbert
65feda0505
Merge pull request #315 from Tom94/better-visibility
...
Better visibility
2017-02-05 23:39:02 +09:00
Thomas Müller
a69c306334
Merge branch 'master' of github.com:ppy/osu into fix-login-button
2017-02-05 15:28:44 +01:00
Thomas Müller
6d59429c29
Merge branch 'master' of github.com:ppy/osu into better-visibility
2017-02-05 15:28:10 +01:00
Thomas Müller
faf6461f30
Update framework.
2017-02-05 15:24:19 +01:00
Thomas Müller
f477b7d8a0
Update framework.
2017-02-05 15:22:57 +01:00
Thomas Müller
ba38a27274
Fix incorrect sizing of login button.
...
When logging in or out the size of the login button would not correctly update,
resulting in a messed-up flow of toolbar buttons. This branch fixes the problem
by avoiding an invalidation-chain-breaking override of Size. Instead, the loginOverlay
bypasses auto sizing by using a new framework feature.
2017-02-05 15:17:54 +01:00
Dean Herbert
65471364a7
Merge pull request #313 from default0/default0/beatmap-import
...
Implement Beatmap Import via drag&drop
2017-02-05 22:37:42 +09:00
default0
299c4923c3
Implement Beatmap Import via drag&drop
2017-02-05 13:32:08 +01:00
Dean Herbert
beddf5cd6d
Merge pull request #316 from EVAST9919/overlay_buttons
...
Better look of PauseButton
2017-02-05 21:08:18 +09:00
Andrey Zavadskiy
43dcf0bbc1
PauseButton Triangles
2017-02-05 13:47:37 +03:00
Thomas Müller
8271b139e9
Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.
2017-02-05 09:40:58 +01:00
Thomas Müller
aae5f4f9e2
Fix volume control not showing is mouse-wheel is turned during its fade-out animation.
2017-02-05 09:40:12 +01:00
Thomas Müller
52f6a09319
Merge pull request #312 from peppy/general-fixes
...
General fixes.
2017-02-04 15:08:35 +01:00
Dean Herbert
d97f02a219
Cursor becomes vector.
2017-02-04 22:56:56 +09:00
Dean Herbert
714c94b7a8
Fix toolbar sizing hackiness.
2017-02-04 22:27:05 +09:00
Dean Herbert
57d97ba2e9
Make triangles look better in many cases.
2017-02-04 22:09:44 +09:00
Dean Herbert
0fefa50b54
Add padding beneath sliders in options.
2017-02-04 20:57:08 +09:00
Dean Herbert
97d52188b2
Make sliderbar lines smoother when scrolling.
2017-02-04 20:56:14 +09:00
Dean Herbert
1e3266a9d2
Fix sliderbar lines lagging behind nub.
2017-02-04 20:55:26 +09:00
Dean Herbert
ce689032c7
Update framework.
2017-02-04 20:55:03 +09:00
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
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
