1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 17:02:55 +08:00
Commit Graph

46135 Commits

Author SHA1 Message Date
DrabWeb
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
Drew DeVault
8d294a4eca Only grab focus if nothing else has it 2017-01-30 14:03:05 -05:00
Drew DeVault
144a87a247 Fix focus interactions with search text box 2017-01-30 13:56:33 -05:00
Drew DeVault
09680196c9 SearchTextBox: Don't handle Key.{Enter,Left,Right} 2017-01-30 10:16:55 -05:00
Drew DeVault
9d07238a7d Update osu-framework 2017-01-30 10:07:40 -05:00
Drew DeVault
b32cbdbec2 Relocate enums 2017-01-30 10:07:11 -05:00
Drew DeVault
fb431fd44e &&=, unnecessary null check 2017-01-30 09:49:58 -05:00
Drew DeVault
9a2cba8520 Use null coalesce operator where appropriate 2017-01-30 09:48:21 -05:00
Drew DeVault
7f3cb381a9 Refactor FilterControl.Search 2017-01-30 09:48:12 -05:00
Drew DeVault
42a2285ef3 Make BeatmapGroup.Hidden more intelligent 2017-01-30 09:47:04 -05:00
Drew DeVault
0a81fdbd10 Update null background handling 2017-01-30 09:44:02 -05:00
Drew DeVault
66d104394f Add comments around cwd handling 2017-01-30 09:36:26 -05:00
Drew DeVault
c00a558cb7 Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-30 09:35:14 -05:00
Dean Herbert
4cf2993db1 Fix lack of visibility check causing weird hover regions. 2017-01-30 23:25:37 +09:00
Dean Herbert
2aa924c104 Fix global hover regression. 2017-01-30 23:24:30 +09:00
Dean Herbert
74366c620b Move login screen to toolbar and update design (still not fully implemented).
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
#	osu.Game/Overlays/Toolbar/Toolbar.cs
2017-01-30 22:55:35 +09:00
Dean Herbert
b2ec3508d5 Add shadow to opaque toolbar elements. 2017-01-30 22:54:36 +09:00
Dean Herbert
cbd6fe3f36 Move definition of MusicController's position out of itself. 2017-01-30 22:54:33 +09:00
DrabWeb
2f2f0ed9a3 Fixed an issue with PauseButton's glow not fading in 2017-01-30 09:26:24 -04:00
DrabWeb
740f6e5595 Moved delaying resuming to Player 2017-01-30 09:06:26 -04:00
Dean Herbert
bdbe8501d3 Merge branch 'master' into add-flash-effects
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-30 21:47:05 +09:00
DrabWeb
af8294f02c Renamed/removed various private constants 2017-01-30 08:45:10 -04:00
DrabWeb
dbb9078e30 Fixed glow on PauseButton not updating 2017-01-30 08:19:44 -04:00
DrabWeb
9ab49247b2 Forgot one 2017-01-30 08:08:38 -04:00
DrabWeb
8f6a6143d6 Removed excess parenthesis 2017-01-30 08:07:37 -04:00
DrabWeb
ed3ed8251f Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses 2017-01-30 08:04:39 -04:00
Dean Herbert
26e9533ff0 Add custom implementation of TextBox. 2017-01-30 20:29:04 +09:00
DrabWeb
dcb02eff65 Cleared out PauseProgressGraph 2017-01-30 07:19:14 -04:00
DrabWeb
ad33ae9431 Removed unnecessary change 2017-01-30 06:24:44 -04:00
DrabWeb
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
Dean Herbert
b4c01f104b Make buttons look closer to the design. 2017-01-30 18:10:30 +09:00
DrabWeb
62282076c7 Changes on PauseButton to match design closer 2017-01-30 05:04:57 -04:00
DrabWeb
f8cbc35f8e Small cleanups 2017-01-30 04:43:06 -04:00
DrabWeb
d70cbd37dd Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player 2017-01-30 04:08:14 -04:00
Dean Herbert
2ad9377b37 Adjust carousel radius slightly (flyte wanted it). 2017-01-30 16:55:47 +09:00
Dean Herbert
f0d30cc873 Make triangles opaque. 2017-01-30 16:53:12 +09:00
Dean Herbert
578b33dc64 Merge pull request #300 from peppy/more-beatmap-info
Beatmap details
2017-01-30 16:23:30 +09:00
Dean Herbert
a315db68ab Remove unused field. 2017-01-30 16:08:31 +09:00
Dean Herbert
9f90b57543 Move BPM calculations to Beatmap. 2017-01-30 16:03:45 +09:00
Dean Herbert
8f1e7ef19a Fix non-matching shear angles. 2017-01-30 15:28:47 +09:00
Dean Herbert
0272c4b559 Add StarDifficulty property and correct colouring of difficulty icons. 2017-01-30 15:26:28 +09:00
Dean Herbert
1f2f2fa144 Fix visualtests. 2017-01-30 15:15:56 +09:00
Dean Herbert
2ed5cf7c91 Hook up icons better. 2017-01-30 13:35:40 +09:00
Dean Herbert
0c2152f3d0 Use beatmap's play mode. 2017-01-30 13:14:02 +09:00
Dean Herbert
e93f60396f Add the ability for individual game modes to report statistics for display at song select. 2017-01-30 13:12:30 +09:00
DrabWeb
28967cf77a Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups 2017-01-29 05:04:48 -04:00
Dean Herbert
3286713d11 avg -> mostly 2017-01-29 15:16:38 +09:00
Dean Herbert
6027cc7afa Formatting fixes. 2017-01-29 15:15:04 +09:00
Dean Herbert
2e76874384 Simplify the lookup conditions for hitcircles/sliders (uses duration to discern). 2017-01-29 15:09:42 +09:00
Dean Herbert
3125fa89ee Fix method which should be class. 2017-01-29 15:06:44 +09:00