smoogipoo
|
2905a4418d
|
Fix potential nullref
|
2019-12-18 21:30:57 +09:00 |
|
smoogipoo
|
cb5a35f8f9
|
Fix incorrect bindable valuechanged usage
|
2019-12-18 21:08:49 +09:00 |
|
smoogipoo
|
4e11fb0fd7
|
Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text
|
2019-12-18 19:36:16 +09:00 |
|
Dean Herbert
|
36172cf2bd
|
Merge pull request #7175 from LeNitrous/update-beatmap-settings
Display current difficulty statistics with mods applied
|
2019-12-18 18:43:49 +09:00 |
|
Dan Balasescu
|
6683460240
|
Merge branch 'master' into update-beatmap-settings
|
2019-12-18 17:59:27 +09:00 |
|
Dean Herbert
|
bf85f4affb
|
Fix editor crashing when loading a beatmap for an unsupported ruleset
|
2019-12-18 17:53:26 +09:00 |
|
smoogipoo
|
8e651962c7
|
Fix incorrectly binding inside BDL load()
|
2019-12-18 17:41:30 +09:00 |
|
Dean Herbert
|
ada2ae2b2c
|
Use tuple to avoid potential for incorrect display
|
2019-12-18 17:12:41 +09:00 |
|
Dean Herbert
|
e87aa281bf
|
Don't clone beatmap unnecessarily
|
2019-12-18 17:00:35 +09:00 |
|
wltu
|
4646524bf9
|
Remove unnecessary library
|
2019-12-17 13:18:20 -08:00 |
|
wltu
|
8aeef3f59a
|
Added refresh scoreboard upon deleting local score and formatted the code
|
2019-12-17 12:56:30 -08:00 |
|
wltu
|
bb2b1475cd
|
Merge branch 'master' of https://github.com/ppy/osu into #7146
|
2019-12-17 12:54:47 -08:00 |
|
Dean Herbert
|
e0ce87adca
|
Move CreateScoreProcessor() to Ruleset (#7244)
Move CreateScoreProcessor() to Ruleset
|
2019-12-17 22:15:42 +09:00 |
|
Dan Balasescu
|
fd2785bab3
|
Merge branch 'master' into fxcop
|
2019-12-17 20:14:45 +09:00 |
|
smoogipoo
|
49bf8d27d1
|
Move CreateScoreProcessor() to Ruleset
|
2019-12-17 20:08:13 +09:00 |
|
Huo Yaoyuan
|
caf3f774ba
|
CA1309: compare strings correctly.
|
2019-12-17 13:00:15 +08:00 |
|
Huo Yaoyuan
|
d5994ed484
|
CA2208: create exceptions correctly.
|
2019-12-17 13:00:10 +08:00 |
|
Huo Yaoyuan
|
ecfc6dfa3d
|
CA1825: use Array.Empty.
|
2019-12-17 12:59:48 +08:00 |
|
Dean Herbert
|
b5db927d93
|
Merge branch 'master' into cinema-mod
|
2019-12-17 12:56:06 +09:00 |
|
Willy Tu
|
bef9637fdf
|
Implemented delete local score individually. Currently does not refresh the score screen after the delete is compelete.
|
2019-12-16 19:25:28 -08:00 |
|
Dean Herbert
|
eed2984bef
|
Update sdk and InspectCode version (#7208)
Update sdk and InspectCode version
|
2019-12-16 19:46:12 +09:00 |
|
smoogipoo
|
6cf318c34b
|
Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding
|
2019-12-16 18:41:21 +09:00 |
|
smoogipoo
|
a276643a4b
|
Reorder health display and score elements
|
2019-12-16 18:41:14 +09:00 |
|
smoogipoo
|
83f77d9c35
|
Make the layout faster
|
2019-12-16 18:41:02 +09:00 |
|
Dean Herbert
|
d7eb4f73f4
|
Merge branch 'master' into update-beatmap-settings
|
2019-12-16 14:57:57 +09:00 |
|
Huo Yaoyuan
|
ab70abe8bd
|
Turn off unexpected new warnings.
|
2019-12-15 20:07:56 +08:00 |
|
Dean Herbert
|
59538bfd32
|
Merge branch 'global-available-mods' into adjustable-rate-mods
|
2019-12-13 21:57:27 +09:00 |
|
Dean Herbert
|
3dc2b59d2a
|
Move variable above common bindables
|
2019-12-13 20:06:12 +09:00 |
|
Dean Herbert
|
395b058ff8
|
Fix OsuScreenDependencies not caching non-leased versions
|
2019-12-13 20:05:54 +09:00 |
|
unknown
|
3945e7403a
|
improve tests and refactor AdvancedStats
|
2019-12-13 09:39:54 +08:00 |
|
unknown
|
ec5b506960
|
apply mod difficulty settings during song select
|
2019-12-12 23:41:46 +08:00 |
|
Dean Herbert
|
7559012fb7
|
Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks
|
2019-12-12 19:55:09 +09:00 |
|
Dean Herbert
|
d15f49f60f
|
Also hide the break overlay
|
2019-12-12 16:13:02 +09:00 |
|
Dean Herbert
|
37a94988a3
|
Merge branch 'improve-hud-hiding' into cinema-mod
|
2019-12-12 16:12:19 +09:00 |
|
Dean Herbert
|
94f3dbb2f6
|
Adjust transitions slightly
|
2019-12-12 16:09:50 +09:00 |
|
Dean Herbert
|
3ccfee64f6
|
Add HUDOverlay tests
|
2019-12-12 16:09:42 +09:00 |
|
smoogipoo
|
59345c97e4
|
Remove now unnecessary editor working beatmap
|
2019-12-12 15:58:31 +09:00 |
|
smoogipoo
|
5861eca80d
|
Make DrawableRuleset take a converted beatmap
|
2019-12-12 15:58:11 +09:00 |
|
Dean Herbert
|
ffb5cdc6ae
|
Hide settings overlay along with other HUD-hidden content
|
2019-12-12 15:20:42 +09:00 |
|
Dean Herbert
|
ad2528d4d2
|
Hide key counter along with other hud elements
Also tidies up HUD hide logic and protects against incorrect hiding.
|
2019-12-12 15:19:45 +09:00 |
|
Dean Herbert
|
9961fa7385
|
Merge branch 'master' into adjustable-rate-mods
|
2019-12-12 15:10:23 +09:00 |
|
Dean Herbert
|
606bd33aa6
|
Use beatmap background in editor
|
2019-12-12 13:04:32 +09:00 |
|
Dean Herbert
|
a93d57b77e
|
Merge branch 'master' into lighten-playfield-during-breaks
|
2019-12-12 11:57:21 +09:00 |
|
Dean Herbert
|
d2ada90434
|
Merge branch 'master' into single-scoreprocessor
|
2019-12-12 11:36:45 +09:00 |
|
Albie
|
4a1c6db3ed
|
Merge branch 'master' into cinema-mod
|
2019-12-11 18:00:17 +00:00 |
|
Dan Balasescu
|
b77f9504d0
|
Merge branch 'master' into adjustable-rate-mods
|
2019-12-11 19:28:59 +09:00 |
|
Dean Herbert
|
a106e2a53f
|
Refactor distance snap grid to not require hitobjects (#7138)
Refactor distance snap grid to not require hitobjects
|
2019-12-11 19:02:29 +09:00 |
|
smoogipoo
|
48f1dad4aa
|
Remove abstract ScoreProcessor class
|
2019-12-11 17:25:06 +09:00 |
|
Dean Herbert
|
75f9250645
|
Don't automatically pause when window is inactive if in break time
|
2019-12-11 15:46:07 +09:00 |
|
Dean Herbert
|
9ebad16436
|
Fix logic regression
|
2019-12-11 14:37:10 +09:00 |
|
Dean Herbert
|
77b9989e11
|
Fix some weird private field names
|
2019-12-11 14:10:35 +09:00 |
|
Dean Herbert
|
9eed64997f
|
Merge branch 'customized-mods' into adjustable-rate-mods
|
2019-12-11 13:26:05 +09:00 |
|
Salman Ahmed
|
53daa37eaa
|
Fix failing tests
|
2019-12-10 23:06:13 +03:00 |
|
Albie
|
a61f8cc2c3
|
Merge branch 'master' into cinema-mod
|
2019-12-10 17:06:53 +00:00 |
|
Salman Ahmed
|
38f1a8bc17
|
Bind UserDimContainer.IsBreakTime from Player
|
2019-12-10 15:14:47 +03:00 |
|
Salman Ahmed
|
bb078c2afc
|
Lighten user-dim container if on break time
|
2019-12-10 15:13:44 +03:00 |
|
Dan Balasescu
|
bd6a08a21b
|
Merge branch 'master' into apply-to-track
|
2019-12-10 16:15:24 +09:00 |
|
smoogipoo
|
94a298a82d
|
Refactor distance snap grid to not require hitobjects
|
2019-12-10 16:00:09 +09:00 |
|
Dean Herbert
|
cdde5d1d69
|
Fix song select filters not reapplied if in a child screen
Closes https://github.com/ppy/osu/issues/6980.
|
2019-12-10 02:30:23 +09:00 |
|
Dean Herbert
|
7fd52c21f5
|
Update mods and user adjust to use adjustments
|
2019-12-09 19:41:31 +09:00 |
|
Huo Yaoyuan
|
ad1fb3bda2
|
Remove IComparable in constraint.
|
2019-12-09 17:48:41 +08:00 |
|
Dean Herbert
|
d650bfb6d6
|
Remove unnecessary cast
|
2019-12-09 18:05:14 +09:00 |
|
Dean Herbert
|
eb074b7058
|
Allow mods to apply to track, not clock
|
2019-12-09 17:44:45 +09:00 |
|
Dan Balasescu
|
5738ef5fab
|
Merge branch 'master' into editor-timeline-hitobject-display
|
2019-12-09 14:34:55 +09:00 |
|
Dan Balasescu
|
54798b134e
|
Add accessibility modifiers
|
2019-12-08 03:16:41 +09:00 |
|
Dean Herbert
|
48c6279e8b
|
Only undo adjustments in GameplayClockContainer if applied at least once
|
2019-12-06 13:49:22 +09:00 |
|
Dean Herbert
|
de23364608
|
Add failing test
|
2019-12-06 13:47:34 +09:00 |
|
Dean Herbert
|
b1426d1b22
|
Full impossible nullref
|
2019-12-06 12:51:43 +09:00 |
|
Dean Herbert
|
9248fbe881
|
Remove extra checkboxes for now
|
2019-12-06 12:22:44 +09:00 |
|
Dean Herbert
|
28400aa865
|
Update test scene
|
2019-12-06 11:27:24 +09:00 |
|
Dean Herbert
|
12a9843835
|
Move thickness to a constant
|
2019-12-06 10:48:18 +09:00 |
|
Dean Herbert
|
e76f8bdd64
|
Fix warnings
|
2019-12-05 23:31:21 +09:00 |
|
Dean Herbert
|
d8620a70fb
|
Make work in editor
|
2019-12-05 20:12:25 +09:00 |
|
Dean Herbert
|
e225b0032a
|
Add basic hitobject display to timeline
|
2019-12-05 19:31:40 +09:00 |
|
Dan Balasescu
|
36c734c4c2
|
Merge branch 'master' into decouple-api-room-scoreinfo
|
2019-12-05 12:43:43 +09:00 |
|
Dan Balasescu
|
f18519965c
|
Merge branch 'master' into eager-skip-filters
|
2019-12-05 12:27:42 +09:00 |
|
Dean Herbert
|
48287459a0
|
Optimise filters to avoid property retrieval
Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.
|
2019-12-05 01:52:22 +09:00 |
|
Dean Herbert
|
36224dca13
|
Fix multiplayer aggregate score inheriting from ScoreInfo
|
2019-12-05 01:45:28 +09:00 |
|
Dean Herbert
|
9ac0ac0944
|
Merge branch 'master' into fix-pause-testcase
|
2019-12-05 01:00:27 +09:00 |
|
Dan Balasescu
|
19c5848e73
|
Merge branch 'master' into decouple-legacy-score-info
|
2019-12-04 11:47:27 +09:00 |
|
Dan Balasescu
|
242e1b0b2e
|
Merge branch 'master' into add-missing-long-running
|
2019-12-04 11:29:25 +09:00 |
|
Huo Yaoyuan
|
a42f9447e6
|
Don't use Equals(object) on T?.
|
2019-12-03 20:07:22 +08:00 |
|
Dean Herbert
|
f0d49d0cdf
|
Decouple APILegacyScoreInfo from ScoreInfo
|
2019-12-03 15:31:11 +09:00 |
|
Dean Herbert
|
b51ebe4431
|
Fix ScoreResultsPage usage
|
2019-11-29 15:50:50 +09:00 |
|
Dean Herbert
|
2663e5d756
|
Add some more missing LongRunningLoad flags
|
2019-11-29 13:52:23 +09:00 |
|
Albie
|
7864899249
|
Merge branch 'master' into cinema-mod
|
2019-11-28 16:42:01 +00:00 |
|
Ganendra Afrasya
|
ada8dabf7e
|
Add right margin on score multiplier text
|
2019-11-28 18:48:43 +07:00 |
|
smoogipoo
|
f504370867
|
Make player block exit if pausable
|
2019-11-28 15:58:26 +09:00 |
|
Ganendra Afrasya
|
944835da23
|
Add multiplier score text on mods footer button
|
2019-11-28 12:01:40 +07:00 |
|
Dan Balasescu
|
c6a85a11bd
|
Merge branch 'master' into sharpen
|
2019-11-27 17:09:11 +09:00 |
|
Huo Yaoyuan
|
eba8657d38
|
Remove newly introduced redundant this .
|
2019-11-26 18:41:19 +08:00 |
|
Huo Yaoyuan
|
c0fe91a84c
|
Merge branch 'master' into sharpen
|
2019-11-26 18:21:50 +08:00 |
|
Albie
|
09158b6b08
|
Merge branch 'master' into cinema-mod
|
2019-11-26 06:57:47 +00:00 |
|
Dean Herbert
|
77ce9642ba
|
Add test coverage and simplify break time updating
|
2019-11-26 15:32:48 +09:00 |
|
Dean Herbert
|
a453129d44
|
Fix nullref in tests
|
2019-11-26 15:13:50 +09:00 |
|
Dan Balasescu
|
8a8e863c0e
|
Merge branch 'master' into intro-outro-break
|
2019-11-26 12:47:42 +09:00 |
|
Dan Balasescu
|
b21de98296
|
Merge branch 'master' into get-end-time
|
2019-11-26 11:47:01 +09:00 |
|
Dean Herbert
|
fbebbab5db
|
Remove excess parenthesis
|
2019-11-25 22:37:07 +09:00 |
|
Albie
|
87ee3f1083
|
Merge branch 'master' into cinema-mod
|
2019-11-25 13:35:14 +00:00 |
|
Dean Herbert
|
709ec1404f
|
Centralise End/StartTime retrieval to extension method
|
2019-11-25 19:09:14 +09:00 |
|
Dean Herbert
|
6b8983b489
|
Consider intro and outro time as "break" time
|
2019-11-25 19:02:11 +09:00 |
|
smoogipoo
|
719f0d5947
|
Fix stutters when changing beatmap difficulties
|
2019-11-25 18:28:43 +09:00 |
|
Albie
|
0a70ec0b11
|
Merge branch 'master' into cinema-mod
|
2019-11-25 07:25:30 +00:00 |
|
Albie
|
9fdbb2a58e
|
change name of interface and expose method instead of seperate values
|
2019-11-25 07:24:29 +00:00 |
|
Berkan Diler
|
fccdbffa93
|
Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
|
2019-11-25 00:45:42 +01:00 |
|
Albie
|
9a8e3fe1da
|
add brackets
|
2019-11-24 07:44:35 +00:00 |
|
Albie
|
1d6665fe57
|
improve code quality using resharper and codefactor advice
|
2019-11-24 07:42:39 +00:00 |
|
Albie
|
b8e5796af5
|
add forced video/storyboard and disabled dim for mod inside new interface
|
2019-11-24 07:37:06 +00:00 |
|
Dean Herbert
|
4063135a3a
|
Fix result mode button's corner exponent
|
2019-11-22 20:45:05 +09:00 |
|
Dean Herbert
|
c2e85a2057
|
Apply CornerExponent fixes
|
2019-11-22 19:49:20 +09:00 |
|
Dean Herbert
|
83080c3b5f
|
Fix merge regression
|
2019-11-22 14:14:18 +09:00 |
|
Dan Balasescu
|
5d2a608be0
|
Merge branch 'master' into lead-in-fixes
|
2019-11-22 13:48:55 +09:00 |
|
Dan Balasescu
|
7c19f7cd7b
|
Merge branch 'master' into improve-skip-button-feel
|
2019-11-22 13:36:27 +09:00 |
|
Dan Balasescu
|
ba0ac93f70
|
Merge branch 'master' into skip-multiple-times
|
2019-11-22 13:23:50 +09:00 |
|
Dean Herbert
|
d8260f4a65
|
Reduce carousel scroll motion on initial display
|
2019-11-22 10:51:49 +09:00 |
|
Dean Herbert
|
ab42fac43a
|
Improve naming
|
2019-11-22 02:38:31 +09:00 |
|
Dean Herbert
|
f390e558c7
|
Combine and simplify beatmap change logic
|
2019-11-22 02:32:02 +09:00 |
|
Dean Herbert
|
a97d760afa
|
Merge remote-tracking branch 'upstream/master' into menu-background-modes
|
2019-11-22 02:23:02 +09:00 |
|
Huo Yaoyuan
|
818553027b
|
Merge branch 'master' into sharpen
|
2019-11-21 23:42:46 +08:00 |
|
Dean Herbert
|
201f32859a
|
Merge branch 'master' into slider-control-point-removal
|
2019-11-21 22:10:52 +09:00 |
|
Dean Herbert
|
bd6831624a
|
Decouple skip button animations from gameplay clock
|
2019-11-21 19:51:22 +09:00 |
|
Dean Herbert
|
ffd0e17826
|
Merge branch 'skip-multiple-times' into lead-in-fixes
|
2019-11-21 19:01:28 +09:00 |
|
Dean Herbert
|
46a94821d4
|
Add support for consecutive skips
|
2019-11-21 18:59:55 +09:00 |
|
Dean Herbert
|
29d2374928
|
Add back skip button actuation count tests
|
2019-11-21 17:23:52 +09:00 |
|
Dean Herbert
|
2dd2e3d861
|
Add correct AudioLeadIn support
|
2019-11-21 16:55:18 +09:00 |
|
Dean Herbert
|
8369be90f2
|
Allow skip button to actuate more than once
|
2019-11-21 15:19:06 +09:00 |
|
Dean Herbert
|
c0b9bb5a12
|
Merge remote-tracking branch 'upstream/master' into lead-in-fixes
|
2019-11-21 14:22:17 +09:00 |
|
Dean Herbert
|
2325f0382c
|
Cancel a potentially pending filter update when an update occurs
|
2019-11-21 13:46:45 +09:00 |
|
Dean Herbert
|
4d6904468d
|
Merge remote-tracking branch 'upstream/master' into multi-searching
|
2019-11-21 13:44:04 +09:00 |
|
Dan Balasescu
|
a7c074ff37
|
Merge branch 'master' into math_clamp
|
2019-11-21 11:08:56 +09:00 |
|
smoogipoo
|
0cbe29dbec
|
Refactor / cleanup debouncing
|
2019-11-21 11:05:18 +09:00 |
|
Berkan Diler
|
6cab517b2d
|
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
|
2019-11-20 13:37:47 +01:00 |
|
Dean Herbert
|
3ba9f840fd
|
Fix song select not always scrolling to the correct location
|
2019-11-20 19:39:13 +09:00 |
|
Huo Yaoyuan
|
374ef6ff83
|
Merge branch 'master' into sharpen
|
2019-11-20 17:30:58 +08:00 |
|
Dean Herbert
|
8c9ed99b1b
|
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
|
2019-11-20 17:24:54 +09:00 |
|
Dean Herbert
|
5b416eb7ba
|
Move initial filter to run on entering
|
2019-11-20 17:24:43 +09:00 |
|
Dean Herbert
|
e0f59d8e24
|
Move method
|
2019-11-20 15:43:00 +09:00 |
|
Huo Yaoyuan
|
b04bca7db6
|
Reference elements in origin definition.
|
2019-11-17 20:55:40 +08:00 |
|
Dean Herbert
|
e9e37fc821
|
Add private setter for FilterControl
|
2019-11-15 18:23:35 +09:00 |
|
Dean Herbert
|
296fff9243
|
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
|
2019-11-15 18:20:36 +09:00 |
|
smoogipoo
|
10287eb66d
|
Add debounce logic in several places
|
2019-11-15 17:58:47 +09:00 |
|
smoogipoo
|
1b4bcb81c8
|
Fix filtering breaking on secondary filters
|
2019-11-15 17:49:02 +09:00 |
|
Dean Herbert
|
eee5902851
|
Merge remote-tracking branch 'upstream/master' into lead-in-fixes
|
2019-11-15 14:05:31 +09:00 |
|
Dean Herbert
|
2c3109980a
|
Fix broken merge
|
2019-11-15 13:51:39 +09:00 |
|
Dean Herbert
|
6d06b444ba
|
Allow screen to specify whether to apply audio rate adjustments from mods
|
2019-11-15 13:47:14 +09:00 |
|
Dean Herbert
|
b8bb97607b
|
Merge remote-tracking branch 'upstream/master' into fix-mod-retention
|
2019-11-15 13:46:44 +09:00 |
|
smoogipoo
|
f0b7b2e1c4
|
Fix broken test case
|
2019-11-15 11:07:16 +09:00 |
|
smoogipoo
|
956fb9912d
|
Hook up multiplayer search filter
|
2019-11-15 08:23:56 +09:00 |
|
Huo Yaoyuan
|
677717875e
|
Change a case to EqualityComparer.Default to handle null properly.
|
2019-11-14 17:35:02 +08:00 |
|
Huo Yaoyuan
|
f25b1ba06f
|
Merge branch 'master' into equals
|
2019-11-14 17:33:44 +08:00 |
|