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 |
|
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 |
|
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 |
|
Dean Herbert
|
86be1bef6b
|
Use UserTriggered in Player
|
2018-06-06 15:10:15 +09:00 |
|
Dean Herbert
|
e7fa043226
|
Merge pull request #2201 from Vidalee/osu-hd-setting
Add a setting to increase visibility of the first object in "Hidden" mod
|
2018-06-06 14:41:34 +09:00 |
|
Dean Herbert
|
d3cd267036
|
Formatting fixes
|
2018-06-06 14:20:51 +09:00 |
|
Dean Herbert
|
a5679f7bf5
|
Improve readability of code
|
2018-06-06 14:04:20 +09:00 |
|
Dean Herbert
|
f253828d49
|
Fix regressions
|
2018-06-06 13:51:51 +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
|
316c928e44
|
Merge pull request #2692 from smoogipoo/fix-replay-updates
Always update children when the ruleset input manager is updated
|
2018-06-06 09:58:07 +09:00 |
|
Dean Herbert
|
26569b434c
|
Merge branch 'master' into fix-replay-updates
|
2018-06-06 09:40:46 +09:00 |
|
Dean Herbert
|
a133a8229b
|
Merge branch 'master' into fix-ImportBeatmapTest
|
2018-06-06 09:34:19 +09:00 |
|