d7f1766ee2
wip
2018-07-19 18:51:08 +09:00
c31676f8f1
Rework update methods to separate out ruleset and beatmap changes
...
Combining them was causing complexity and logic errors.
2018-07-19 18:48:40 +09:00
693ba8e994
Add more ToString output
2018-07-19 18:43:11 +09:00
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +09:00
332c62f110
Merge branch 'fix-model-import' into open-downloaded-beatmas
...
# Conflicts:
# osu.Game/Beatmaps/BeatmapManager.cs
# osu.Game/Database/SingletonContextFactory.cs
2018-07-19 14:11:31 +09:00
7be3a5d466
Centralise test storage logic
2018-07-19 14:07:55 +09:00
68614f1512
Ensure online IDs are validated for imports that don't have an associated archive too
2018-07-19 13:41:34 +09:00
82ddbb3f5d
Delay key count stop
2018-07-19 01:18:07 +09:00
41441771ae
Remove unnecessary cast
2018-07-18 22:22:28 +09:00
8414fe9d05
Add key counter exceptions for paused state
2018-07-18 22:19:32 +09:00
a01361f833
Set restart count
2018-07-18 22:05:24 +09:00
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
0c24244340
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
# Conflicts:
# osu.Game/Database/SingletonContextFactory.cs
2018-07-18 16:50:56 +09:00
1d52231d4f
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
2018-07-18 16:44:47 +09:00
90840c9384
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 13:18:50 +09:00
9611292f4e
FilterTask -> PendingFilter
2018-07-18 13:18:50 +09:00
f1c3fbe644
Improve integrity of song select bind/change logic
2018-07-18 13:18:50 +09:00
5fe634a3b6
Click download button to load beatmap
2018-07-18 13:18:50 +09:00
e3fb781a5a
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 12:59:22 +09:00
aa2f2f3e94
Merge pull request #3034 from peppy/reduce-panel-width
...
Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions
2018-07-17 19:14:48 +09:00
9b7d01397b
Add ruleset config to HitObjectComposer
2018-07-17 16:53:32 +09:00
6437fdd9db
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +09:00
97e71245e9
Merge branch 'master' into reduce-panel-width
2018-07-17 16:36:05 +09:00
9f933187e9
Apply review feedback
2018-07-17 16:33:08 +09:00
c51fe6a119
Remove more unused stuff
2018-07-17 16:01:47 +09:00
9f730dd784
Merge branch 'editor-composer-cleanup' into mania-mask-container
...
# Conflicts:
# osu.Game/Rulesets/Edit/HitObjectComposer.cs
# osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
2018-07-17 16:00:46 +09:00
3905a9105c
Add a playfield method to retrieve all hitobjects
2018-07-17 15:51:10 +09:00
48190e3b5a
Make NestedPlayfields non-null
2018-07-17 15:48:51 +09:00
569d0f7993
Merge branch 'master' into scrolldirection-cleanup
2018-07-17 15:39:13 +09:00
0b66f63f7d
Invert flow order of hitobjects between composer and mask layers
2018-07-17 15:35:32 +09:00
e681bd3244
Merge branch 'master' into fix-incorrect-mods
2018-07-17 15:23:21 +09:00
827c5c4939
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 15:14:03 +09:00
825941aff1
Use switch with type matching in place of if-else where possible
2018-07-17 14:35:09 +09:00
b967fe714b
Fix lead-in time now being long enough in many cases
2018-07-17 14:29:22 +09:00
745d596343
Merge branch 'master' into fix-incorrect-mods
2018-07-17 13:41:02 +09:00
7a2dc3c674
Merge branch 'master' into clickable-download-notifications
2018-07-17 13:29:16 +09:00
577ff4cc7f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
61f58ed08a
Merge branch 'master' into reduce-panel-width
2018-07-17 12:51:16 +09:00
e4fc3a1c65
Merge branch 'master' into fix-drawable-load-regression
2018-07-17 12:22:12 +09:00
4f1b7c8065
Merge branch 'master' into reduce-panel-width
2018-07-17 04:20:40 +09:00
84c13174d9
Merge branch 'master' into use-has-flags
2018-07-17 03:50:40 +09:00
40a1f8313e
Merge branch 'master' into make-notifications-quieter
2018-07-17 03:24:47 +09:00
f4591c6d0b
Merge branch 'master' into fix_color_parsing
2018-07-17 00:25:32 +09:00
da300baff1
Update hide logic
2018-07-17 00:06:51 +09:00
ca7b61367f
Merge branch 'master' into correctQuickFade
2018-07-17 00:02:15 +09:00
fc77e01ba9
Fix formatting, make StripComments protected
...
Don't strip comments when calling ParseLine
2018-07-16 16:35:55 +02:00
58fe434dd0
Don't use in invalidation logic to avoid incorrect execution
2018-07-16 16:39:52 +09:00
98cddc0c04
Fix some legacy cases
2018-07-16 16:26:37 +09:00
dbc538abbe
Use Enum.HasFlag
...
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
