Commit Graph

2333 Commits

Author SHA1 Message Date
miterosan 66378d5847 Remove the highlight from "Start Chat" 2018-07-09 18:58:10 +02:00
miterosan 5e95995429 Rename chat to channel 2018-07-09 18:30:41 +02:00
miterosan 709d134f49 Rename DrawableChat to DrawableChannel 2018-07-09 18:23:40 +02:00
miterosan cd0fe6a09e Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseChatLink.cs
2018-06-17 14:15:14 +02:00
Dean Herbert db9141a6cf
Merge branch 'master' into fix-music-controller-drag 2018-06-15 17:08:01 +09:00
Dean Herbert 8b5a9c3236
Merge branch 'master' into fix-volume-pixellation 2018-06-15 16:45:15 +09:00
Dean Herbert 1c27ef644a Fix music controller drag activating from anywhere on the screen 2018-06-15 16:12:11 +09:00
Joehu 069d939e29 Remove "from" prefix from sources on direct panels 2018-06-14 21:53:01 -07:00
Dean Herbert b318b770d4 Fix pixellation of volume meter progress bars 2018-06-13 19:22:39 +09:00
Dan Balasescu 80ec0b1839
Merge branch 'master' into populate-missing-online-ids 2018-06-12 14:03:23 +09:00
Dean Herbert ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
Dan Balasescu 0a35a81c2d
Merge branch 'master' into populate-missing-online-ids 2018-06-12 13:11:21 +09:00
Dan Balasescu 7de8e1cfc4
Merge branch 'master' into refactor-api 2018-06-11 18:49:15 +09:00
Dan Balasescu 78daf1c7ad
Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:19:33 +09:00
smoogipoo 14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
smoogipoo f4fbf27d42 Give ruleset settings a ruleset-specific config manager 2018-06-11 13:28:50 +09:00
Dean Herbert a880e626d8 Use for loop and SetLayoutPosition 2018-06-08 21:20:15 +09:00
Dean Herbert 1e7bffe5e3
Merge branch 'master' into badge-ordering 2018-06-08 21:13:35 +09:00
Dean Herbert 803598c3d0 Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader 2018-06-08 20:54:14 +09:00
Dean Herbert 59e5a8556f Fix volume control adjustment being extreme when precision scrolling 2018-06-08 18:15:03 +09:00
Dean Herbert 66d28aa9fc
Merge branch 'master' into beatmap-set-downloader 2018-06-08 16:28:25 +09:00
Dean Herbert 955a78e76d Remove OnlineBeatmapSetID from BeatmapInfo
It should now be retrieved via the linked BeatmapSetInfo
2018-06-08 15:26:27 +09:00
Dean Herbert 8cc31aca54 Reorganise API requests and response classes
They were previously breaking the two-class-per-file rule.
2018-06-08 11:42:35 +09:00
DrabWeb 0fae49ee21 Don't add a 'with Video' subtitle. 2018-06-07 20:47:27 -03:00
Dean Herbert 0b4f5af52e Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Dean Herbert 475fb06559 Use new bind method 2018-06-07 16:46:54 +09:00
Dean Herbert 621be3bbfc Merge branch 'master' into disallow-beatmap-change 2018-06-07 00:38:40 +09:00
Dean Herbert ea1336d243 Merge remote-tracking branch 'upstream/master' into nuget-consumption 2018-06-06 21:09:51 +09:00
Dean Herbert 2e23da1dfa
Merge branch 'master' into beatmap-set-downloader 2018-06-06 20:32:58 +09:00
Dan Balasescu c30861186b
Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
smoogipoo ff60f69f47 Explicitly construct local beatmaps rather than using GetBoundCopy 2018-06-06 20:19:30 +09:00
smoogipoo 72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
Dean Herbert a645a109be
Merge branch 'master' into overlay-activation 2018-06-06 19:18:28 +09:00
Dean Herbert 0a97b8ae25 Implement DebugUtils locally
Has been removed from framework
2018-06-06 18:33:10 +09:00
smoogipoo 4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Aergwyn aaaa8a3b7c match Bindable names 2018-06-06 09:55:16 +02:00
Dean Herbert 9e25e02696 Ensure notifications don't appear during UserTriggered mode
Closes #2640.
2018-06-06 15:50:24 +09:00
Dean Herbert d1fd09ed47 Rename variables 2018-06-06 15:49:27 +09:00
DrabWeb 188272e15d Replace OnAlreadyDownloading with returning a bool from Download. 2018-06-06 03:18:42 -03:00
DrabWeb df4c855aa2 Manage subtitle inside of DownloadButton. 2018-06-06 03:13:37 -03:00
Dean Herbert 86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
Dean Herbert 1dd5bdcf72 Move setting to new "mods" section 2018-06-06 12:32:59 +09:00
Dean Herbert ee92986494
Merge branch 'master' into osu-hd-setting 2018-06-06 12:09:12 +09:00
Dean Herbert 6be382aab6 Merge branch 'master' into overlay-activation 2018-06-06 10:07:22 +09:00
Dean Herbert 00c8d2ff11
Merge branch 'master' into source-link-colour 2018-06-06 08:27:28 +09:00
DrabWeb 4cf7a64636 Remove unused parameter. 2018-06-04 22:26:52 -03:00
DrabWeb 61e1358410 Add OnAlreadyDownloading animations. 2018-06-04 21:07:17 -03:00
DrabWeb c524289b24 Update DirectListPanel to properly handle hiding DownloadButton. 2018-06-04 21:01:15 -03:00
DrabWeb 01c5060bcf Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables 2018-06-04 20:30:54 -03:00
DrabWeb 9377ffb784 Update BeatmapSetOverlay to use BeatmapSetDownloader. 2018-06-04 20:27:34 -03:00