Dan Balasescu
2d4e557134
Merge branch 'master' into fix-potential-null-test
2019-09-30 12:19:11 +09:00
miterosan
9f498d2990
Log the exception that caused to loading of rulesets to fail.
2019-09-29 19:25:44 +02:00
Andrei Zavatski
907f73ef8f
Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile
2019-09-29 14:45:36 +03:00
Dean Herbert
193a9b0dd7
Merge branch 'master' into labelled-switch-button
2019-09-29 14:56:26 +08:00
Dean Herbert
ce62f3c75b
Simplify and future-proof random retrieval method
...
Will support future added intros without further code changes. Also uses RNG instead of `new Random`.
2019-09-29 14:35:35 +08:00
Dean Herbert
740efa5747
Handle potential null case
2019-09-29 12:19:42 +08:00
V1ntagezTV
9f1c378733
moved into the switch case
2019-09-29 00:35:47 +05:00
V1ntagezTV
2681e2064a
remove comment
2019-09-29 00:34:09 +05:00
V1ntagezTV
1babd139bc
remove needless blank
2019-09-29 00:22:23 +05:00
V1ntagezTV
52b044b7f6
Add random intro!
2019-09-29 00:10:17 +05:00
Dean Herbert
02c1f490f1
Merge branch 'master' into muted-notification
2019-09-28 20:33:32 +08:00
Dean Herbert
a45f8c968b
Rename and add simple xmldoc
2019-09-28 20:21:51 +08:00
Dean Herbert
d01c30fd52
Merge branch 'master' into introduce-session-statics
2019-09-28 20:16:52 +08:00
Dean Herbert
1d1df2433f
Merge branch 'master' into fix-track-adjustments-not-applied-after-resume
2019-09-28 19:42:31 +08:00
Andrei Zavatski
a8eef0d0c4
Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile
2019-09-28 12:34:16 +03:00
iiSaLMaN
fb9f21237e
Reset track adjustments on resuming from another screen
2019-09-28 04:18:16 +03:00
dependabot-preview[bot]
3af7c910fb
Bump Humanizer from 2.7.2 to 2.7.9
...
Bumps [Humanizer](https://github.com/Humanizr/Humanizer ) from 2.7.2 to 2.7.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases )
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md )
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.2...v2.7.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-27 19:09:07 +00:00
Dan Balasescu
8b7f558728
Merge branch 'master' into improve-hold-button-text
2019-09-27 17:35:03 +09:00
Andrei Zavatski
4908cb826b
Fix line breaks
2019-09-27 09:46:11 +03:00
Andrei Zavatski
475455d7cd
Add missing line breaks
2019-09-27 09:32:46 +03:00
Andrei Zavatski
94eacbca5d
Fix Bot users have all the profile sections in ProfileOverlay
2019-09-27 09:22:25 +03:00
Dean Herbert
f4f5a7e9c8
Fix test regressions
2019-09-27 13:20:17 +08:00
Dean Herbert
b50ef8ffa4
Allow null NotificationManager
2019-09-27 13:15:33 +08:00
iiSaLMaN
2670a23e6f
Assign to field and move to load complete
2019-09-27 08:15:24 +03:00
iiSaLMaN
7904f77cd5
Bind event to activation delay change
2019-09-27 02:59:42 +03:00
smoogipoo
45f2bcc440
Fix combo bindings not being bound to nested hitobjects
2019-09-26 17:39:19 +09:00
smoogipoo
706e884cc0
Update accent colour on combo index change
2019-09-26 17:13:13 +09:00
smoogipoo
bbf0544a8d
Add bindables for IHasComboInformation properties
2019-09-26 16:55:08 +09:00
iiSaLMaN
911094e790
Replace menu button text with "press for menu" on 0ms activation delay
2019-09-26 01:42:56 +03:00
Dean Herbert
e2744054c7
Merge branch 'master' into back-button-part-2
2019-09-25 22:46:08 +09:00
Dean Herbert
7d5544460b
Fix mania scrolling speed not including beatmap slider multipli… ( #6236 )
...
Fix mania scrolling speed not including beatmap slider multiplier
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-25 22:34:46 +09:00
Dean Herbert
45f833ceea
Add invocation null checks for safety
2019-09-25 22:14:42 +09:00
Salman Ahmed
3aa9a172d8
Merge branch 'master' into introduce-session-statics
2019-09-25 16:14:39 +03:00
Dean Herbert
42fd323020
Move protected method
2019-09-25 22:13:49 +09:00
Dean Herbert
8c01677e0b
Merge remote-tracking branch 'upstream/master' into back-button-part-2
2019-09-25 22:12:00 +09:00
iiSaLMaN
8844d567cb
Use bindable setting instead
2019-09-25 15:56:47 +03:00
smoogipoo
244627ff10
Add comment + test for slider multiplier
2019-09-25 20:12:01 +09:00
Dean Herbert
f11156c2dc
Fix tests not working correctly
2019-09-25 19:30:25 +09:00
smoogipoo
9f77a1ef35
Adjust namespaces
2019-09-25 17:53:08 +09:00
smoogipoo
d32a0acd10
Merge remote-tracking branch 'origin/master' into labelled-switch-button
2019-09-25 17:51:12 +09:00
smoogipoo
c9e39c124e
Add a labelled switch button
2019-09-25 17:42:35 +09:00
smoogipoo
261ba5c80a
Fix button not transforming correctly in some cases
2019-09-25 17:42:27 +09:00
Dean Herbert
ff9033f9ac
Merge remote-tracking branch 'upstream/master' into muted-notification
2019-09-25 16:47:56 +09:00
Dean Herbert
3bd0fc2947
Merge remote-tracking branch 'upstream/master' into android-build-automation
2019-09-25 16:33:36 +09:00
Dan Balasescu
0eff9aa5e9
Merge branch 'master' into improve-carousel-tests
2019-09-25 15:55:11 +09:00
Dan Balasescu
213488a25e
Merge branch 'master' into abstract-update-manager
2019-09-25 15:41:45 +09:00
Dean Herbert
c83db94eb7
Use isolated storage/api
2019-09-25 15:00:08 +09:00
Dean Herbert
654b815b36
Merge remote-tracking branch 'upstream/master' into back-button-part-2
2019-09-25 14:38:39 +09:00
Dean Herbert
bb1289e83c
Merge branch 'master' into improve-carousel-tests
2019-09-25 14:24:28 +09:00
Joehu
102dbd85bd
Fix CI errors
2019-09-24 16:48:22 -07:00
Joehu
9861b21440
Remove unnecessary padding/margin
2019-09-24 16:28:40 -07:00
Joehu
7fab1a4337
Truncate long metadata on beatmap info wedge
2019-09-24 16:06:33 -07:00
Bartłomiej Dach
9323df26a1
Decouple bar line hitobjects from generator
...
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.
This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
2019-09-25 00:36:27 +02:00
iiSaLMaN
cde7f49db1
Use direct get and set instead
2019-09-25 01:26:02 +03:00
iiSaLMaN
d013b73d33
Move in-memory logic to a base class
2019-09-25 01:25:05 +03:00
Dean Herbert
4a59e3351e
Update beatmap carousel tests code style
...
Also fixes one issue I spotted in BeatmapCarousel related to incorrectly holding a selection after new sets are loaded.
2019-09-25 02:42:12 +09:00
Dean Herbert
03ec0fb27d
Merge branch 'master' into fix-mania-scrolling-speed
2019-09-24 22:20:19 +09:00
Dean Herbert
d2b76ec688
Make LabelledTextBox use the new LabelledComponent class ( #6188 )
...
Make LabelledTextBox use the new LabelledComponent class
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-24 19:37:12 +09:00
Dean Herbert
f493f1c71d
Move new components to v2 namespace
2019-09-24 19:00:26 +09:00
Dean Herbert
551b66ccec
Update framework ( #6234 )
...
Update framework
Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-24 18:54:47 +09:00
smoogipoo
028c958431
Initial implementation of a switch button
2019-09-24 18:39:11 +09:00
Dean Herbert
42b6041763
Move post-update notification logic to UpdateManager base class
2019-09-24 18:37:05 +09:00
Dean Herbert
c226d52b53
Don't automatic download for now
2019-09-24 18:34:54 +09:00
Dan Balasescu
1e70b83fd3
Merge branch 'master' into update-framework
2019-09-24 18:27:38 +09:00
smoogipoo
6b702eb6de
Update with generic labelledcomponent
2019-09-24 18:25:17 +09:00
smoogipoo
5212c50654
Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements
2019-09-24 18:23:01 +09:00
smoogipoo
df692b091c
Make LabelledComponent generic
2019-09-24 18:22:02 +09:00
Dean Herbert
84d9f98ff1
fixup! Move post-update notification logic to UpdateManager base class
2019-09-24 18:15:57 +09:00
Dean Herbert
1c474de0ed
Move post-update notification logic to UpdateManager base class
2019-09-24 18:03:05 +09:00
Dan Balasescu
45015fc4ba
Merge branch 'master' into tournament-setup
2019-09-24 17:27:17 +09:00
smoogipoo
4abe0473b9
Fix relative beat length not considering slider multiplier
2019-09-24 16:49:42 +09:00
smoogipoo
af0c15a93c
Fix initial hitobject states not being recomputed correctly
2019-09-24 16:48:39 +09:00
smoogipoo
75cceb9e30
Fix LifetimeChanged being invoked before lifetime is set
2019-09-24 16:47:34 +09:00
Dean Herbert
1860c2f9ce
Update framework
2019-09-24 16:22:30 +09:00
Dan Balasescu
b67b594036
Merge branch 'master' into menu-key-support
2019-09-24 15:09:38 +09:00
smoogipoo
4555ecc5e0
Check for exact key
2019-09-24 15:09:08 +09:00
Dan Balasescu
615e300bc9
Merge branch 'master' into fix-changelog-margin
2019-09-24 13:39:17 +09:00
iiSaLMaN
267e12ce3c
Add sample usage to the session statics
2019-09-24 05:45:47 +03:00
dependabot-preview[bot]
53603b5591
Bump System.ComponentModel.Annotations from 4.5.0 to 4.6.0
...
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx ) from 4.5.0 to 4.6.0.
- [Release notes](https://github.com/dotnet/corefx/releases )
- [Commits](https://github.com/dotnet/corefx/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-23 20:15:51 +00:00
Andrei Zavatski
5c4dfe0809
Apply suggested change
2019-09-23 17:05:19 +03:00
Andrei Zavatski
ffbab25358
Fix incorrect icon margin in ChangelogOverlay
2019-09-23 16:12:43 +03:00
iiSaLMaN
e3e245ab20
Introduce SessionStatics
2019-09-23 08:15:27 +03:00
Dean Herbert
9a6d748498
Merge branch 'master' into add-creator-artist-filters
2019-09-23 12:31:51 +09:00
Craftplacer
9a687ae8e2
Merge branch 'master' into muted-notification
2019-09-23 01:59:37 +02:00
Dean Herbert
b41ac543c5
Allow changing logged in user
2019-09-23 04:46:50 +09:00
Bartłomiej Dach
96c0c80dc5
Factor out methods in FilterQueryParser
...
Factor FilterQueryParser.ApplyQueries into shorter methods to reduce
method complexity.
2019-09-22 21:20:50 +02:00
Dean Herbert
d6ec6b1eda
Merge branch 'master' into labelled-textbox-improvements
2019-09-23 00:39:29 +09:00
Dean Herbert
9fe7675be8
Add a base class for all future labelled components ( #6187 )
...
Add a base class for all future labelled components
2019-09-23 00:38:51 +09:00
Dean Herbert
e5b14ce74d
Add null check for safety
...
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-22 21:42:32 +09:00
Dean Herbert
fc1d49631a
Allow top-level menu key pressed to progress the osu! logo
2019-09-22 20:31:53 +09:00
Dean Herbert
cdf29b0952
Specify model name on initialize and fail import notification m… ( #6192 )
...
Specify model name on initialize and fail import notification messages
2019-09-22 15:54:04 +09:00
Bartłomiej Dach
70842f71f4
Fix floating point handling in filter intervals
...
Due to floating-point rounding and representation errors, filters could
wrongly display results incongruous with the wedge display text (ie.
a beatmap with the BPM of 139.99999 would be displayed as having 140
BPM and also pass the bpm<140 filter).
Apply tolerance when parsing floating-point constraints. The tolerance
chosen is half of what the UI displays for the particular values (so
for example half of 0.1 for AR/DR/CS, 0.01 for stars, etc.)
Tests updated accordingly.
2019-09-22 00:20:55 +02:00
Bartłomiej Dach
b262ba13cd
Add creator= and artist= filters
...
To match stable, add creator= and artist= filters to the beatmap
carousel on song select screen. Contrary to stable, this implementation
supports phrase queries with spaces within using double quotes.
The quote handling is not entirely correct (can't nest), but quotes
should rarely happen within names, and it is an edge case of an edge
case - leaving best-effort as is. Test coverage also included.
2019-09-22 00:20:55 +02:00
Bartłomiej Dach
f5f5094611
Take culture into account when parsing filters
...
Culture was not taken into account when parsing filters, which meant
that in cultures that use the comma (,) as a decimal delimiter, it would
conflict with the comma used to delimit search criteria. To remove
any ambiguity, introduce local helper functions that allow the decimal
point to be utilised, using the invariant culture. This also matches
stable behaviour.
The decision to not reuse osu.Game.Beatmaps.Formats.Parsing was
deliberate due to differing semantics (it's not really sane to throw
exceptions on receiving user-facing input).
2019-09-22 00:18:53 +02:00
Bartłomiej Dach
dddd94684b
Split out lower and upper interval inclusivity
...
A single IsInclusive field causes unexpected issues when trying to
formulate a half-open interval query. Split out IsInclusive into two
fields, Is{Lower,Upper}Inclusive and update usages accordingly.
2019-09-22 00:18:28 +02:00
Bartłomiej Dach
33c51d5178
Extract parsing filter queries to class
...
For the sake of testability without having to spin up visual tests,
extract methods related to parsing filter queries from FilterControl
to a static FilterQueryParser class.
2019-09-22 00:18:28 +02:00
iiSaLMaN
9be8bdef52
Remove pluralize and use title letter casing
2019-09-21 21:00:24 +03:00
iiSaLMaN
6bb0f3eb41
Move humanizing to the model name instead
2019-09-21 20:04:12 +03:00
Dean Herbert
db90d211cb
Fix scores importing with deleted beatmap sets ( #6190 )
...
Fix scores importing with deleted beatmap sets
2019-09-22 01:15:22 +09:00
Dean Herbert
c99b48f934
Bring up-to-date and use IApplicableFailOverride
2019-09-21 23:30:54 +09:00
Dean Herbert
4c4b71eeec
Merge branch 'master' into master
2019-09-21 22:45:05 +09:00
Dean Herbert
a76771e696
Add support for "additions" in changelog ( #6177 )
...
Add support for "additions" in changelog
2019-09-21 22:27:18 +09:00
Dan Balasescu
73fe402756
Merge branch 'master' into fix-html-unescaping
2019-09-21 12:59:57 +09:00
Andrei Zavatski
befdd140f4
Reverse padding changes
2019-09-20 23:50:19 +03:00
Andrei Zavatski
6ad26e61d1
Merge remote-tracking branch 'refs/remotes/ppy/master' into changelog-improvements
2019-09-20 23:49:24 +03:00
Dean Herbert
dced3c38b5
Update framework ( #6196 )
...
Update framework
2019-09-21 02:21:00 +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
iiSaLMaN
3be03a26c9
Pluralize instead of adding 's'
2019-09-20 16:18:55 +03:00
iiSaLMaN
8300e86f20
Specify model name on import notification messages
2019-09-20 15:46:43 +03:00
smoogipoo
c89c092b98
Allow undeleting scores if their beatmap exists
2019-09-20 19:55:59 +09:00
smoogipoo
dfc0928ebe
Fix scores importing with deleted beatmap sets
2019-09-20 19:39:21 +09:00
smoogipoo
2bbf4ca4b5
Update LabelledTextBox to use LabelledComponent
2019-09-20 18:50:50 +09:00
smoogipoo
523272edab
Add xmldocs
2019-09-20 18:39:04 +09:00
smoogipoo
e0a97cfac5
Add a LabelledComponent base class
2019-09-20 18:35:15 +09:00
Dean Herbert
a06cb54732
Merge branch 'master' into beatmap-parsing-fallback-v2
2019-09-20 15:28:08 +09:00
Dean Herbert
d0a4e1e3c2
Force a checksum check before skipping FileStore copy op
2019-09-20 15:00:27 +09:00
Revel
f7f9c0f7e0
Update BeatmapDetailAreaTabControl.cs
2019-09-19 15:47:32 -04:00
Lucas A
5663e3e6b3
Fix escaped html strings not being unescaped in changelog entries.
2019-09-19 20:08:14 +02:00
Andrei Zavatski
daa64f1be7
Adjust icon padding
2019-09-19 20:53:06 +03:00
Andrei Zavatski
573da7b1e7
Implement ChangelogEntryType
2019-09-19 20:34:37 +03: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
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
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
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
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
fa54a0bfd3
Fix test failures
2019-09-19 17:40:46 +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
smoogipoo
167bb9fcc1
Fix ugly casts
2019-09-19 17:11:28 +09:00
smoogipoo
0915a94470
Make BeatDivisor use OptionalRange
2019-09-19 16:53:27 +09:00
smoogipoo
3c21b68b73
Make OptionalRange generic
2019-09-19 16:51:57 +09:00
Dean Herbert
2cd7c769e1
Merge remote-tracking branch 'upstream/master' into fix-judgement-size
2019-09-19 16:32:37 +09:00