RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
6,161 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

51 Commits

Author SHA1 Message Date
Dean Herbert fce580d717 Reshuffle namespaces 2017-07-26 13:22:46 +09:00
Dean Herbert 84f12c722f Merge branch 'master' into master 2017-07-24 18:23:36 +09:00
tgi74000 d0e99f0c95 check removed beatmap being null, check promptdelete beatmap being default 2017-07-24 10:25:33 +02:00
tgi74000 5d30efc090 Do not trigger Random if no Beatmaps are imported 2017-07-24 09:57:12 +02:00
EVAST9919 d9e9ab22db Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel 2017-07-23 13:27:03 +03:00
Thomas Müller e68675f970 Rename EasingTypes to Easing 2017-07-22 20:53:53 +02:00
EVAST9919 388fcfb295 Make BeatmapCarousel inherit from OsuScrollContainer 2017-07-21 13:13:53 +03:00
Dean Herbert 12b6b80d5c Make method to flush filter requests 2017-07-21 17:20:52 +09:00
Dean Herbert fb2f1224b3 Fix carousel filter debounce causing a race condition 
Clicking a ruleset button on toolbar would schedule a delayed filter of carousel, which could in turn trigger a beatmap change after pushing a Player. This resolves that by forcing any pending operations to complete.
 2017-07-21 05:58:58 +09:00
Thomas Müller e84d8cc020 Merge branch 'master' into fix-empty-carousel 2017-07-20 21:15:58 +02:00
Dean Herbert 4f10256182 Remove unnecessary count check 2017-07-20 15:34:44 +09:00
Dean Herbert a59557f039 Fix selection not being reset correct when changing between rulesets 
Carousels filtered to results with no maps visible were not being handled correctly in a few different ways. This covers all those scenarios.
 2017-07-20 15:12:20 +09:00
Dean Herbert 15eb6954da Fix hitting down and enter at song select causing a hard-crash 
Carousel was not aware of the disabled beatmap change state. Also it was being set too late (in an async load) so wasn't useful. It's now pre-emptively set in PlaySongSelect before loading Player.
 2017-07-20 11:50:52 +09:00
Dean Herbert 35157ca6b8 Make DefaultBeatmap private get. 2017-07-19 18:09:59 +09:00
Dean Herbert f168ee660c Move dummy to BeatmapDatabase 2017-07-19 15:16:43 +09:00
Thomas Müller 9d523ea012 Update framework 2017-07-12 11:06:13 +09:00
EVAST9919 5117baae66 Make random works with panels too 2017-06-15 06:37:20 +03:00
EVAST9919 e552c39444 change function to a property 2017-06-11 22:04:35 +03:00
EVAST9919 c3f4b1b3cb Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-11 21:56:55 +03:00
John Neijzen aa3a231763 Review Changes 2017-06-07 22:00:14 +08:00
John Neijzen f9c466eee9 bit more readable 2017-06-07 20:12:16 +08:00
John Neijzen 23a7045eef More Clean UP 2017-06-07 20:07:18 +08:00
John Neijzen 9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
EVAST9919 78500eec21 Applied suggested changes 2017-06-05 12:24:28 +03:00
EVAST9919 a42c67ee97 Cancel beatmap random selection 2017-06-01 20:54:42 +03:00
Patrick Andersson 94294e4b45 Changed default selection type and added suggestions from PR feedback 2017-06-01 08:54:48 +02:00
Patrick Andersson a3945bb11d Added suggestions by code inspector 2017-05-31 22:04:29 +02:00
Patrick Andersson 9592e9778b Trim whitespace 2017-05-31 20:31:05 +02:00
Patrick Andersson 1dd85b5986 Add alternative for random beatmap selection 
"Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button
 2017-05-31 20:11:26 +02:00
MrTheMake 24f64c8815 More formatting 2017-05-24 02:38:05 +02:00
MrTheMake e9c2b51012 Random the difficulty too 2017-05-22 01:59:10 +02:00
MrTheMake 5ef7451dba Improved LEFTand RIGHT key behaviour 2017-05-22 01:53:36 +02:00
MrTheMake 974e8d1f82 Fix pressing up always goes to the first beatmap group difficulty, not the last 2017-05-21 19:27:34 +02:00
MrTheMake 043d1ed20a Updated preload condition to handle special case 2017-05-21 14:08:04 +02:00
MrTheMake 1546bbc66b Updated preload condition. 2017-05-21 13:04:04 +02:00
MrTheMake 44cad4e0ac Fix a bug that prevents the lowest beatmap group from being selected if it is not completly on-screen. 2017-05-21 03:04:12 +02:00
Dean Herbert 7bb38e927b Fix song select reverting to first difficulty of current group on entering 2017-05-17 17:33:20 +09:00
Huo Yaoyuan 767cfaaac3 Access database recursively. 2017-05-06 15:37:53 +08:00
ColdVolcano f2b0602f90 Double check if the selectedpanel is not the provided as argument 2017-05-01 00:13:00 -05:00
Dean Herbert 4e65da0fd1 Fix regression in panel select animation. 
Currently we are required to update computeYPositions twice per selection. Without doing this, panels are in the wrong place when using keyboard selection.

There's still a bit of work to be done to make this work correctly. It's caused by a race condition of state application for panels which have not yet been presented (and get their state applied in LoadComplete which breaks the order of things).
 2017-04-28 22:17:35 +09:00
Dean Herbert 003cf53441 Streamline panel selection event logic. 
Was previously firing multiple times where it was completely unnecessary. Also had bidirection firing going on.
 2017-04-28 20:43:42 +09:00
Dean Herbert b78fa99620 Don't perform a selection if we already have the correct panel selected. 2017-04-28 20:31:09 +09:00
Dean Herbert f2174054ea
Fix song select. 2017-04-18 10:04:32 +09:00
Dean Herbert 4b1588a21d
Fix correct mode filter not being applied when first entering song select. 2017-04-05 17:33:19 +09:00
Dean Herbert 6afa6f30cc
Keep selected beatmap in centre of screen post-filter. 2017-03-29 20:01:46 +09:00
Dean Herbert fa7fd6efe3
Fix mode selector not invoking a re-filter. 2017-03-29 19:48:13 +09:00
Dean Herbert f7dc7e9bb9
Update references. 2017-03-28 21:26:20 +09:00
Dean Herbert 54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
Dean Herbert c7fa79b027
Fix nullref. 2017-03-17 20:09:23 +09:00
Dean Herbert 907236e475
Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria. 2017-03-17 19:54:51 +09:00