Commit Graph

14261 Commits

Author SHA1 Message Date
fdf2120852 Update notfication now points to new changelog page 2018-06-06 18:08:43 +01:00
f491a18d40 Fix notifications not showing at main osu! logo on menu 2018-06-07 01:49:34 +09:00
17ba129e61 Make volume controls stay open when hovered
Closes #2743.
2018-06-07 01:14:43 +09:00
dd75cd973b Show UI mouse cursor when hovering volume meters during gameplay
Also adds a hover animation.
2018-06-07 01:13:35 +09:00
621be3bbfc Merge branch 'master' into disallow-beatmap-change 2018-06-07 00:38:40 +09:00
1d5a773399 Merge pull request #2726 from peppy/fix-database-migration-failure
Fix multiple issues causing database reset to fail
2018-06-06 22:53:57 +09:00
b59c45ca57 Merge branch 'master' into fix-database-migration-failure 2018-06-06 22:44:35 +09:00
618446af7e Merge pull request #2736 from peppy/fix-import-path-failures
Fix beatmaps with subfolders importing incorrectly on windows
2018-06-06 22:43:29 +09:00
e210435003 Merge branch 'master' into fix-import-path-failures 2018-06-06 22:14:17 +09:00
7269e8b20a Merge pull request #2737 from peppy/external-deploy
Remove osu.Desktop.Deploy project
2018-06-06 22:13:55 +09:00
ee6f107f08 Merge remote-tracking branch 'upstream/master' into peppy-fix-import-path-failures 2018-06-06 22:12:10 +09:00
a60c888ae5 Add comment about reasoning for local context variable 2018-06-06 22:05:25 +09:00
fa1106affe Disable caches 2018-06-06 21:57:53 +09:00
674da3ab91 Merge remote-tracking branch 'upstream/master' into peppy-external-deploy 2018-06-06 21:55:48 +09:00
576acaa630 Merge upstream master into external-deploy 2018-06-06 21:54:45 +09:00
43b74325d5 Merge pull request #2732 from peppy/nuget-consumption
Consume osu.Framework via nuget
2018-06-06 21:53:20 +09:00
2eb59830c1 Fix vs version 2018-06-06 21:31:58 +09:00
2ec1fcd245 Fix incorrect using 2018-06-06 21:29:45 +09:00
00b4a2519f Update framework 2018-06-06 21:22:22 +09:00
ea1336d243 Merge remote-tracking branch 'upstream/master' into nuget-consumption 2018-06-06 21:09:51 +09:00
70478e2216 Merge remote-tracking branch 'upstream/master' into fix-import-path-failures 2018-06-06 20:55:51 +09:00
c756a89daf Standardise path 2018-06-06 20:55:42 +09:00
2e23da1dfa Merge branch 'master' into beatmap-set-downloader 2018-06-06 20:32:58 +09:00
18fc63bac2 Add back removed using 2018-06-06 20:32:37 +09:00
c30861186b Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
ebcfe97ccf Expose Dependencies from base OsuTestCase 2018-06-06 20:25:40 +09:00
f2ac5b8b2d CreatePlayer shouldn't receive a beatmap 2018-06-06 20:21:47 +09:00
e77084bec4 Give OsuScreen a mutable BindableBeatmap 2018-06-06 20:19:53 +09:00
ff60f69f47 Explicitly construct local beatmaps rather than using GetBoundCopy 2018-06-06 20:19:30 +09:00
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
5844039e04 Merge pull request #2664 from Aergwyn/overlay-activation
Fix notifications appearing during gameplay
2018-06-06 20:13:59 +09:00
a645a109be Merge branch 'master' into overlay-activation 2018-06-06 19:18:28 +09:00
35d733fa97 Merge pull request #2730 from ekrctb/fix-ImportBeatmapTest
Fix ImportBeatmapTest not working on .net core
2018-06-06 19:08:45 +09:00
e65b34336b Merge branch 'master' into fix-ImportBeatmapTest 2018-06-06 18:56:31 +09:00
94a22fb43d Merge branch 'fix-ImportBeatmapTest' of https://github.com/ekrctb/osu into fix-ImportBeatmapTest 2018-06-06 18:37:04 +09:00
aeeb03ff9c simpler temporary path generation 2018-06-06 18:36:43 +09:00
0a97b8ae25 Implement DebugUtils locally
Has been removed from framework
2018-06-06 18:33:10 +09:00
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
5a4408e359 Merge remote-tracking branch 'upstream/master' into nuget-consumption 2018-06-06 18:22:22 +09:00
9306fec498 Fix missing null checks 2018-06-06 18:21:03 +09:00
aaaa8a3b7c match Bindable names 2018-06-06 09:55:16 +02:00
83ff47ec80 Rewrite difficulty mod combinations 2018-06-06 16:20:17 +09:00
55921efffb Rewrite much state logic 2018-06-06 16:17:51 +09:00
9e25e02696 Ensure notifications don't appear during UserTriggered mode
Closes #2640.
2018-06-06 15:50:24 +09:00
d1fd09ed47 Rename variables 2018-06-06 15:49:27 +09:00
7819be7957 Remove unused using. 2018-06-06 03:28:07 -03:00
188272e15d Replace OnAlreadyDownloading with returning a bool from Download. 2018-06-06 03:18:42 -03:00
df4c855aa2 Manage subtitle inside of DownloadButton. 2018-06-06 03:13:37 -03:00
86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
3567823759 Reverse order of exposed objects in HitObjectContainer
Closes #2740.
2018-06-06 15:03:47 +09:00