Dean Herbert
8414fe9d05
Add key counter exceptions for paused state
2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833
Set restart count
2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
Dean Herbert
ffd3040fe2
Fix GameplayCursor state not restoring correctly after Show/Hide
2018-07-18 19:59:04 +09:00
Dean Herbert
6254f4e0f7
Fix tests
2018-07-18 18:00:04 +09:00
Dean Herbert
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
Dean Herbert
e3fb781a5a
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 12:59:22 +09:00
Dean Herbert
d0f7bdbcb8
Merge pull request #3056 from ekrctb/fix-potential-quadratic-complexity
...
Fix potential quadratic complexity in taiko autoplay
2018-07-18 11:48:22 +09:00
Dean Herbert
fb09385f51
Remove net471 targeting
2018-07-18 11:01:08 +09:00
Dean Herbert
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
ekrctb
c6816a6cf3
Fix potential quadratic complexity in taiko autoplay
2018-07-17 17:00:28 +09:00
Dan Balasescu
fef78abdb3
Merge pull request #3054 from peppy/use-switch-over-if
...
Use switch with type matching in place of if-else where possible
2018-07-17 16:58:59 +09:00
Dan Balasescu
64cde1ebad
Merge branch 'master' into use-switch-over-if
2018-07-17 16:44:57 +09:00
Dean Herbert
97e71245e9
Merge branch 'master' into reduce-panel-width
2018-07-17 16:36:05 +09:00
Dean Herbert
2a6ebb1da4
Merge pull request #3055 from smoogipoo/scrolldirection-cleanup
...
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 16:35:59 +09:00
Dean Herbert
9f933187e9
Apply review feedback
2018-07-17 16:33:08 +09:00
Dean Herbert
569d0f7993
Merge branch 'master' into scrolldirection-cleanup
2018-07-17 15:39:13 +09:00
Dean Herbert
15516a499d
Merge pull request #2959 from peppy/fix-incorrect-mods
...
Fix mods not correctly resetting when changing ruleset at song select
2018-07-17 15:39:02 +09:00
Dean Herbert
e681bd3244
Merge branch 'master' into fix-incorrect-mods
2018-07-17 15:23:21 +09:00
smoogipoo
827c5c4939
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 15:14:03 +09:00
Dan Balasescu
bac577ca24
Merge pull request #3053 from peppy/fix-incorrect-leadin
...
Fix lead-in time not being long enough in many cases
2018-07-17 15:11:36 +09:00
Dean Herbert
825941aff1
Use switch with type matching in place of if-else where possible
2018-07-17 14:35:09 +09:00
Dean Herbert
b967fe714b
Fix lead-in time now being long enough in many cases
2018-07-17 14:29:22 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods
2018-07-17 13:41:02 +09:00
Dan Balasescu
b69f61886c
Merge pull request #2991 from peppy/clickable-download-notifications
...
Add the ability to click completed download notifications to select beatmap
2018-07-17 13:40:54 +09:00
Dan Balasescu
7a2dc3c674
Merge branch 'master' into clickable-download-notifications
2018-07-17 13:29:16 +09:00
Dan Balasescu
61f58ed08a
Merge branch 'master' into reduce-panel-width
2018-07-17 12:51:16 +09:00
Dan Balasescu
9ee54dabfa
Merge pull request #3028 from peppy/fix-drawable-load-regression
...
Fix regression in drawable rank first display
2018-07-17 12:30:28 +09:00
Dan Balasescu
e4fc3a1c65
Merge branch 'master' into fix-drawable-load-regression
2018-07-17 12:22:12 +09:00
Dean Herbert
4f1b7c8065
Merge branch 'master' into reduce-panel-width
2018-07-17 04:20:40 +09:00
Dean Herbert
c1b8a88e39
Merge pull request #3048 from peppy/use-has-flags
...
Use Enum.HasFlag
2018-07-17 04:20:25 +09:00
Dean Herbert
84c13174d9
Merge branch 'master' into use-has-flags
2018-07-17 03:50:40 +09:00
Dean Herbert
f153f39596
Merge pull request #3031 from peppy/make-notifications-quieter
...
Make notifications less noisy
2018-07-17 03:50:27 +09:00
Dean Herbert
40a1f8313e
Merge branch 'master' into make-notifications-quieter
2018-07-17 03:24:47 +09:00
Dean Herbert
7f4c6cad8c
Merge pull request #3023 from morguldir/fix_color_parsing
...
Only read numbers when handling colors.
2018-07-17 01:23:45 +09:00
Dean Herbert
f4591c6d0b
Merge branch 'master' into fix_color_parsing
2018-07-17 00:25:32 +09:00
Dean Herbert
1c1e34ecf6
Merge pull request #3006 from HoutarouOreki/correctQuickFade
...
Instantly hide content for quick retry
2018-07-17 00:25:27 +09:00
Dean Herbert
da300baff1
Update hide logic
2018-07-17 00:06:51 +09:00
Dean Herbert
ca7b61367f
Merge branch 'master' into correctQuickFade
2018-07-17 00:02:15 +09:00
morguldir
fc77e01ba9
Fix formatting, make StripComments protected
...
Don't strip comments when calling ParseLine
2018-07-16 16:35:55 +02:00
Dean Herbert
58fe434dd0
Don't use in invalidation logic to avoid incorrect execution
2018-07-16 16:39:52 +09:00
Dean Herbert
98cddc0c04
Fix some legacy cases
2018-07-16 16:26:37 +09:00
Dean Herbert
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
Dean Herbert
a117b323e2
Merge branch 'master' into make-notifications-quieter
2018-07-16 13:15:07 +09:00
Dean Herbert
a12c47536b
Change default to being important
2018-07-16 13:00:21 +09:00
morguldir
429306aa87
Fix casing, use ordinal string comparison when stripping comments
2018-07-16 01:54:20 +02:00
morguldir
87a4bf3d92
Remove using directive for regex in LegacyDecoder
2018-07-16 01:08:30 +02:00
morguldir
6c861a1638
Strip comments from everything except metadata
2018-07-16 01:04:41 +02:00
Dean Herbert
bb7d0715b1
Merge pull request #2950 from naoey/download-button-state
...
Add download state indicators to osu!direct panels
2018-07-16 03:25:39 +09:00
Dean Herbert
4829f4f09c
Merge branch 'master' into download-button-state
2018-07-16 03:17:26 +09:00