1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 06:42:54 +08:00
Commit Graph

9176 Commits

Author SHA1 Message Date
Aergwyn
c6eaaf658e fix BeatmapInfoWedge not counting Circles/Sliders correctly 2017-12-12 13:24:18 +01:00
Aergwyn
9fed972678 removed unnecessary using 2017-12-12 11:15:34 +01:00
Aergwyn
d11bf379d8 no longer select beatmapsets on import/download
let's save some ears and eyes for now
2017-12-12 11:04:11 +01:00
Dan Balasescu
a7f5eb0a3d
Merge pull request #1689 from peppy/song-select-ruleset-filter
Filter invalid difficulties at song select
2017-12-12 13:25:57 +09:00
Dean Herbert
69653c7f4f Don't use nested ternary if 2017-12-12 13:07:34 +09:00
Dan Balasescu
186d347aae
Merge branch 'master' into editor-selection-tool 2017-12-11 22:24:12 +09:00
smoogipoo
3d51301e03 Add license headers 2017-12-11 22:21:33 +09:00
smoogipoo
a6a07b1aa7 Cleanups 2017-12-11 22:20:07 +09:00
smoogipoo
666dcdbd62 Give HitObjectComposer a SelectionLayer 2017-12-11 22:20:02 +09:00
smoogipoo
a303bf71cf Give control over screen space conversion to DrawableHitObject 2017-12-11 22:19:02 +09:00
smoogipoo
2f1063c5c0 Refactor into separate files + add xmldocs + rename some methods 2017-12-11 21:56:58 +09:00
FreezyLemon
d0b7c92b46 Removed unnecessary usings. 2017-12-11 13:46:23 +01:00
FreezyLemon
bfa9beb7b2 Switched to regex to handle most of the decision on what to do on click. Also updated the getIdFromUrl method to adapt to the changes 2017-12-11 13:43:47 +01:00
Dean Herbert
8dea999908 Order difficulty icons by ruleset 2017-12-11 21:35:47 +09:00
Dean Herbert
b10240d7ef Handle the case where the selected panel is no longer a valid selection better 2017-12-11 21:31:26 +09:00
smoogipoo
c12c241633 Implement hover colours 2017-12-11 21:27:19 +09:00
Dean Herbert
fb92b3551e Correct panel y positions when filtered panels are present 2017-12-11 21:12:06 +09:00
smoogipoo
25d80a36be Finish up logical implementation of markers 2017-12-11 21:03:34 +09:00
Dean Herbert
970e55fc4a Update difficulty icons on headers to match filtered difficulties 2017-12-11 20:49:27 +09:00
FreezyLemon
8a02507d44 Let regex handle "getIdFromUrl" 2017-12-11 12:40:37 +01:00
Dean Herbert
f58c554d19 Add per-difficulty filtering support
Filters based on selected ruleset
2017-12-11 20:22:10 +09:00
FreezyLemon
63698895a5 Removed unnecessary container and fixed "HandleInput" for ChatLinks 2017-12-11 11:40:04 +01:00
FreezyLemon
bb0a32b555 Removed private OsuHoverContainer "content" from OsuLinkSpriteText for more customization. 2017-12-11 11:28:16 +01:00
smoogipoo
5147b342dc More refactorings + add markers
Move
2017-12-11 19:07:40 +09:00
FreezyLemon
4d475f1c1b Changed it so ChatLinks handle hover and click sounds themselves 2017-12-11 11:05:32 +01:00
FreezyLemon
13bc50ad56 Removed ICanDisableHoverSounds interface 2017-12-11 10:42:36 +01:00
FreezyLemon
2568ac1bf7 Fixed small merging mistake 2017-12-11 10:42:05 +01:00
smoogipoo
b28306d3c0 Fix incorrect SelectionPoint 2017-12-11 18:08:16 +09:00
smoogipoo
4573cc3322 Refactor into a new DragBox class, representing a single drag 2017-12-11 17:45:03 +09:00
FreezyLemon
f8bc52bbe6 Merged https://github.com/ppy/osu master branch 2017-12-11 09:27:54 +01:00
Dean Herbert
ce37688cd3
Merge pull request #1688 from smoogipoo/build-task-updates
Update tasks.json to remove warnings
2017-12-11 17:00:16 +09:00
Dean Herbert
2150fb616c
Merge branch 'master' into build-task-updates 2017-12-11 16:51:00 +09:00
Dean Herbert
f11fbcb4a3
Merge pull request #1567 from Aergwyn/fix-missing-metadata
Store per-difficulty metadata where it differs
2017-12-11 16:40:05 +09:00
smoogipoo
7189446943 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-11 16:34:27 +09:00
smoogipoo
a8c91a89b5 Update tasks.json to remove warnings 2017-12-11 16:32:19 +09:00
Dean Herbert
3880c7157b
Merge branch 'master' into fix-missing-metadata 2017-12-11 16:04:08 +09:00
Dan Balasescu
8769f93929
Merge pull request #1684 from peppy/add-ruleset-shortname
Add ShortName to RulesetInfo
2017-12-11 16:02:11 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname 2017-12-11 15:41:11 +09:00
Dean Herbert
597e87b91d
Merge pull request #1683 from UselessToucan/HandleInput
Populate HandleInput
2017-12-11 15:40:33 +09:00
Dean Herbert
04715f9a51
Merge branch 'master' into HandleInput 2017-12-11 15:24:29 +09:00
Dean Herbert
4fffe32d69
Merge pull request #1657 from Aergwyn/fix-crash-hidden-sets#2
Fix crash if any amount of maps were restored from main menu
2017-12-11 15:23:22 +09:00
smoogipoo
738d27fd1c Update framework 2017-12-11 15:21:12 +09:00
smoogipoo
ed81ed7c54 Add back HandleInput disable overrides 2017-12-11 15:19:00 +09:00
Dean Herbert
5a6ac73fff
Fix broken tools making broken changes 2017-12-11 15:05:19 +09:00
Dean Herbert
77592ed15f
Fix comment formatting 2017-12-11 14:52:15 +09:00
Dean Herbert
74d261ea11 Update framework 2017-12-11 13:54:27 +09:00
Dean Herbert
de1f51269d Merge branch 'master' into HandleInput 2017-12-11 13:53:33 +09:00
Dean Herbert
c880386fde
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-11 13:16:30 +09:00
Dean Herbert
3407645a9f
Merge pull request #1532 from jorolf/most-played-beatmaps-section
Add "most played" section to profile overlay
2017-12-11 13:15:44 +09:00
Dean Herbert
7d8fb12332 DrawableScore -> DrawableProfileScore
Discern between the other class of the same name
2017-12-11 12:51:02 +09:00