Andrei Zavatski
e7118a9272
Use System mod type for NoMod
2019-09-20 23:47:21 +03:00
Andrei Zavatski
0d43f4e4f9
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-09-20 23:39:44 +03:00
Dean Herbert
dced3c38b5
Update framework ( #6196 )
...
Update framework
2019-09-21 02:21:00 +09:00
Dean Herbert
b7c51d7b12
Merge pull request #6194 from VPeruS/fix-typo
...
Fix typo in CreateResourceStore method name
2019-09-21 02:16:33 +09:00
Dean Herbert
92f9cf3e06
Update framework
2019-09-21 02:08:19 +09:00
Vperus
ac8fe6045f
Fixed typo
...
Changed CreateReourceStore() to CreateResourceStore()
2019-09-20 19:58:39 +03:00
Dan Balasescu
234c8e9067
Merge pull request #6191 from VPeruS/remove-unused-const
...
Remove unused CORNER_RADIUS
2019-09-21 00:33:56 +09:00
Vperus
2d99d41a6d
Remove unused CORNER_RADIUS
2019-09-20 18:17:35 +03:00
Dan Balasescu
33e39795c3
Merge pull request #6185 from peppy/checksum-before-skip-copy
...
Checksum before skip copy
2019-09-20 15:37:04 +09:00
Dean Herbert
f306fe27d8
Add test to cover corruption case
2019-09-20 15:05:48 +09:00
Dean Herbert
d0a4e1e3c2
Force a checksum check before skipping FileStore copy op
2019-09-20 15:00:27 +09:00
Dean Herbert
c5474bc2ef
Merge pull request #6179 from revelsix/leaderboard-mod-filter
...
Reduce ambiguity of leaderboard mod filter button
2019-09-20 12:31:36 +09:00
Revel
f7f9c0f7e0
Update BeatmapDetailAreaTabControl.cs
2019-09-19 15:47:32 -04:00
Dan Balasescu
c09f384a7e
Merge pull request #6175 from peppy/confirm-via-key
...
Always show exit confirmation when closing via alt-f4 or window control
2019-09-20 02:47:09 +09:00
Dean Herbert
636582e089
Always show exit confirmation when closing via alt-f4 or window control
2019-09-20 02:22:49 +09:00
Dean Herbert
433df52c7b
Merge pull request #6172 from ppy/dependabot/nuget/Microsoft.NET.Test.Sdk-16.3.0
...
Bump Microsoft.NET.Test.Sdk from 16.2.0 to 16.3.0
2019-09-20 01:50:45 +09:00
dependabot-preview[bot]
f10b390ca0
Bump Microsoft.NET.Test.Sdk from 16.2.0 to 16.3.0
...
Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest ) from 16.2.0 to 16.3.0.
- [Release notes](https://github.com/microsoft/vstest/releases )
- [Commits](https://github.com/microsoft/vstest/compare/v16.2.0...v16.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-19 16:32:39 +00:00
Andrei Zavatski
0cf4db899f
Few cleanups
2019-09-19 17:03:52 +03:00
Andrei Zavatski
efea8be97d
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-09-19 17:03:00 +03:00
Dean Herbert
fc78284765
Add setting to adjust hold-to-confirm activation time ( #6166 )
...
Add setting to adjust hold-to-confirm activation time
2019-09-19 22:51:20 +09:00
Andrei Zavatski
529a1c3b91
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-09-19 16:46:58 +03:00
Dean Herbert
67796e0982
Apply code styling suggestions
2019-09-19 22:46:21 +09:00
Dean Herbert
4e9bb7b121
Merge remote-tracking branch 'upstream/master' into hold-to-press-setting
2019-09-19 22:35:18 +09:00
Dean Herbert
23c5cb6367
Expand tests to cover new behaviour
2019-09-19 22:35:14 +09:00
Dean Herbert
0a67d1db1b
Merge pull request #5355 from EVAST9919/songselect-best-user-score
...
Show personal best on song select
2019-09-19 21:17:23 +09:00
smoogipoo
94d3bcc612
Fix top score not being selectable
2019-09-19 20:47:33 +09:00
Dan Balasescu
8345cf4e98
Merge pull request #6170 from peppy/fix-nested-imports
...
Fix importing archives which are nested in a single folder within a zip
2019-09-19 20:37:18 +09:00
Dean Herbert
50d4206c45
Fix exit scenarios
2019-09-19 20:17:58 +09:00
Dean Herbert
ead3ee3b41
Merge branch 'master' into hold-to-press-setting
2019-09-19 20:05:14 +09:00
Dean Herbert
cffee1fd5e
Fix imported beatmap paths not correctly matching files
2019-09-19 20:02:45 +09:00
Dean Herbert
ddff9882cf
Fix importing archives which are nested in a single folder within a zip
2019-09-19 19:11:04 +09:00
Dean Herbert
0640b2eb35
Fix judgement sizes not matching legacy skins ( #6145 )
...
Fix judgement sizes not matching legacy skins
2019-09-19 18:49:35 +09:00
Dean Herbert
3abcd898a6
Add hit lighting ( #6144 )
...
Add hit lighting
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:22 +09:00
Dean Herbert
28342baa8f
Add auto-restart functionality to sudden death and perfect mods ( #6159 )
...
Add auto-restart functionality to sudden death and perfect mods
Co-authored-by: Paul Teng <plankp@outlook.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:09 +09:00
Dean Herbert
62dda81711
Add query-based filter modes to song select search field ( #6161 )
...
Add query-based filter modes to song select search field
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:28:01 +09:00
Dan Balasescu
027d6194f2
Merge branch 'master' into add-hit-lighting
2019-09-19 18:07:29 +09:00
smoogipoo
bc9941a990
Newline required when xmldocs are involved
2019-09-19 18:00:11 +09:00
smoogipoo
65276cd235
Remove whitespace
2019-09-19 17:58:10 +09:00
smoogipoo
db24cfbead
Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-09-19 17:57:04 +09:00
smoogipoo
da15b900f7
Remove virtual member from ModBlockFail
2019-09-19 17:44:24 +09:00
Dean Herbert
646d762468
Merge branch 'master' into songselect-advanced-filtering
2019-09-19 17:42:32 +09:00
Dean Herbert
558068a988
Merge pull request #3569 from MaxOhn/traceable-mod
...
Traceable mod
2019-09-19 17:41:27 +09:00
Dean Herbert
fa54a0bfd3
Fix test failures
2019-09-19 17:40:46 +09:00
Dan Balasescu
0dfce5d15d
Merge branch 'master' into traceable-mod
2019-09-19 17:38:15 +09:00
smoogipoo
5120d82ef8
Fix crash with multiple range criterias
2019-09-19 17:36:44 +09:00
Dean Herbert
e6c36a8bc7
Fix scaling mode being applied to judgements
2019-09-19 17:36:32 +09:00
smoogipoo
96ea507320
Reorder comparison for readability
2019-09-19 17:21:22 +09:00
smoogipoo
e075dd7ea8
Fix equals operator not working
2019-09-19 17:16:34 +09:00
smoogipoo
7683f7ff23
Make OnlineStatus use OptionalRange
2019-09-19 17:12:07 +09:00
smoogipoo
d7831d8f5d
Use non-generic IComparable interface
2019-09-19 17:11:43 +09:00
