Commit Graph

9288 Commits

Author SHA1 Message Date
6a690908cf Fix up possible nullref due to early access of Parent 2017-12-14 20:24:24 +09:00
15c9e4a446 Update framework 2017-12-14 15:10:39 +09:00
9c59db4be3 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-14 14:20:49 +09:00
7b4bbc6dc5 Merge pull request #1692 from Aergwyn/no-select-on-adding
No longer select Beatmapsets on import/download
2017-12-14 13:58:00 +09:00
2b9898a835 Merge branch 'master' into no-select-on-adding 2017-12-14 13:46:16 +09:00
3bdfe3d60e Merge pull request #1693 from Aergwyn/fix-beatmap-object-count
Fix BeatmapInfoWedge not counting Circles/Sliders correctly
2017-12-14 12:55:23 +09:00
65a6946a9a Update framework 2017-12-14 12:47:47 +09:00
345b67ac85 Remove unnecessary .Except 2017-12-14 12:46:02 +09:00
d4cd835419 correctly count HitObjects for their type
also legacy classes are internal again
2017-12-13 16:32:32 +01:00
1d206f7ec6 add visual tests for BeatmapInfoWedge 2017-12-12 14:44:12 +01:00
c6eaaf658e fix BeatmapInfoWedge not counting Circles/Sliders correctly 2017-12-12 13:24:18 +01:00
9fed972678 removed unnecessary using 2017-12-12 11:15:34 +01:00
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
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
69653c7f4f Don't use nested ternary if 2017-12-12 13:07:34 +09:00
186d347aae Merge branch 'master' into editor-selection-tool 2017-12-11 22:24:12 +09:00
3d51301e03 Add license headers 2017-12-11 22:21:33 +09:00
a6a07b1aa7 Cleanups 2017-12-11 22:20:07 +09:00
666dcdbd62 Give HitObjectComposer a SelectionLayer 2017-12-11 22:20:02 +09:00
a303bf71cf Give control over screen space conversion to DrawableHitObject 2017-12-11 22:19:02 +09:00
2f1063c5c0 Refactor into separate files + add xmldocs + rename some methods 2017-12-11 21:56:58 +09:00
8dea999908 Order difficulty icons by ruleset 2017-12-11 21:35:47 +09:00
b10240d7ef Handle the case where the selected panel is no longer a valid selection better 2017-12-11 21:31:26 +09:00
c12c241633 Implement hover colours 2017-12-11 21:27:19 +09:00
fb92b3551e Correct panel y positions when filtered panels are present 2017-12-11 21:12:06 +09:00
25d80a36be Finish up logical implementation of markers 2017-12-11 21:03:34 +09:00
970e55fc4a Update difficulty icons on headers to match filtered difficulties 2017-12-11 20:49:27 +09:00
f58c554d19 Add per-difficulty filtering support
Filters based on selected ruleset
2017-12-11 20:22:10 +09:00
5147b342dc More refactorings + add markers
Move
2017-12-11 19:07:40 +09:00
47bd97363e Use ShortName for mode.
- Also set the ruleset when fetching scores in BeatmapSetOverlay
2017-12-11 15:05:12 +05:30
b28306d3c0 Fix incorrect SelectionPoint 2017-12-11 18:08:16 +09:00
4573cc3322 Refactor into a new DragBox class, representing a single drag 2017-12-11 17:45:03 +09:00
ccbbd09d84 Merge remote-tracking branch 'upstream/master' into leaderboard-scopes 2017-12-11 13:59:22 +05:30
ce37688cd3 Merge pull request #1688 from smoogipoo/build-task-updates
Update tasks.json to remove warnings
2017-12-11 17:00:16 +09:00
2150fb616c Merge branch 'master' into build-task-updates 2017-12-11 16:51:00 +09:00
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
7189446943 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-11 16:34:27 +09:00
a8c91a89b5 Update tasks.json to remove warnings 2017-12-11 16:32:19 +09:00
3880c7157b Merge branch 'master' into fix-missing-metadata 2017-12-11 16:04:08 +09:00
8769f93929 Merge pull request #1684 from peppy/add-ruleset-shortname
Add ShortName to RulesetInfo
2017-12-11 16:02:11 +09:00
08727266e7 Merge branch 'master' into add-ruleset-shortname 2017-12-11 15:41:11 +09:00
597e87b91d Merge pull request #1683 from UselessToucan/HandleInput
Populate HandleInput
2017-12-11 15:40:33 +09:00
04715f9a51 Merge branch 'master' into HandleInput 2017-12-11 15:24:29 +09:00
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
738d27fd1c Update framework 2017-12-11 15:21:12 +09:00
ed81ed7c54 Add back HandleInput disable overrides 2017-12-11 15:19:00 +09:00
5a6ac73fff Fix broken tools making broken changes 2017-12-11 15:05:19 +09:00
77592ed15f Fix comment formatting 2017-12-11 14:52:15 +09:00
74d261ea11 Update framework 2017-12-11 13:54:27 +09:00
de1f51269d Merge branch 'master' into HandleInput 2017-12-11 13:53:33 +09:00