Commit Graph

1408 Commits

Author SHA1 Message Date
3143e9d35e Fix poorly written BeatmapGroup logic 2017-01-31 20:04:17 -05:00
0861eb79e4 Minor cleanups 2017-01-31 19:55:36 -05: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
35a1479fc1 Fix extra click sound effect 2017-01-31 19:37:00 -05: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
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
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
bdbe8501d3 Merge branch 'master' into add-flash-effects
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-30 21:47:05 +09:00
26e9533ff0 Add custom implementation of TextBox. 2017-01-30 20:29:04 +09:00
b4c01f104b Make buttons look closer to the design. 2017-01-30 18:10:30 +09:00
2ad9377b37 Adjust carousel radius slightly (flyte wanted it). 2017-01-30 16:55:47 +09:00
f0d30cc873 Make triangles opaque. 2017-01-30 16:53:12 +09:00
578b33dc64 Merge pull request #300 from peppy/more-beatmap-info
Beatmap details
2017-01-30 16:23:30 +09:00
a315db68ab Remove unused field. 2017-01-30 16:08:31 +09:00
9f90b57543 Move BPM calculations to Beatmap. 2017-01-30 16:03:45 +09:00
8f1e7ef19a Fix non-matching shear angles. 2017-01-30 15:28:47 +09:00
0272c4b559 Add StarDifficulty property and correct colouring of difficulty icons. 2017-01-30 15:26:28 +09:00
1f2f2fa144 Fix visualtests. 2017-01-30 15:15:56 +09:00
2ed5cf7c91 Hook up icons better. 2017-01-30 13:35:40 +09:00
0c2152f3d0 Use beatmap's play mode. 2017-01-30 13:14:02 +09:00
e93f60396f Add the ability for individual game modes to report statistics for display at song select. 2017-01-30 13:12:30 +09:00
3286713d11 avg -> mostly 2017-01-29 15:16:38 +09:00
6027cc7afa Formatting fixes. 2017-01-29 15:15:04 +09:00
2e76874384 Simplify the lookup conditions for hitcircles/sliders (uses duration to discern). 2017-01-29 15:09:42 +09:00
3125fa89ee Fix method which should be class. 2017-01-29 15:06:44 +09:00
77558abf58 Merge branch 'master' into more-beatmap-info
# Conflicts:
#	osu.Game/Screens/Select/BeatmapInfoWedge.cs
2017-01-29 14:47:42 +09:00
800e35b637 Merge pull request #268 from EVAST9919/login_fix
Login improvements
2017-01-28 23:20:32 +09:00
72bc7f8786 Simplify checking 2017-01-28 17:01:11 +03:00
e25b8bb298 Removed explicit methods 2017-01-28 16:56:05 +03:00
f12a8ace3f Moved Config logic to OsuConfigManager 2017-01-28 13:10:05 +03:00
ac7feafe9a Merge branch 'master' into login_fix 2017-01-28 11:24:08 +02:00
10897486ba Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-27 15:41:46 -05:00
6d44c5c8f1 Move logo colour definitions local to their usage. 2017-01-27 17:57:52 +09:00