Commit Graph

377 Commits

Author SHA1 Message Date
5a89ba1040 Make OsuTextBox use OsuSpriteText. 2017-02-08 11:22:46 +09:00
6b011a50d2 Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
50bd80cb0c Update and standardise license headers. 2017-02-07 14:27:41 +09:00
86205c35a4 Fix weird state changes of footer buttons. 2017-02-06 20:46:53 +09:00
8271b139e9 Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01. 2017-02-05 09:40:58 +01:00
ddea76927f Better SearchTextBox focus handling. 2017-02-03 19:12:57 +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
437cc834eb @Tom94 pointed out this problem 2017-02-02 12:23:06 -05: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
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
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
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
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +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
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
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
2ad9377b37 Adjust carousel radius slightly (flyte wanted it). 2017-01-30 16:55:47 +09:00
9f90b57543 Move BPM calculations to Beatmap. 2017-01-30 16:03:45 +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
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
10897486ba Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-27 15:41:46 -05:00
f3c5c1f0b8 Fixes following recent updates upstream 2017-01-26 21:31:28 -05:00
4a7b3cf391 Initial implementation of song select footer area. 2017-01-27 00:36:12 +09:00
678f0aaa16 Implement filtering with strings 2017-01-17 19:18:15 -05:00
75de03bd88 Use OsuColour for green text 2017-01-17 18:26:43 -05:00
46e7bcef8c Improve beatmap import 2017-01-17 17:05:06 -05:00