11277 Commits

Author SHA1 Message Date
ColdVolcano
1f762dc6d8 Fix PreviewBar receiving a NaN Width value 2017-12-08 15:46:09 -06:00
FreezyLemon
491efe4958 Merge branch 'master' of https://github.com/ppy/osu 2017-12-08 15:35:41 +01:00
FreezyLemon
a01538a313 Merge branch 'master' of https://github.com/freezylemon/osu 2017-12-08 15:33:55 +01: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
Dan Balasescu
9a395882a7
Merge pull request #1672 from peppy/direct-relevance-sorting
Add support for relevance based search results in osu!direct
2017-12-08 22:24:29 +09:00
Dean Herbert
0081c95b0a Update framework 2017-12-08 22:16:15 +09:00
Dean Herbert
c1989dbafe Merge branch 'master' into direct-relevance-sorting 2017-12-08 22:15:57 +09:00
Dan Balasescu
cd9c8d6d52
Merge pull request #1670 from peppy/fix-importing-some-beatmaps
Fix checks disallowing import of older beatmaps with no embedded online IDs
2017-12-08 21:56:54 +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
Dan Balasescu
7584c7df53
Merge pull request #1675 from FreezyLemon/fix-interests-typo
Fixed small typo. (User.Intrerests -> Interests)
2017-12-08 21:13:49 +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
9d3d9bcdc8 Corrected the return values for taiko DrawableHit and DrawableHitStrong (OnPressed == true if new Judgement occurs and is a hit) 2017-12-08 09:42:10 +01: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
40e750f309 Added sample preloading and playing 2017-12-08 08:32:16 +01: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
229c9b5b4e First basic implementation of IKeyBindingHandler for the playfield so it can handle taiko hitsounds 2017-12-07 23:11:34 +01: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
FreezyLemon
5546b8c316 Trimmed whitespace (CI) 2017-12-07 19:55:29 +01:00
FreezyLemon
68255095a6 Renamed the IHasHoverSounds interface to ICanDisableHoverSounds and made it so that if the interface is not implemented, it is just ignored (samples will always be played). If it is implemented, the ShouldPlayHoverSound bool is decisive of whether sounds are played or not 2017-12-07 19:52:40 +01:00
FreezyLemon
c5a7f5b163 Renamed the static variables and made them readonly, aswell as other small adjustments (CI) 2017-12-07 19:39:39 +01:00
FreezyLemon
c950d1359a various CI adjustments 2017-12-07 19:39:13 +01:00
FreezyLemon
34a37935e3 Removed unused property and unnecessary return statement (CI) 2017-12-07 19:38:59 +01:00
FreezyLemon
908553ffaf Added parameter for LoadMultiplayerLobby (CI warning for unused int) 2017-12-07 19:38:03 +01:00
FreezyLemon
e05618a415 Removed unnecessary "using" directives 2017-12-07 19:36:56 +01:00
FreezyLemon
6b0b518fd2 *ahem* REVERTED the changes to GetUserRequest because they're not needed (yet) 2017-12-07 16:58:16 +01:00
FreezyLemon
ce9b003e9a Reverted GetUserRequest because spectating is not implemented yet, and thus the additions are not needed (yet) 2017-12-07 16:52:43 +01:00
FreezyLemon
772bba27be Small style changes 2017-12-07 16:41:46 +01:00
FreezyLemon
465f92af07 Removed unnecessary whitespace 2017-12-07 16:31:02 +01:00
FreezyLemon
2ceb073b5d Renamed OnClick to OnLinkClicked to (what should be) obvious reasons 2017-12-07 16:30:15 +01:00