1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

6338 Commits

Author SHA1 Message Date
Dean Herbert
40587411c1
Merge branch 'master' into add-confirmation-dialog 2017-12-22 00:32:25 +09:00
Dean Herbert
2526ebbbdc
Merge branch 'master' into remove-unnecessary-blocking 2017-12-22 00:18:02 +09:00
Dan Balasescu
ae4abf0f2b
Merge branch 'master' into remove-unnecessary-blocking 2017-12-21 23:55:48 +09:00
Dean Herbert
eb1b1da732
Merge branch 'master' into overlays-block-keyboard 2017-12-21 23:51:46 +09:00
Dean Herbert
57fdbda16d Remove unnecessary IsLoaded check
We are always loaded at this point.
2017-12-21 23:48:48 +09:00
Dean Herbert
65e6206d06 Use local bindable 2017-12-21 23:48:35 +09:00
Dean Herbert
13fee5402a Remove unnecessary using
visual studio doesn't save
2017-12-21 23:20:11 +09:00
Dean Herbert
38703e6b85
Merge branch 'master' into add-confirmation-dialog 2017-12-21 22:56:31 +09:00
Dean Herbert
620e9737c3 Avoid many many unnecessary enumerations 2017-12-21 22:33:16 +09:00
Dean Herbert
a9039c71e0 Merge branch 'master' into undelete-button-add 2017-12-21 22:32:08 +09:00
Dean Herbert
87e790080b Remove manual audio thread synchronisation logic
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Dan Balasescu
5cd2a3950e
Merge branch 'master' into overlays-block-keyboard 2017-12-21 22:15:03 +09:00
smoogipoo
790aa8be2a Merge master into beatmap-serialization 2017-12-21 22:13:53 +09:00
smoogipoo
866d1c6e0f Remove now unused references 2017-12-21 22:13:18 +09:00
Dean Herbert
4bd2c7e95f Fix minor formatting issue 2017-12-21 21:54:46 +09:00
Dean Herbert
abe465358c Fix formatting 2017-12-21 21:46:57 +09:00
naoey
644aaa8167 Unsubscribe from API state change event. 2017-12-21 18:00:10 +05:30
Dean Herbert
63f2436220
Merge branch 'master' into leaderboard-scopes 2017-12-21 21:18:56 +09:00
Dean Herbert
5b596765c8
Merge branch 'master' into dev-overlay-counter 2017-12-21 21:09:40 +09:00
FreezyLemon
e4ead36544 Added completion text 2017-12-21 13:01:14 +01:00
FreezyLemon
cbc1aacf5c Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-21 13:00:11 +01:00
Seokho Song
6fbd06f967 Fix Not update retry counter on PauseOverlay
I've find "You've retried xx time(s)" message that something weird.
That is not displayed pause overlay and only see count on FailOverlay
I change code that PauseContainer.Retries property can be set call-back function.

Signed-off-by: Seokho Song <0xdevssh@gmail.com>
2017-12-21 20:40:31 +09:00
smoogipoo
d80079a73a Merge remote-tracking branch 'origin/master' into beatmap-serialization 2017-12-21 20:15:01 +09:00
Dan Balasescu
50afc6e9c9
Merge branch 'master' into fix-gameplay-menu-blocking 2017-12-21 20:07:14 +09:00
smoogipoo
2fb8895e66 Add spacer to menu 2017-12-21 19:57:09 +09:00
smoogipoo
b2c0b013aa Remove migration setting in favour of export option in the editor 2017-12-21 19:56:12 +09:00
Dean Herbert
052badc1bd Add a right-click context option to carousel panels to view online beatmap details 2017-12-21 19:42:44 +09:00
smoogipoo
a3fcc0b60c Back to using SortedLists 2017-12-21 19:40:41 +09:00
Dean Herbert
1895b16d67 Correctly make fullscreen overlays block keyboard input from drawables behind them
- [ ] Depends on #1711 to get correct global binding handling.
2017-12-21 19:34:20 +09:00
Dean Herbert
b6fd5b0f17 Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay 2017-12-21 19:19:08 +09:00
naoey
01c4b1e544 Maintain a placeholder state and add tests showing all the states.
- Also don't replace placeholder if new one is same as old
2017-12-21 15:27:20 +05:30
Dean Herbert
fdfc596abe
Merge branch 'master' into add-confirmation-dialog 2017-12-21 18:45:52 +09:00
smoogipoo
cb7e192aff Determine SampleInfo defaults in DrawableHitObject 2017-12-21 16:02:33 +09:00
smoogipoo
58859f2ffb Rework registration/instantiation of decoders to not rely on reflection 2017-12-21 15:34:00 +09:00
smoogipoo
22f8853f49 Serialize star difficulty for now 2017-12-21 14:44:51 +09:00
smoogipoo
e8e5e8270b Rename decoder 2017-12-21 14:19:37 +09:00
smoogipoo
bfa4f1a2c3 Apply changes in line with master changes 2017-12-21 13:59:03 +09:00
smoogipoo
c99ea32574 Merge branch 'master' into beatmap-serialization 2017-12-21 13:39:39 +09:00
Dan Balasescu
e051353dad
Merge branch 'master' into add-deselect-mods-button 2017-12-21 11:54:46 +09:00
Dean Herbert
afcb9912e4 Reorder API / logged in checks to make more sense 2017-12-21 03:11:44 +09:00
Dean Herbert
2ff351c6cb Show retrieval failure when OnlineBeatmapID is missing 2017-12-21 03:10:09 +09:00
Aergwyn
ebc2ad55f8 greatly expanded tests for ModSelectOverlay 2017-12-20 19:05:23 +01:00
naoey
85dee3abac Increase GetScoresRequest timeout & leave existing scores when API dies. 2017-12-20 20:48:30 +05:30
naoey
8d24a04641 Remove unused usings. 2017-12-20 20:26:59 +05:30
naoey
c8c8b6810a Kill ugly retry button bounce. 2017-12-20 20:11:48 +05:30
naoey
23f4799840 Create placeholder classes instead of changing Children.
- Add MessagePlaceholder
- Use MessagePlacholder for when API is offline/user isn't a supporter
- Remove unnecessary placeholderFlow field
- Hook into API state changes
2017-12-20 20:00:52 +05:30
Dean Herbert
6d471da459 Remove unnecessary workaround 2017-12-20 21:52:03 +09:00
Dean Herbert
3292ef33fd Fix test edge cases 2017-12-20 21:16:19 +09:00
Dean Herbert
c871a25dfa Remove unnecessary constructure and make ruleset required 2017-12-20 20:41:01 +09:00
Dean Herbert
1b91f24044 Simplify scope logic 2017-12-20 20:33:16 +09:00
Dean Herbert
63dce59c8c Throw an exception if we try and retrieve local scores online 2017-12-20 20:28:00 +09:00
Dean Herbert
21829ba37b
Merge branch 'master' into leaderboard-scopes 2017-12-20 20:17:11 +09:00
Dean Herbert
9940d4630f
Merge branch 'master' into customize-progress-notification 2017-12-20 02:52:57 +09:00
FreezyLemon
3644eda9a9 Changed notification from "installed" to "imported" on beatmap download 2017-12-19 11:34:23 +01:00
Aergwyn
bfe986230d Merge branch 'master' into add-confirmation-dialog 2017-12-18 17:29:06 +01:00
Aergwyn
6ac33e3c00 made DeleteAll-button pink 2017-12-18 17:04:35 +01:00
Dean Herbert
c8afc553cb Fix profile header not correctly being masked
Closes #1592.
2017-12-18 23:55:34 +09:00
Dean Herbert
051a3c4d47 Fix line endings 2017-12-18 21:51:00 +09:00
Dean Herbert
a74ac278fe Merge remote-tracking branch 'upstream/master' into editor-selection-tool 2017-12-18 21:48:01 +09:00
smoogipoo
fabf1bf60a Make the captured objects not update for now
Since this is not the intended functionality.
2017-12-18 19:31:03 +09:00
smoogipoo
5493493f82 FinishCapture -> FinishDrag from Handles 2017-12-18 19:24:41 +09:00
smoogipoo
09c51df2bd Marker* -> Handle 2017-12-18 19:21:26 +09:00
smoogipoo
3999940538 DragSelector -> HitObjectSelectionBox 2017-12-18 19:17:26 +09:00
FreezyLemon
ba614883ea used Any() instead of manually checking count == 0 (CI) 2017-12-18 11:16:57 +01:00
FreezyLemon
f898481523 Changed existing implementations to have a custom CompletionText 2017-12-18 11:14:07 +01:00
smoogipoo
5e111e14db Make it possible to change the overlay actions beyond instantiation 2017-12-18 19:13:25 +09:00
smoogipoo
a17b2e4c18 Expose buttons for test cases 2017-12-18 19:13:08 +09:00
FreezyLemon
7c9d11756e Add the ability to change what text is displayed when a ProgressNotification finishes its task. 2017-12-18 10:59:25 +01:00
FreezyLemon
d2b80fdbfc Moved "undelete all" logic to BeatmapManager and added a progress notification 2017-12-18 10:55:07 +01:00
smoogipoo
918e7c9a4b MenuOverlay -> GameplayMenuOverlay 2017-12-18 16:40:50 +09:00
smoogipoo
cf640d084e Use using 2017-12-18 16:38:15 +09:00
smoogipoo
846750a190 Remove unnecessary flag 2017-12-18 16:36:11 +09:00
smoogipoo
5f538f03ea Comments 2017-12-18 16:34:25 +09:00
smoogipoo
59365bbdce Make MenuOverlay support key selections 2017-12-18 16:34:17 +09:00
Dean Herbert
4c45102d61
Merge branch 'master' into undelete-button-add 2017-12-18 16:28:32 +09:00
smoogipoo
8fdaf6f8f4 Restructure DialogButton to support selection 2017-12-18 14:47:17 +09:00
Dan Balasescu
812181190e
Update SelectionLayer.cs 2017-12-18 14:10:14 +09:00
smoogipoo
f3a5258c5b Reorder file (ctor + bdl) 2017-12-18 14:05:12 +09:00
Dan Balasescu
17c58678cf
Update SelectionInfo.cs 2017-12-18 13:59:46 +09:00
Dan Balasescu
35b6114d01
Merge branch 'master' into editor-selection-tool 2017-12-18 13:57:32 +09:00
Dan Balasescu
57e5b2debe
Merge branch 'master' into add-deselect-mods-button 2017-12-18 13:48:35 +09:00
Dean Herbert
6121cd3b67 Remove animating skipping and reorder file a bit 2017-12-18 12:30:39 +09:00
Dean Herbert
23e014b52d Simplify drawable removal logic 2017-12-18 12:05:49 +09:00
Dean Herbert
b2cd32eb95 Move children to CarouselGroup 2017-12-18 11:57:13 +09:00
Dean Herbert
7173829896 Add filter checks to difficulty selection 2017-12-18 11:43:10 +09:00
Dean Herbert
4c1f00567b Fix incorrect flush logic when starting play from non-selected difficulty using context menu 2017-12-18 11:31:38 +09:00
Dean Herbert
4e46565f6e Remove todo 2017-12-18 11:25:02 +09:00
Dean Herbert
5bfb6d1f58 Remove unused variable 2017-12-18 11:13:51 +09:00
Dean Herbert
b21c22085d Make more things private 2017-12-18 11:13:16 +09:00
Dean Herbert
954bc77a71 Indicate unused variable 2017-12-18 08:05:57 +09:00
Dean Herbert
dfd7787b15 Move more overhead from ctor to BDL 2017-12-18 07:58:48 +09:00
Dean Herbert
c10288541c Avoid redundant IndexOf calls 2017-12-18 07:58:34 +09:00
Dean Herbert
482941b333 Preload drawables to force asynchronous construction 2017-12-18 06:59:32 +09:00
Dean Herbert
30a15729ec Fix event handling from outside carousel being scheduled at the wrong level
Was causing BeatmapSet's Set to run *after* newer events were received.
2017-12-18 02:46:53 +09:00
Dean Herbert
942054a30f Re-fix null selection 2017-12-18 02:26:40 +09:00
Dean Herbert
19643ba5e6 Resolve scroll animation/position issues 2017-12-18 02:23:03 +09:00
Dean Herbert
54cc6fadf9 Greatly improve performance when many hidden panels are on-screen 2017-12-17 05:57:50 +09:00
Dean Herbert
5d7413f19c Improve performance with large numbers of panels visible 2017-12-17 04:30:56 +09:00
Dean Herbert
c02ce16f47 Remove unnecessary capture 2017-12-17 03:04:57 +09:00
Dean Herbert
d27047f94d Remove logging 2017-12-17 03:04:37 +09:00
Dean Herbert
e2710a309c Fix panel animation and depth 2017-12-17 02:43:24 +09:00
Aergwyn
5fbe7dfd8c added Deselect All button to ModSelectOverlay 2017-12-16 17:53:22 +01:00
Dean Herbert
29a8ade59f Rename "Hidden" to "Collapsed" 2017-12-16 23:56:14 +09:00
Dean Herbert
da0940ae0b Only apply criteria if there are items populated in the carousel 2017-12-16 23:55:55 +09:00
Dean Herbert
33f8c8419a Fix initial beatmap selection potentially being incorrect 2017-12-16 21:25:54 +09:00
Ninjaprawn
84ed91d5c9 Remove IgnoreTooltip; Override TooltipText to null 2017-12-16 20:17:20 +11:00
Ninjaprawn
71e59bc9e7 Removed the IgnoreTooltip property 2017-12-16 20:16:40 +11:00
Dean Herbert
bd9056c709 Better choose new selection when multiple items are removed including current 2017-12-16 17:32:21 +09:00
Dean Herbert
59dbca2612 Fix ScrollToSelected being called in too many cases 2017-12-16 16:44:42 +09:00
Dean Herbert
df7e795aa3 Simplify and rename filter methods 2017-12-16 16:27:39 +09:00
Dean Herbert
3c406662ed Ensure correct selection after deletion of currently selected
Also fixes a lot of bad interactions and simplifies further.
2017-12-16 16:18:44 +09:00
Dean Herbert
49ce42d90c Add ToString() overrides on many classes to make debugging easier 2017-12-16 16:14:01 +09:00
Aergwyn
2e196661bb Merge branch 'master' into add-confirmation-dialog 2017-12-15 18:11:13 +01:00
Dean Herbert
a8a2c233a0 Add tests for (and fix) removal of last item in carousel 2017-12-16 00:33:09 +09:00
Dean Herbert
fd9d900ae0 Simplify StarCounter and SpriteIcon 2017-12-15 18:40:03 +09:00
Dean Herbert
acfdd32783 Move DrawableCarouselBeatmap initialisation to BDL
oops
2017-12-15 18:38:09 +09:00
smoogipoo
66b19b6c97 Expose selected objects from SelectionLayer 2017-12-15 14:48:24 +09:00
Dean Herbert
59d512762e SongSelect tidying 2017-12-15 14:44:14 +09:00
Dean Herbert
ed5b6cc16f Add back ctrl-enter autoplay shortcut 2017-12-15 14:44:13 +09:00
Dean Herbert
192ceb5465 Avoid multiple access to selectedBeatmap during y position computation 2017-12-15 14:44:12 +09:00
Dean Herbert
2e3332e3fe Shortcut non-visible panels to avoid adding as drawables 2017-12-15 14:44:12 +09:00
Dean Herbert
48e53a76b0 Fix incorrect line endings 2017-12-15 14:44:11 +09:00
Dean Herbert
67f05977ea Add sorting support 2017-12-15 14:36:51 +09:00
Dean Herbert
b4b2f12116 Add support for adding/removing items
Tests accompany of course
2017-12-15 14:36:51 +09:00
Dean Herbert
7814b2df14 More renaming 2017-12-15 14:36:51 +09:00
Dean Herbert
5cbb9b9b18 Fix random and add tests
Also exposes SelectedBeatmapSet.
2017-12-15 14:36:51 +09:00
Dean Herbert
8646d5d1e0 Add testing and fix filtering only some difficulties 2017-12-15 14:36:51 +09:00
Dean Herbert
ec4f99c92e Clean up tests some more 2017-12-15 14:36:51 +09:00
Dean Herbert
1b85952441 Cleanup and basic TestCase 2017-12-15 14:36:51 +09:00
Dean Herbert
b9298325a3 Rename weird config setting 2017-12-15 14:36:51 +09:00
Dean Herbert
1146ba02d7 Make GetWorkingBeatmap return a sane default rather than exception on lookup failure 2017-12-15 14:36:51 +09:00
Dean Herbert
99b00143eb More clean-ups and event bindings 2017-12-15 14:36:51 +09:00
Dean Herbert
78dd975a35 Initial carousel infrastructue changes 2017-12-15 14:36:51 +09:00
smoogipoo
2c1a83f82e Merge branch 'master' into editor-selection-tool 2017-12-15 13:36:47 +09:00
smoogipoo
33654ee5b4 Remove explicit padding on icon 2017-12-15 13:01:06 +09:00
Aergwyn
f329b1ed72 add Spinner Count to BeatmapInfoWedge
- added Tooltips to the respective InfoLabels
- made the TestCase internal like all others
2017-12-14 19:55:15 +01:00
Aergwyn
59e8536ff7 moved action to construction arguments 2017-12-14 17:33:56 +01:00
smoogipoo
b28b86dea9 Use Lazy for threadsafety on playfield 2017-12-14 20:27:51 +09:00
smoogipoo
9c59db4be3 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-14 14:20:49 +09: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
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
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
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
Dean Herbert
f58c554d19 Add per-difficulty filtering support
Filters based on selected ruleset
2017-12-11 20:22:10 +09:00
smoogipoo
5147b342dc More refactorings + add markers
Move
2017-12-11 19:07:40 +09:00
Unknown
47bd97363e Use ShortName for mode.
- Also set the ruleset when fetching scores in BeatmapSetOverlay
2017-12-11 15:05:12 +05:30
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
naoey
ccbbd09d84 Merge remote-tracking branch 'upstream/master' into leaderboard-scopes 2017-12-11 13:59:22 +05:30
smoogipoo
7189446943 Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-11 16:34:27 +09:00
Dean Herbert
3880c7157b
Merge branch 'master' into fix-missing-metadata 2017-12-11 16:04:08 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname 2017-12-11 15:41:11 +09:00
Dean Herbert
04715f9a51
Merge branch 'master' into HandleInput 2017-12-11 15:24:29 +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
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
7d8fb12332 DrawableScore -> DrawableProfileScore
Discern between the other class of the same name
2017-12-11 12:51:02 +09:00
Dean Herbert
0c2158ccbd Improve display of beatmap thumbnails 2017-12-11 12:47:31 +09:00
Dean Herbert
98ce856de1 Use more sensible names for classes and methods
Adds xmldoc in places too.
2017-12-11 12:33:34 +09:00
Dean Herbert
507d0e3252 Use more sensible names for classes 2017-12-11 12:26:48 +09:00
Dean Herbert
9069f1ccba
Merge branch 'master' into most-played-beatmaps-section 2017-12-11 12:12:23 +09:00
Aergwyn
e629cebe31 fix MusicController ignoring Looping property of a Track
my fix to prevent the MusicController from constantly trying to restart a track before accidentally removed this
2017-12-10 13:22:46 +01:00
FreezyLemon
8cbd6f32cb Moved menu music hash property back to intro and changed check (before undeleting) to "Protected" field. 2017-12-10 11:31:37 +01:00
FreezyLemon
1691a74b14 Merge branch 'undelete-button-add' of https://github.com/freezylemon/osu into undelete-button-add 2017-12-10 11:26:31 +01:00
Aergwyn
e4628427cb moved query into schedule 2017-12-10 08:15:29 +01:00
Dean Herbert
1417dfd67a
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-10 13:28:46 +09:00
Dean Herbert
6b63452a23
Merge branch 'master' into add-testing-tag 2017-12-10 13:09:09 +09:00
Dean Herbert
668299ef84
Merge branch 'master' into fix-userprofile-unranked 2017-12-10 13:02:32 +09:00
Dean Herbert
d02e1ae896 Update RulesetInfo and add migration 2017-12-10 12:15:55 +09:00
TocoToucan
219bdbc4e1 Populate HandleInput automatically 2017-12-09 22:21:17 +03:00
Aergwyn
cdf9ea0d01 removed unnecessary variable
and fixed the test because of new DI letting it fail
2017-12-09 13:39:11 +01:00
Aergwyn
821154d3bb reverted Beatmaps-setter back to its former glory 2017-12-09 08:42:59 +01:00
Dean Herbert
16b8c9bd11
Merge branch 'master' into fix-crash-hidden-sets#2 2017-12-09 11:51:47 +09:00
ColdVolcano
1f762dc6d8 Fix PreviewBar receiving a NaN Width value 2017-12-08 15:46:09 -06:00
Aergwyn
114604a642 removed unused DI 2017-12-08 14:45:40 +01:00
Aergwyn
c97646bea6 added confirmation dialog for Delete ALL beatmaps 2017-12-08 14:27:07 +01:00
Dean Herbert
c1989dbafe Merge branch 'master' into direct-relevance-sorting 2017-12-08 22:15:57 +09:00
Dean Herbert
4160c10921
Merge branch 'master' into direct-relevance-sorting 2017-12-08 21:18:18 +09:00
Dean Herbert
40652d2e74
Merge branch 'master' into fix-importing-some-beatmaps 2017-12-08 21:18:01 +09:00
Aergwyn
dde7678095 select beatmap on import/download 2017-12-08 13:09:30 +01:00
FreezyLemon
856b56d79c Fixed small typo. 2017-12-08 12:54:36 +01:00
FreezyLemon
e1c04a1f44 Added check for "menu music beatmap hash" before undeleting so circles.osu doesn't get imported on Undelete. Also moved the const property to BeatmapManager. 2017-12-08 12:50:04 +01:00
Aergwyn
3e417d8e30 removed specific AddBeatmap method
the way UpdateBeatmapSet was extended it can handle all of this and better
2017-12-08 12:47:28 +01:00
FreezyLemon
b1270a84f8 Added handling for rank == 0 (unranked), removed "#0" from country name if that happens, also display "no rank" when hovering over history instead of "#0" 2017-12-08 11:31:32 +01:00
FreezyLemon
4a723f7382 Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files 2017-12-08 11:05:00 +01:00
Dean Herbert
679134c030 Add ShortName to rulesets 2017-12-08 18:55:25 +09:00
Dean Herbert
51dc66df12 Add support for relevance based search results in osu!direct 2017-12-08 18:48:36 +09:00
FreezyLemon
d93a1fdaae Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-08 10:30:42 +01:00
FreezyLemon
4b3cf0773d Various CI adjustments 2017-12-08 09:52:58 +01:00
smoogipoo
5341e79102 Remove SelectionDragger for now 2017-12-08 17:51:15 +09:00
FreezyLemon
61a6a2919e Fixed multiple critical bugs and changed allSamples to a normal Dictionary for faster access 2017-12-08 09:41:13 +01:00
smoogipoo
faa921ba05 Fix up post-merge issues 2017-12-08 17:41:10 +09:00
FreezyLemon
9e3d439f0a Merge branch 'master' of https://github.com/ppy/osu into taiko-hitsounds-fix 2017-12-08 08:30:02 +01:00
Dean Herbert
31884a951a Remove "redundant" parenthesis 2017-12-08 15:53:59 +09:00
smoogipoo
f41af191ed Merge remote-tracking branch 'origin/master' into editor-selection-tool 2017-12-08 15:13:18 +09:00
Dean Herbert
2e1dfa16a2 Fix checks disallowing import of older beatmaps with no embedded online IDs 2017-12-08 14:59:32 +09:00
Ninjaprawn
a491710fe4 Override IgnoreTooltip in DisplayableModIcon 2017-12-08 14:10:23 +11:00
Ninjaprawn
9b3e666a07 Added IgnoreTooltip to all classes required 2017-12-08 14:10:23 +11:00
Ninjaprawn
f5bea077a0 Subclass ModIcon to remove the tooltip text 2017-12-08 11:26:34 +11:00
FreezyLemon
d2f3d5a807 Added basic SampleInfo.FromSoundPoint and GetChannel methods 2017-12-07 23:09:51 +01:00
Aergwyn
105d01d85b fix crash when restoring from any non-SongSelect-screen
removed unwanted refresh
2017-12-07 22:02:53 +01:00
FreezyLemon
43c270ea49 Rolled back the bad earlier implementation 2017-12-07 21:18:51 +01:00
Aergwyn
95955d68ef rephrased description of local context checking 2017-12-07 14:14:50 +01:00
Aergwyn
1dcbfab18e removed redundant comment 2017-12-07 13:56:37 +01:00
Aergwyn
76c09ae59e added comments for local context checking 2017-12-07 13:44:47 +01:00
Dan Balasescu
9e37a122e1
Merge branch 'master' into fix-sensitivityslider 2017-12-07 21:01:53 +09:00
smoogipoo
d52b84df46 Move KeyboardStep assignment to ctor 2017-12-07 20:53:28 +09:00
smoogipoo
46cd6fdb45 Merge remote-tracking branch 'origin/master' into fix-sensitivityslider 2017-12-07 20:49:48 +09:00
Dean Herbert
24b3b10942 Move drawable assignment to load, remove depth overrides 2017-12-07 20:44:55 +09:00
Dean Herbert
8c89354b36 Remove extra whitespace 2017-12-07 20:44:38 +09:00
Dean Herbert
d36982b1d9
Merge branch 'master' into header-button-should-derive 2017-12-07 20:04:41 +09:00
Dean Herbert
f2eef6621a
Merge branch 'master' into fix-missing-metadata 2017-12-07 19:23:51 +09:00
Dean Herbert
c35c8263b9 Merge remote-tracking branch 'upstream/master' into input-revamp 2017-12-07 18:07:26 +09:00
Dean Herbert
2a1a9b9f1f Fix post-merge issue 2017-12-07 17:26:39 +09:00
smoogipoo
bdf283a4e1 A bit more cleanup 2017-12-07 15:55:38 +09:00
smoogipoo
09f54b06ac Just don't serialize Author altogether for now 2017-12-07 15:55:22 +09:00
smoogipoo
0ba8988580 Don't serialize Author + add SerializableAttributes 2017-12-07 15:32:39 +09:00
Dean Herbert
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag 2017-12-07 15:30:50 +09:00
smoogipoo
e573db04d4 Don't serialize HitObject.Kiai 2017-12-07 14:42:36 +09:00
smoogipoo
f5f7658e90 Don't serialize TotalBreakTime 2017-12-07 14:40:28 +09:00
smoogipoo
245b5f759f Underscore + lowercase all keys 2017-12-07 14:37:12 +09:00
Dean Herbert
a78441bc5a Apply changes in line with framework input adjustments 2017-12-07 13:16:59 +09:00
smoogipoo
dfc10d42e8 Merge remote-tracking branch 'origin/master' into beatmap-serialization 2017-12-07 12:49:27 +09:00
smoogipoo
d026587a91 Add flag to explicitly serialize the type version 2017-12-07 12:49:16 +09:00
smoogipoo
9e51480aa3 Cleanup TypedListConverter a bit 2017-12-07 12:27:30 +09:00
smoogipoo
f1dbcc4f1a Remove misleading comments 2017-12-07 12:23:53 +09:00
smoogipoo
feef4b1890 Add license header 2017-12-07 12:18:00 +09:00
smoogipoo
fcfdbc8e07 Don't show the migrate button on deployed builds for now 2017-12-07 12:02:48 +09:00
smoogipoo
851c20aff0 Add a few comments 2017-12-07 11:17:32 +09:00
smoogipoo
ea2c67ca5f Fix incorrect serialization condition 2017-12-07 11:10:46 +09:00
smoogipoo
9597f9d46b Resharper cleanup 2017-12-07 11:10:20 +09:00
smoogipoo
0e3b001b13 Make maps with storyboards decode correctly with OsuJsonDecoder 2017-12-07 10:37:51 +09:00
Dan Balasescu
9c4ca46786
Merge branch 'master' into shader-precompile 2017-12-07 04:15:24 +09:00
smoogipoo
a8db3a9484 Add progress notification to migration 2017-12-07 04:09:03 +09:00
smoogipoo
41b607c165 Dont serialize hitobject sample properties copied from the control point 2017-12-07 03:40:43 +09:00
smoogipoo
9787788081 Revert unintended change 2017-12-07 03:39:43 +09:00
smoogipoo
4232a54b32 Make TypedListConverter not reconstruct serializers 2017-12-07 03:04:56 +09:00
smoogipoo
b6b26cfe25 Add basic method to migrate beatmaps to the new JSON format 2017-12-07 03:04:36 +09:00