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
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
bf54ae86ea
Added flash when clicking a PauseButton
2017-01-31 08:07:05 -04:00
1b0914089e
Merge pull request #296 from peppy/add-flash-effects
...
Add flash when activating the osu! logo (and other UI improvements)
2017-01-31 16:22:00 +09:00
aa80989bdf
Update framework.
2017-01-31 15:58:33 +09:00
acdf64e1f7
Remove code to check for other focused controls
2017-01-30 23:08:24 -05:00
5852657205
Refactor out Hidden
...
Also fixes a bug I didn't think about before
2017-01-30 22:35:09 -05:00
fe09bab78f
Removed empty ctor in PauseProgressGraph
2017-01-30 16:18:34 -04:00
9d4a14074f
Woops forgot to add PauseButton
2017-01-30 16:18:11 -04:00
c642660896
Made TestCasePauseOverlay.retryCount reset on Retry, fixed an issue with PauseButton where if the user moved the cursor in/out very fast and clicked than the glow wouldn't fade out
2017-01-30 16:15:56 -04:00
8d294a4eca
Only grab focus if nothing else has it
2017-01-30 14:03:05 -05:00
144a87a247
Fix focus interactions with search text box
2017-01-30 13:56:33 -05:00
09680196c9
SearchTextBox: Don't handle Key.{Enter,Left,Right}
2017-01-30 10:16:55 -05:00
9d07238a7d
Update osu-framework
2017-01-30 10:07:40 -05:00
b32cbdbec2
Relocate enums
2017-01-30 10:07:11 -05:00
fb431fd44e
&&=, unnecessary null check
2017-01-30 09:49:58 -05:00
9a2cba8520
Use null coalesce operator where appropriate
2017-01-30 09:48:21 -05:00
7f3cb381a9
Refactor FilterControl.Search
2017-01-30 09:48:12 -05:00
42a2285ef3
Make BeatmapGroup.Hidden more intelligent
2017-01-30 09:47:04 -05:00
0a81fdbd10
Update null background handling
2017-01-30 09:44:02 -05:00
66d104394f
Add comments around cwd handling
2017-01-30 09:36:26 -05:00
c00a558cb7
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-30 09:35:14 -05:00
2f2f0ed9a3
Fixed an issue with PauseButton's glow not fading in
2017-01-30 09:26:24 -04:00
740f6e5595
Moved delaying resuming to Player
2017-01-30 09:06:26 -04:00
bdbe8501d3
Merge branch 'master' into add-flash-effects
...
# Conflicts:
# osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-30 21:47:05 +09:00
af8294f02c
Renamed/removed various private constants
2017-01-30 08:45:10 -04:00
dbb9078e30
Fixed glow on PauseButton not updating
2017-01-30 08:19:44 -04:00
9ab49247b2
Forgot one
2017-01-30 08:08:38 -04:00
8f6a6143d6
Removed excess parenthesis
2017-01-30 08:07:37 -04:00
ed3ed8251f
Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses
2017-01-30 08:04:39 -04:00
26e9533ff0
Add custom implementation of TextBox.
2017-01-30 20:29:04 +09:00
dcb02eff65
Cleared out PauseProgressGraph
2017-01-30 07:19:14 -04:00
ad33ae9431
Removed unnecessary change
2017-01-30 06:24:44 -04:00
015832f242
Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause
2017-01-30 06:14:28 -04:00
