smoogipoo
|
3745f9000b
|
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
|
2018-06-07 13:37:19 +09:00 |
|
Dean Herbert
|
f491a18d40
|
Fix notifications not showing at main osu! logo on menu
|
2018-06-07 01:49:34 +09:00 |
|
Dean Herbert
|
17ba129e61
|
Make volume controls stay open when hovered
Closes #2743.
|
2018-06-07 01:14:43 +09:00 |
|
Dean Herbert
|
dd75cd973b
|
Show UI mouse cursor when hovering volume meters during gameplay
Also adds a hover animation.
|
2018-06-07 01:13:35 +09:00 |
|
Dean Herbert
|
621be3bbfc
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-07 00:38:40 +09:00 |
|
Dan Balasescu
|
b59c45ca57
|
Merge branch 'master' into fix-database-migration-failure
|
2018-06-06 22:44:35 +09:00 |
|
Dean Herbert
|
ee6f107f08
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-import-path-failures
|
2018-06-06 22:12:10 +09:00 |
|
Dean Herbert
|
a60c888ae5
|
Add comment about reasoning for local context variable
|
2018-06-06 22:05:25 +09:00 |
|
Dean Herbert
|
00b4a2519f
|
Update framework
|
2018-06-06 21:22:22 +09:00 |
|
Dean Herbert
|
ea1336d243
|
Merge remote-tracking branch 'upstream/master' into nuget-consumption
|
2018-06-06 21:09:51 +09:00 |
|
Dean Herbert
|
70478e2216
|
Merge remote-tracking branch 'upstream/master' into fix-import-path-failures
|
2018-06-06 20:55:51 +09:00 |
|
Dean Herbert
|
c756a89daf
|
Standardise path
|
2018-06-06 20:55:42 +09:00 |
|
Dean Herbert
|
2e23da1dfa
|
Merge branch 'master' into beatmap-set-downloader
|
2018-06-06 20:32:58 +09:00 |
|
smoogipoo
|
18fc63bac2
|
Add back removed using
|
2018-06-06 20:32:37 +09:00 |
|
Dan Balasescu
|
c30861186b
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-06 20:26:17 +09:00 |
|
smoogipoo
|
ebcfe97ccf
|
Expose Dependencies from base OsuTestCase
|
2018-06-06 20:25:40 +09:00 |
|
smoogipoo
|
f2ac5b8b2d
|
CreatePlayer shouldn't receive a beatmap
|
2018-06-06 20:21:47 +09:00 |
|
smoogipoo
|
e77084bec4
|
Give OsuScreen a mutable BindableBeatmap
|
2018-06-06 20:19:53 +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 |
|
Dean Herbert
|
5a4408e359
|
Merge remote-tracking branch 'upstream/master' into nuget-consumption
|
2018-06-06 18:22:22 +09:00 |
|
Dean Herbert
|
9306fec498
|
Fix missing null checks
|
2018-06-06 18:21:03 +09:00 |
|
Aergwyn
|
aaaa8a3b7c
|
match Bindable names
|
2018-06-06 09:55:16 +02:00 |
|
smoogipoo
|
83ff47ec80
|
Rewrite difficulty mod combinations
|
2018-06-06 16:20:17 +09:00 |
|
Dean Herbert
|
55921efffb
|
Rewrite much state logic
|
2018-06-06 16:17:51 +09: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
|
7819be7957
|
Remove unused using.
|
2018-06-06 03:28:07 -03: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
|
3567823759
|
Reverse order of exposed objects in HitObjectContainer
Closes #2740.
|
2018-06-06 15:03:47 +09:00 |
|
Dean Herbert
|
d3cd267036
|
Formatting fixes
|
2018-06-06 14:20:51 +09:00 |
|
smoogipoo
|
e19ca0c120
|
Add nomod mod type
|
2018-06-06 14:08:02 +09:00 |
|
smoogipoo
|
8274623ad6
|
Cleanup multi mod constructions
|
2018-06-06 14:07:50 +09:00 |
|
Dean Herbert
|
a5679f7bf5
|
Improve readability of code
|
2018-06-06 14:04:20 +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
|
26569b434c
|
Merge branch 'master' into fix-replay-updates
|
2018-06-06 09:40:46 +09:00 |
|
Dean Herbert
|
d2633a706d
|
Merge branch 'master' into score-component-tooltips
|
2018-06-06 09:06:22 +09:00 |
|
Dean Herbert
|
00c8d2ff11
|
Merge branch 'master' into source-link-colour
|
2018-06-06 08:27:28 +09:00 |
|
DrabWeb
|
80951eae68
|
Inherit BeatmapSetDownloader from Component.
|
2018-06-05 18:09:26 -03:00 |
|
Dean Herbert
|
601ef3b6f7
|
Consume osu.Framework via nuget
|
2018-06-05 14:14:56 +09:00 |
|
Dean Herbert
|
3b03a25ea5
|
Fix beatmaps with subfolders importing incorrectly on windows
Closes #2718.
|
2018-06-05 11:36:44 +09:00 |
|
DrabWeb
|
4cf7a64636
|
Remove unused parameter.
|
2018-06-04 22:26:52 -03:00 |
|
DrabWeb
|
d8154f8cad
|
Fix BeatmapSetInfos with OnlineBeatmapSetID set to null being marked as downloaded.
|
2018-06-04 21:11:27 -03:00 |
|