db34448602
Merge pull request #307 from peppy/general-fixes
...
Fix autosize issues.
2017-02-04 16:00:40 +09:00
448f4d2a10
Update framework.
2017-02-04 15:57:29 +09:00
0d8815bd37
Added back current work
2017-02-03 15:22:02 -04:00
9f9278c837
Fix background colour of dropdown menu item area.
2017-02-03 19:23:14 +09:00
4504440f80
Fix much dropdown shit.
2017-02-03 19:13:10 +09:00
ddea76927f
Better SearchTextBox focus handling.
2017-02-03 19:12:57 +09:00
2ffab66184
Update framework.
2017-02-03 19:12:38 +09:00
fc9badf20f
Fix autosize issues.
2017-02-03 15:22:00 +09:00
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
36cfe54e59
Missing namespace.
2017-02-03 13:16:45 +09:00
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
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
a6fd7f46c3
Merge remote-tracking branch 'upstream/master' into login-updates
2017-02-03 12:48:52 +09:00
4f89cc0784
Merge pull request #298 from peppy/skip-button
...
Make skip button work.
2017-02-03 12:47:53 +09:00
e0868d2edf
Merge pull request #299 from SirCmpwn/song-select-filtering
...
Song select filtering
2017-02-03 12:37:51 +09:00
52fb345e79
Merge branch 'master' into song-select-filtering
2017-02-02 09:25:27 -08:00
437cc834eb
@Tom94 pointed out this problem
2017-02-02 12:23:06 -05:00
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
30801b24c1
Merge pull request #305 from EVAST9919/cursor_size
...
Cursor scale
2017-02-02 21:19:30 +09:00
16dc1460ad
Cursor scale
2017-02-02 14:44:56 +03:00
7337ac93f4
Framework update.
2017-02-02 19:38:01 +09:00
966121a438
Fix keyboard controls not respecting search filter.
2017-02-02 19:37:35 +09:00
0c887d3a46
Fix deselected group remaining visible after search.
2017-02-02 19:24:43 +09:00
aec84ae725
Fix laggy animations, incorrect hiding logic.
2017-02-02 19:24:14 +09:00
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
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
5003b3738a
Remove constant boolean expressions
2017-02-01 19:15:22 -05:00
3c7c3d1cb9
Tidy up GetEnumerable
2017-02-01 19:12:24 -05:00
2d691ca8d5
Use OnChange instead of OnCommit
...
OnCommit only gets fired when focus is lost
2017-02-01 19:12:24 -05:00
90fd9d9132
Merge branch 'master' into options-refactor
2017-02-01 14:07:49 +09:00
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
e94c92b920
Merge branch 'master' into login-updates
2017-02-01 13:23:22 +09:00
42eef9c19a
Merge pull request #304 from DrabWeb/master
...
Fixed quitting not working
2017-02-01 11:47:11 +09:00
0d53d3c4ff
Fixed quitting not working
2017-01-31 22:33:28 -04:00
046732b7e3
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-02-01 10:09:14 +09:00
ea204ad606
Merge pull request #301 from DrabWeb/pause-overlay
...
Pause overlay
2017-02-01 10:07:12 +09:00
3143e9d35e
Fix poorly written BeatmapGroup logic
2017-01-31 20:04:17 -05:00
c92418e000
Made Player.canPause one line
2017-01-31 21:02:58 -04:00
0861eb79e4
Minor cleanups
2017-01-31 19:55:36 -05:00
2c12568a0d
Moved TestCasePauseOverlay's PauseOverlay action setting to the initialiser
2017-01-31 20:51:26 -04:00
b1a55f6b5e
Use OnCommit instead of OnChange simplifies things
2017-01-31 19:48:33 -05:00
f740707712
Initialize previousFilter to string.Empty
2017-01-31 19:45:42 -05:00
13da75f149
Fixed a bug where the user can double press escape to exit the song
2017-01-31 20:44:59 -04:00
35a1479fc1
Fix extra click sound effect
2017-01-31 19:37:00 -05:00
bcd41a2c8f
Moved pause overlay action setting to the initialiser in Player, moved pause overlay displaying be handled in OnExiting instead of OnKeyDown, removed clockWasStarted and used sourceClock.IsRunning instead
2017-01-31 20:28:50 -04:00
624d51204f
Fix issue with background on player
...
Not sure why this only happens on my branch, I didn't touch this code.
2017-01-31 19:14:54 -05:00
4597a765b8
Fix escape key to exit PlaySongSelect
...
This is less than ideal but is the least disruptive solution. The
InputManager itself holds Escape keypresses from getting to anything
else if something is focused.
2017-01-31 19:00:54 -05:00
637a99e8d0
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-31 19:00:50 -05:00
91a5d0b3cf
Made requested changes
2017-01-31 09:17:47 -04:00
ecaa88a0d2
Changed TestCasePauseOverlay to use AddButton and removed background gradient(not needed)
2017-01-31 08:42:14 -04:00
