Dean Herbert
f3c9049660
Merge branch 'master' into disallow-beatmap-change
2018-06-07 15:34:19 +09:00
Dean Herbert
3039eae0c7
Merge pull request #2753 from peppy/no-more-mono
...
Remove net471 build configurations
2018-06-07 15:33:11 +09:00
Dean Herbert
ecef93eab2
Merge pull request #2748 from peppy/mania-colours
...
osu!mania visual improvements
2018-06-07 15:32:59 +09:00
Dan Balasescu
2ad8f6b010
Merge branch 'master' into mania-colours
2018-06-07 15:21:28 +09:00
Dean Herbert
7a451bc8ef
Merge branch 'master' into no-more-mono
2018-06-07 15:18:16 +09:00
Dean Herbert
feb75eecbf
Merge pull request #2655 from smoogipoo/remove-decoder-offset
...
Apply platform universal offset in Player
2018-06-07 15:17:45 +09:00
Dan Balasescu
8d0161c2fc
Refactoring
2018-06-07 15:11:48 +09:00
Dean Herbert
e73442c862
Remove net471 build configurations
...
This doesn't actually remove the targets just yet (that will require a bit more work), but rather remove the target options from our IDE configurations to reduce accidental usage of net471/mono.
2018-06-07 15:05:20 +09:00
Dean Herbert
f9449e841a
Improve overall visual clarity and explosion effects
2018-06-07 14:30:27 +09:00
Dean Herbert
dff4b360b7
Fix ticks not getting accent colour
2018-06-07 14:30:27 +09:00
Dean Herbert
56ea1c1d63
Adjust hold note visibility and glow composition
2018-06-07 14:30:27 +09:00
smoogipoo
d516a0a05c
Store platform offset clock in variable for visibility
2018-06-07 13:42:31 +09:00
smoogipoo
3745f9000b
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
2018-06-07 13:37:19 +09:00
Dean Herbert
81a3a8a1a4
Add corner radius
2018-06-07 11:57:30 +09:00
Dean Herbert
dc10277d50
Thicker bar lines and new design colour
2018-06-07 11:16:26 +09:00
Dean Herbert
d32ac01614
Merge pull request #2747 from jai-sharma/patch-1
...
Update notfication now points to new changelog page
2018-06-07 02:24:58 +09:00
jai_
fdf2120852
Update notfication now points to new changelog page
2018-06-06 18:08:43 +01:00
Dean Herbert
621be3bbfc
Merge branch 'master' into disallow-beatmap-change
2018-06-07 00:38:40 +09:00
Dean Herbert
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
Dan Balasescu
b59c45ca57
Merge branch 'master' into fix-database-migration-failure
2018-06-06 22:44:35 +09:00
Dan Balasescu
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
Dan Balasescu
e210435003
Merge branch 'master' into fix-import-path-failures
2018-06-06 22:14:17 +09:00
Dan Balasescu
7269e8b20a
Merge pull request #2737 from peppy/external-deploy
...
Remove osu.Desktop.Deploy project
2018-06-06 22:13:55 +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
fa1106affe
Disable caches
2018-06-06 21:57:53 +09:00
Dean Herbert
674da3ab91
Merge remote-tracking branch 'upstream/master' into peppy-external-deploy
2018-06-06 21:55:48 +09:00
Dean Herbert
576acaa630
Merge upstream master into external-deploy
2018-06-06 21:54:45 +09:00
Dan Balasescu
43b74325d5
Merge pull request #2732 from peppy/nuget-consumption
...
Consume osu.Framework via nuget
2018-06-06 21:53:20 +09:00
Dean Herbert
2eb59830c1
Fix vs version
2018-06-06 21:31:58 +09:00
Dean Herbert
2ec1fcd245
Fix incorrect using
2018-06-06 21:29:45 +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
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
5844039e04
Merge pull request #2664 from Aergwyn/overlay-activation
...
Fix notifications appearing during gameplay
2018-06-06 20:13:59 +09:00
Dean Herbert
a645a109be
Merge branch 'master' into overlay-activation
2018-06-06 19:18:28 +09:00
Dean Herbert
35d733fa97
Merge pull request #2730 from ekrctb/fix-ImportBeatmapTest
...
Fix ImportBeatmapTest not working on .net core
2018-06-06 19:08:45 +09:00
Dean Herbert
e65b34336b
Merge branch 'master' into fix-ImportBeatmapTest
2018-06-06 18:56:31 +09:00
ekrctb
94a22fb43d
Merge branch 'fix-ImportBeatmapTest' of https://github.com/ekrctb/osu into fix-ImportBeatmapTest
2018-06-06 18:37:04 +09:00
ekrctb
aeeb03ff9c
simpler temporary path generation
2018-06-06 18:36:43 +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
