1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-06 23:47:29 +08:00
Commit Graph

14724 Commits

Author SHA1 Message Date
Andrei Zavatski
babd34470e Fix DrawableFlag returns empty texture if there's no flag avaliable for needed country 2019-09-15 02:33:21 +03:00
Bartłomiej Dach
dd9f620c23 Fix misleading xmldoc 2019-09-15 01:28:07 +02:00
Bartłomiej Dach
86588778b1 Implement fallback decoder registration
After the preparatory introduction of LineBufferedReader, it is now
possible to introduce registration of fallback decoders that won't drop
input supplied in the first line of the file.

A fallback decoder is used when the magic in the first line of the file
does not match any of the other known decoders. In such a case,
the fallback decoder is constructed and provided a LineBufferedReader
instance. The process of matching magic only peeks the first non-empty
line, so it is available for re-reading in Decode() using ReadLine().

There can be only one fallback decoder per type; a second attempt of
registering a fallback will result in an exception to avoid bugs.

To address the issue of parsing failing on badly or non-headered files,
set the legacy decoders for Beatmaps and Storyboards as the fallbacks.

Due to non-trivial logic, several new, passing unit tests with possible
edge cases also included.
2019-09-15 01:28:07 +02:00
Bartłomiej Dach
11eda44d34 Migrate decoding to line-buffered reader
Migrate all usages of StreamReader in the context of decoding beatmaps,
storyboards or skins to the new LineBufferedReader.
2019-09-15 01:28:07 +02:00
Bartłomiej Dach
7b1ff38df7 Implement line-buffered reader
Add a line-buffered reader decorator operating on StreamReader
instances. The decorator has two main operations - PeekLine(), which
allows to see the next line in the stream without consuming it,
ReadLine(), which consumes and returns the next line in the stream, and
ReadToEnd() which reads all the remaining text in the stream (including
the unconsumed peeked line). Peeking line-per-line uses an internal
queue of lines that have been read ahead from the underlying stream.

The addition of the line-buffered reader is a workaround solution to
a problem with decoding. At current selecting a decoder works by
irreversibly reading the first line from the stream and looking for
a magic string that indicates the type of decoder to use.

It might however be possible for a file to be valid in format, just
missing a header. In such a case a lack of a line-buffered reader makes
it impossible to reparse the content of that first line. Introducing it
will however allow to peek the first line for magic first.

 - If magic is found in the first line, GetDecoder() will peek it and
   use it to return the correct Decoder instance. Note that in the case
   of JsonBeatmapDecoder the magic is the opening JSON object brace,
   and therefore must not be consumed.

 - If magic is not found, the fallback decoder will be able to consume
   it using ReadLine() in Decode().

This commit additionally contains basic unit tests for the reader.

Suggested-by: Aergwyn <aergwyn@t-online.de>
2019-09-15 01:26:15 +02:00
Roman Kapustin
8456861b8d Wait for cursor hiding using ManualResetEventSlim 2019-09-14 17:08:56 +03:00
Andrei Zavatski
2783ae62ef Remove useless container 2019-09-14 06:34:57 +03:00
Andrei Zavatski
9febeb1f3d Add black background 2019-09-14 06:32:00 +03:00
Andrei Zavatski
a36c808682 Use Fit FillFode 2019-09-14 06:28:59 +03:00
Andrei Zavatski
8ad782a82d Fix RankingsHeader dropdown can be clickable when not visible 2019-09-14 06:16:25 +03:00
Andrei Zavatski
9a94405b3a Fix video playback is stretched on client resize 2019-09-14 06:05:09 +03:00
Dean Herbert
65aa7b2016 Recreate beatmap video on each consumption
Should not be shared over multiple usages
2019-09-14 00:07:06 +09:00
Dean Herbert
1b8d5decfa
Add beatmap video support (#5908)
Add beatmap video support

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-13 23:31:34 +09:00
Dean Herbert
2cd3657b5e
Merge branch 'master' into beatmap-video 2019-09-13 23:08:57 +09:00
Dean Herbert
624e5644a4 Change osu!catch key trigger to occur on frame before positional change 2019-09-13 23:06:35 +09:00
Dean Herbert
9e53c091a3
Merge pull request #6095 from peppy/fix-test-dummy-api
Fix incorrect DI usage of IAPIProvider in many tests
2019-09-13 22:22:07 +09:00
Dean Herbert
2379b665e3 Use InvalidOperationException 2019-09-13 22:15:11 +09:00
Dean Herbert
d385c35955
Apply suggestions from code review
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-13 21:55:45 +09:00
Andrei Zavatski
9e742839ac Use correct database migration 2019-09-13 13:57:55 +03:00
Andrei Zavatski
fb9b25b786 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-09-13 13:48:14 +03:00
Dan Balasescu
b10ce0b12d
Merge branch 'master' into key-counter-fixes 2019-09-13 19:43:33 +09:00
Andrei Zavatski
c13950fbbf Remove custom db additions 2019-09-13 13:43:21 +03:00
Andrei Zavatski
437e121056 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-09-13 13:39:58 +03:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames 2019-09-13 19:23:15 +09:00
Dean Herbert
e1ed5dfa7d
Reset DrawableHitObject lifetimes on state change (#6028)
Reset DrawableHitObject lifetimes on state change

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-13 19:10:02 +09:00
Dean Herbert
614e68cdf9 Remove redundant BindTarget usage 2019-09-13 18:11:17 +09:00
Dean Herbert
031f0ee1e7 Consume ValueChanged and inline some pointless constants 2019-09-13 18:09:15 +09:00
Dean Herbert
1e4f3507ed Fix layout not matching web 2019-09-13 18:07:52 +09:00
Dean Herbert
0cc21c9c74 Fix changelog overlay potentially adding children after disposal 2019-09-13 17:21:47 +09:00
Dean Herbert
7cb79dd760 Fix incorrect DI usage of IAPIProvider in many tests 2019-09-13 17:15:33 +09:00
Andrei Zavatski
6867b3c232 Update resources 2019-09-13 10:56:21 +03:00
Andrei Zavatski
cb98b07e33 Merge master with conflicts resolved 2019-09-13 10:45:01 +03:00
Dean Herbert
ffd205f470 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6076 2019-09-13 16:25:30 +09:00
Dean Herbert
78e7be919f Remove unnecessary container 2019-09-13 16:25:25 +09:00
Dean Herbert
c4f9be5913
Merge pull request #6093 from smoogipoo:fix-player-restart
Fix player not correctly restarting after an unpause
2019-09-13 16:09:41 +09:00
Dean Herbert
7818ecd71c Forward ValueChangedEvent instead 2019-09-13 16:03:44 +09:00
Dean Herbert
a05ae2c1b2 Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6082 2019-09-13 15:53:11 +09:00
smoogipoo
cf2f841b4d Fix player not correctly exiting after an unpause 2019-09-13 15:42:58 +09:00
Dean Herbert
c66e963705 Make constructor private 2019-09-13 15:42:36 +09:00
Dean Herbert
dc8c7a5041 Add null check for safety 2019-09-13 15:27:42 +09:00
Dean Herbert
44947aa9ed Make PopupDialog abstract 2019-09-13 15:27:29 +09:00
Dean Herbert
e2e87d5268
Merge branch 'master' into properly-fix-dialog-double-samples 2019-09-13 14:53:29 +09:00
Andrei Zavatski
5a72083c13 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-13 08:32:06 +03:00
Dean Herbert
43d7615734 Merge remote-tracking branch 'upstream/master' into rankings-scope-selector 2019-09-13 14:07:39 +09:00
Dean Herbert
0e679fb468 Use colour constant rather than opacity helper function 2019-09-13 14:06:19 +09:00
Dean Herbert
b917f29cfe Make GradientLineTabControl abstract 2019-09-13 13:59:06 +09:00
Dean Herbert
3b82c6db49
Merge branch 'master' into leaderboard-mod-icons-spacing 2019-09-13 13:27:18 +09:00
Joehu
2a8fa2f593 Refactor modsContainer on profile scores 2019-09-12 14:01:12 -07:00
Andrei Zavatski
99fc13b4d8 Update usage of the DismissableFlag 2019-09-12 19:34:58 +03:00
Andrei Zavatski
0142fcd07a Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title 2019-09-12 19:29:05 +03:00
Andrei Zavatski
b17d097a39 Simplify colour usage in GradientLine 2019-09-12 17:17:57 +03:00
Andrei Zavatski
4dd819c150 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-12 17:17:32 +03:00
Andrei Zavatski
cafb5105bc Rename HeaderFlag to DismissableFlag 2019-09-12 16:44:15 +03:00
Dean Herbert
2cb084666b
Merge branch 'master' into rankings-scope-selector 2019-09-12 22:37:14 +09:00
Dean Herbert
5f77236c01
Merge branch 'master' into closable-flag 2019-09-12 22:27:34 +09:00
Dean Herbert
b81b162ee1 Update InitialLifetimeOffset comment 2019-09-12 19:30:27 +09:00
Dean Herbert
9fc60aeefc Merge branch 'master' into reset-dho-lifetimes 2019-09-12 19:29:14 +09:00
Dean Herbert
f21e47d6d2 Move expire to DrawableHitObject 2019-09-12 19:29:08 +09:00
Dean Herbert
1dfd104690 Merge branch 'improve-catch-replay-frames' into key-counter-fixes 2019-09-12 18:34:00 +09:00
Dean Herbert
acdfeef1dc Improve how osu!catch stores and replays key actions 2019-09-12 18:33:46 +09:00
Dean Herbert
831d04f339 Don't use gameplay clock in KeyCounter 2019-09-12 15:48:07 +09:00
Dean Herbert
0cdf125c1e Handle key counter rewinding in a better way
Use ElapsedFrameTime rather than storing state data
2019-09-12 15:42:14 +09:00
Dean Herbert
cb0cf6e2c5 Remove reset functions 2019-09-12 14:27:52 +09:00
Dean Herbert
158737e001 Remove FadeTime customisation
Also adjusts fade transitions to feel better, especially in fast forward scenarios.
2019-09-12 14:27:29 +09:00
Dean Herbert
f9c969788a Fix keys not reaching full brightness as soon as they should 2019-09-12 13:56:23 +09:00
Andrei Zavatski
acdd26422d Implement Spotlights logic 2019-09-12 06:36:17 +03:00
Andrei Zavatski
0c6c8fdcd0 Implement RankingsHeader component 2019-09-12 05:53:18 +03:00
Andrei Zavatski
b657e31f93 Merge dependent changes 2019-09-12 05:26:10 +03:00
Andrei Zavatski
4bfb681db6 CI fixes 2019-09-12 05:16:56 +03:00
Andrei Zavatski
581508b8e7 Implement RankingsRulesetSelector 2019-09-12 05:06:51 +03:00
Andrei Zavatski
c3c2efe35c Add ability to override text in PageTabItem 2019-09-12 05:03:59 +03:00
Joehu
77ac186cf8 Add spacing to mod icons on leaderboards 2019-09-11 16:08:01 -07:00
Joehu
e0bf579b18 Properly fix dialog overlay playing double samples on show/hide 2019-09-11 15:35:47 -07:00
Andrei Zavatski
dbfbd1262f Implement HeaderTitle component for RankingsOverlay 2019-09-11 23:39:22 +03:00
Andrei Zavatski
eee1cad760 Merge remote-tracking branch 'refs/remotes/origin/closable-flag' into rankings-title 2019-09-11 23:01:38 +03:00
Andrei Zavatski
d6132f5e60 Merge remote-tracking branch 'refs/remotes/origin/rankings-scope-selector' into rankings-title 2019-09-11 23:00:47 +03:00
Dean Herbert
55a071e8ba Use BindValueChanged 2019-09-11 19:12:55 +09:00
Dean Herbert
be66c0e912 Fix potential of toggle between load and LoadComplete 2019-09-11 19:06:31 +09:00
Dean Herbert
039b5ec958 Update framework 2019-09-11 18:47:25 +09:00
Andrei Zavatski
41ad44791b Move RankingsScopeSelector to another namespace 2019-09-11 11:58:18 +03:00
Andrei Zavatski
f6de286868 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-11 11:53:45 +03:00
Andrei Zavatski
660c678cdc Remove unused using directives 2019-09-11 11:40:51 +03:00
Dean Herbert
2c09efa23b Handle changes to OverlayActivationMode 2019-09-11 17:34:28 +09:00
Dean Herbert
825a34ecd3 Early return to avoid other potential fail cases 2019-09-11 17:34:03 +09:00
Andrei Zavatski
1d1da1bc13 Visual improvements 2019-09-11 11:26:09 +03:00
Dean Herbert
f53410a42a Merge remote-tracking branch 'upstream/master' into re-order-events 2019-09-11 16:48:44 +09:00
Andrei Zavatski
95828b07ef Implement HeaderFlag component for rankings overlay 2019-09-11 10:40:58 +03:00
Dean Herbert
6760e239a1 Fix osu! hitcircle font textures being incorrectly sized 2019-09-11 13:39:21 +09:00
Andrei Zavatski
6c2db8e4b0 Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector 2019-09-10 16:33:08 +03:00
Dean Herbert
c27eed0195
Centralise and share bar line generation code between rulesets (#6054)
Centralise and share bar line generation code between rulesets
2019-09-10 19:31:29 +09:00
Dan Balasescu
4910c23482
Merge branch 'master' into show-beatmap-not-selected-in-leaderboards 2019-09-10 17:43:42 +09:00
Dan Balasescu
ea2793637d
Merge branch 'master' into add-chat-truncation 2019-09-10 17:11:49 +09:00
smoogipoo
717a287d69 Use real ellipsis character 2019-09-10 17:11:26 +09:00
smoogipoo
01fd08cba9 Fix broken positioning of effected usernames 2019-09-10 17:11:16 +09:00
Dean Herbert
af3bb5a2cd Centralise and share bar line generation code between rulesets 2019-09-10 13:30:54 +09:00
Andrei Zavatski
03bd7ca8e7 Implement RankingsScopeSelector 2019-09-10 04:20:32 +03:00
Andrei Zavatski
65869c7ebb Refactor LeaderboardScopeSelector for more extensibility 2019-09-10 04:04:37 +03:00
iiSaLMaN
b77550625c Check if DummyWorkingBeatmap is selected instead 2019-09-09 20:04:04 +03:00
Dean Herbert
98e384129c Remove redundant initialisation 2019-09-10 01:34:48 +09:00
Dean Herbert
7eb20da820 Add back local bool (required due to action limitations) 2019-09-10 01:18:02 +09:00
Dean Herbert
dce675d6a8
Merge branch 'master' into login-on-startup 2019-09-10 01:13:29 +09:00
Dean Herbert
f398f134e1 Remove unnecessary bool storage
Also delay show slightly for better user experience.
2019-09-10 01:12:30 +09:00
Dean Herbert
0ec642d826 Show instead of toggle 2019-09-10 01:06:37 +09:00
Dean Herbert
455a421caa Merge remote-tracking branch 'upstream/master' into add-chat-truncation 2019-09-09 17:56:24 +09:00
Dean Herbert
2d636ce147 Update framework 2019-09-09 17:54:53 +09:00
LeNitrous
ff49c4ae98 remove redundancies 2019-09-09 13:50:14 +08:00
LeNitrous
c2353cbdfa move logic to logo action 2019-09-09 13:30:48 +08:00
Dean Herbert
07fce8397b Move reset call to ctor 2019-09-09 14:24:17 +09:00
LeNitrous
04a4f9c9a3 use IsLoggedIn and remove useless clause 2019-09-09 11:26:51 +08:00
Dean Herbert
d0e8b1efce Merge remote-tracking branch 'upstream/master' into add-chat-truncation 2019-09-09 12:09:14 +09:00
Dean Herbert
eeebd517f3 Use MaxWidth specification 2019-09-09 12:08:59 +09:00
LeNitrous
be4f0cc2dd remove null conditional 2019-09-09 06:14:49 +08:00
LeNitrous
a67a2899a9 move api state check to it's own clause 2019-09-08 16:18:15 +08:00
LeNitrous
3435e2a8d3 open login on enter main menu 2019-09-08 13:36:58 +08:00
iiSaLMaN
be803fa921 Reset score processor before starting the simulation 2019-09-07 18:15:49 +03:00
iiSaLMaN
55b2bc1ed5 Set Health default value to 1 2019-09-07 18:03:04 +03:00
Dean Herbert
7f2d14416a Reset DrawableHitObject lifetimes on state change 2019-09-07 14:44:44 +09:00
Dan Balasescu
f47f0e797c
Merge branch 'master' into volume-at-pause 2019-09-06 19:47:37 +09:00
Dean Herbert
c6b8f2db77 Update historic licence header 2019-09-06 19:05:50 +09:00
Dean Herbert
374479f837 Add truncatino of long usernames in chat 2019-09-06 19:00:57 +09:00
Dean Herbert
95baae5088 Fix dragging from inside to outside an overlay incorrectly hiding 2019-09-06 18:27:54 +09:00
Dean Herbert
88d0756107 Allow global actions to propagate through pause screen 2019-09-06 17:17:30 +09:00
Dean Herbert
b89fb5cdf7 Fix failing test 2019-09-06 16:51:30 +09:00
Dean Herbert
6ce36bd39e
Merge branch 'master' into stop-counting-to-score-after-fail 2019-09-06 16:12:53 +09:00
Dean Herbert
a50284a5eb
Merge pull request #6019 from peppy/hit-window-refactor
Refactor HitWindows for legibility
2019-09-06 16:10:04 +09:00
Dean Herbert
75476df1af
Use float types for chat overlay height (#5960)
Use float types for chat overlay height
2019-09-06 16:08:16 +09:00
Dean Herbert
985375d1c6 Remove private field xmldoc 2019-09-06 15:47:01 +09:00
Dean Herbert
b3f61abd49
Use float types for cursor sizes (#5958)
Use float types for cursor sizes
2019-09-06 15:45:44 +09:00
Dean Herbert
4031f51745 More permissive IsHitResultAllow by default 2019-09-06 15:37:30 +09:00
Dean Herbert
c379480e7b
Merge branch 'master' into remove-judgement-occurred 2019-09-06 15:32:34 +09:00
Dean Herbert
f925e781a9 Refactor HitWindows for legibility 2019-09-06 15:24:14 +09:00
Dean Herbert
fbdef97498
Fix fallback to default combo colours not working (#6009)
Fix fallback to default combo colours not working
2019-09-06 12:36:39 +09:00
Dean Herbert
404ad3834d
Merge pull request #6008 from peppy/fix-sample-fallback
Add back missing sample fallback to default skin

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-06 12:36:31 +09:00
Dean Herbert
f4f9519761 Add todo comment 2019-09-06 12:16:20 +09:00
Dean Herbert
bf6f803e69 Nest temporary class 2019-09-06 12:12:27 +09:00
Dean Herbert
7d1f5310d2 Don't implement anything 2019-09-06 12:03:29 +09:00
dependabot-preview[bot]
43aed7fea7
Bump Humanizer from 2.6.2 to 2.7.2
Bumps [Humanizer](https://github.com/Humanizr/Humanizer) from 2.6.2 to 2.7.2.
- [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.6.2...v2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-06 02:58:58 +00:00
Dan Balasescu
5dbdce17a7
Merge branch 'master' into fix-sample-fallback 2019-09-06 11:27:39 +09:00
Dean Herbert
50985d1b1d Fix disposal logic 2019-09-06 10:43:19 +09:00
Dean Herbert
d6cdde552d Add comment explaining dispose logic 2019-09-06 01:14:37 +09:00
Dean Herbert
5b094f8e1d Actually register the RulesetConfigCache as a component 2019-09-06 01:13:58 +09:00
Dean Herbert
dafe9da851 Dispose config managers ahead of time to avoid database errors 2019-09-06 00:22:35 +09:00
Dean Herbert
a0aeccf232 Fix fallback to default combo colours not working 2019-09-05 23:24:13 +09:00
Dean Herbert
60c2d113b8 Fix typo 2019-09-05 23:07:03 +09:00
Dean Herbert
0a6c42972c Add back missing sample fallback to default skin 2019-09-05 23:01:35 +09:00
Dean Herbert
9d0151f19f
Merge pull request #5969 from peppy/skin-configuration-refactor
Refactor skin configuration lookups to be more flexible

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-05 17:28:37 +09:00
Dean Herbert
986ac08397
Fix pause menu keyboard navigation being affected by initial cu… (#6002)
Fix pause menu keyboard navigation being affected by initial cursor hover
2019-09-05 17:27:48 +09:00
smoogipoo
90985b6af6 Add missing license header 2019-09-05 17:01:14 +09:00
Dan Balasescu
f729282c73
Merge branch 'master' into skin-configuration-refactor 2019-09-05 16:56:05 +09:00
Dean Herbert
3c1a95d486
Don't redraw certain buffered containers on scale change (#5987)
Don't redraw certain buffered containers on scale change
2019-09-05 16:54:16 +09:00
Dean Herbert
696802e674 Don't use in music player for now 2019-09-05 16:52:53 +09:00
smoogipoo
bda21998c4 Add helper method to make direct casts be used 2019-09-05 16:48:56 +09:00
Dean Herbert
174f8ddb31 Remove incorrect usages 2019-09-05 16:37:47 +09:00
Dean Herbert
55c6feab64 Update framework 2019-09-05 16:33:14 +09:00
Dean Herbert
a1d7291ffa Fix pause menu keyboard navigation being affected by initial cursor hover 2019-09-05 16:31:10 +09:00
smoogipoo
99579255ad Force glowing sprite text to never redraw 2019-09-05 14:41:02 +09:00
Dean Herbert
c0bcbfd892 Merge branch 'master'
Conflicts:
	osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
2019-09-05 14:40:30 +09:00
smoogipoo
2e6af84ca8 Don't redraw leaderboard scores 2019-09-05 14:39:02 +09:00
Dean Herbert
4df6bd5477
Merge branch 'master' into use-dummy-api-for-overall-tests 2019-09-05 14:27:01 +09:00
Dean Herbert
2e6efebb17
Fix storyboard samples not stopping on exit (#5972)
Fix storyboard samples not stopping on exit
2019-09-05 14:18:20 +09:00
Dean Herbert
2c871c52f1
Add automatic resource mapping for rulesets to their own dll (#5988)
Add automatic resource mapping for rulesets to their own dll
2019-09-05 14:18:12 +09:00
Dean Herbert
c8f8141e9f
Fix tests crashing if a ruleset doesn't provide a NoFail mod (#5989)
Fix tests crashing if a ruleset doesn't provide a NoFail mod
2019-09-05 14:18:03 +09:00
Dean Herbert
29520dc120
Merge pull request #5990 from peppy/fix-unavailable-rulesets
Fix unavailable rulesets crashing at song select
2019-09-05 14:17:55 +09:00
Dean Herbert
42829b4fe7
Fix databased config save performance (#5994)
Fix databased config save performance

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-05 14:17:44 +09:00
smoogipoo
070a005294 Add braces to lock()
Personal preference, I want to be sure that everything is wrapped correctly.
2019-09-05 13:37:11 +09:00
smoogipoo
d40129aabe Remove unnecessary count check 2019-09-05 13:36:37 +09:00
iiSaLMaN
1b0123a60c Set beatmap of leaderboard to null if NoBeatmapsAvailable is selected 2019-09-05 05:56:52 +03:00
iiSaLMaN
a1c580f27e Create "none selected" placeholder state 2019-09-05 05:56:21 +03:00
Dean Herbert
afac512a1b Fix databased config save performance
Adds proper save debounce logic. Closes #5991.
2019-09-05 02:12:17 +09:00
Dean Herbert
50de4d1a3a Remove PrivateAssets changes for now 2019-09-05 01:11:53 +09:00
Dean Herbert
8e8f33ec7b Remove null hinting for now 2019-09-04 21:35:59 +09:00
Dean Herbert
6197c7fd31 Add automatic resource mapping for rulesets to their own dll 2019-09-04 20:29:28 +09:00
Dean Herbert
c59a2bf9bb Fix tests crashing if a ruleset doesn't provide a NoFail mod 2019-09-04 20:29:10 +09:00
Dean Herbert
b80a8296cd Fix unavailable rulesets crashing at song select 2019-09-04 20:28:52 +09:00
smoogipoo
a87a1e6031 Don't redraw certain buffered containers on scale change 2019-09-04 19:38:12 +09:00
smoogipoo
07f662071d Remove judgementOccurred 2019-09-04 18:14:55 +09:00
Dean Herbert
8ea82123e4 Fix nullref on test disposal 2019-09-04 15:59:09 +09:00
Dean Herbert
69b9d70a35 Add minimal configuration to support nuget package creation 2019-09-04 15:56:18 +09:00
Dan Balasescu
1aead3cda8
Merge branch 'master' into brace-escaping-in-links 2019-09-04 13:57:39 +09:00
Dean Herbert
2983918f71 Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor 2019-09-04 13:40:41 +09:00
Dean Herbert
f655cd4516 Fix parsing of null configuration elements 2019-09-04 13:30:46 +09:00
Dean Herbert
04c2c33c64 Allow LegacySkin to be constructed with all nulls 2019-09-04 13:29:55 +09:00
dependabot-preview[bot]
9edfe6800f
Bump ppy.osu.Game.Resources from 2019.903.1 to 2019.904.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.903.1 to 2019.904.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.903.1...2019.904.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-04 04:20:46 +00:00
Dan Balasescu
c88a5306aa
Merge branch 'master' into handle-click-event 2019-09-04 12:38:48 +09:00
Dean Herbert
4c563232d6 HoverClickSounds should handle click event instead of MouseUp 2019-09-04 11:37:19 +09:00
Dean Herbert
1802d2efaf Merge remote-tracking branch 'upstream/master' into fix-gameplay-menu-button-hover-ani 2019-09-04 10:35:14 +09:00
Bartłomiej Dach
08350a1aca Add parenthesis handling to old link format
Allow users to put both balanced round parentheses, as well as
unbalanced escaped ones, in old style link text. The implementation
is the same as for Markdown and new style links, except for swapping
all instances of

    \[\]

to

    \(\)

for obvious reasons (different type of parenthesis requiring escaping).
Tests also included.
2019-09-04 00:21:27 +02:00
Bartłomiej Dach
f04add6d9e Add bracket handling to Markdown link format
Allow users to put both balanced brackets, as well as unbalanced
escaped ones, in Markdown link text. The implementation is the exact
same as in the case of new format links.

For completion's sake, tests also included.
2019-09-04 00:07:00 +02:00
Bartłomiej Dach
24d4f0372c Refactor link parsing regexes to use named groups
For the sake of readability, consistency and to make further changes
easier, introduce named groups (?<text>) and (?<url>) to all link
parsing regexes which have parts containing the desired link text
and (optionally) URL.

The introduction of the named groups additionally simplifies
handleMatches() and makes all calls to it consistent.
2019-09-04 00:06:52 +02:00
Bartłomiej Dach
a8f16503e2 Add backslash escaping to new link format
For users to be able to add square brackets inside of links using
the new format, the regular expression used for parsing those links
contained a balancing group, which can be used for matching pairs
of tokens (in this case, opening and closing brackets, in that order).
However, this means that users could not post links with unmatched
brackets inside of them (ie. ones that contain single brackets, or
a closing bracket and then an opening one). Allow for escaping opening
and closing brackets using the backslash character.

The change substitutes this old fragment of the regex in the display
text group:

    [^\[\]]*        // any character other than closing/opening bracket

for this one:

    (((?<=\\)[\[\]])|[^\[\]])*

The second pattern in the alternative remains the same; the first one
performs the escaping, as follows:

    (
        (?<=\\)     // positive lookbehind expression:
                    // this match will succeed, if the next expression
                    // is preceded by a single backslash
        [\[\]]      // either an opening or closing brace
    )

Since the entire display group is matched, unfortunately the lookbehind
expression does not actually strip the backslashes, so they are
manually stripped in handleMatches.

As demonstrated in the unit tests attached, this also allows balanced
brackets to be mixed with escaped ones.
2019-09-03 23:18:39 +02:00
Dean Herbert
53fe290ef3
Merge branch 'master' into back-button-part-2 2019-09-03 19:44:30 +09:00
Dean Herbert
4b2cb8854e Fix storyboard samples not stopping on exit 2019-09-03 19:28:10 +09:00
Dean Herbert
e98059267d Improve xmldoc 2019-09-03 19:21:24 +09:00
Dean Herbert
299d528654 Simplify implementation 2019-09-03 19:20:23 +09:00
Dean Herbert
e88965b433 Merge remote-tracking branch 'upstream/master' into consistent-mod-button-sounds 2019-09-03 19:18:59 +09:00
Dean Herbert
609adf4b59
Fix catch catcher lookups (#5964)
Fix catch catcher lookups

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-09-03 19:08:49 +09:00
Dean Herbert
f58ca82398 Don't include section for now 2019-09-03 18:56:01 +09:00
Dean Herbert
312e12e3b4
Add spacing to difficulty icons on direct panels (#5957)
Add spacing to difficulty icons on direct panels
2019-09-03 18:44:58 +09:00
Dean Herbert
858828d4ef Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.1' into fix-catch-catcher 2019-09-03 18:31:19 +09:00
Dean Herbert
002de80c30 Add xmldoc to ISkin 2019-09-03 18:30:22 +09:00
dependabot-preview[bot]
352fd3efda
Bump ppy.osu.Game.Resources from 2019.903.0 to 2019.903.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.903.0 to 2019.903.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.903.0...2019.903.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-03 09:18:24 +00:00
Dean Herbert
097012dc95 Move slider ball colouring to DefaultLegacySkin for now 2019-09-03 18:05:16 +09:00
Dean Herbert
bebc3309ce Refactor skin configuration to be infinitely extensible 2019-09-03 17:57:34 +09:00
Dan Balasescu
b7f1efbf38
Merge branch 'master' into center-icon-and-text-correctly 2019-09-03 14:51:59 +09:00
Dean Herbert
d1cdf49dd5 Revert SkinnableSprite lookups to old behaviour 2019-09-03 14:21:54 +09:00
Dean Herbert
05ed9d3802 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-03 13:07:58 +09:00
Dean Herbert
4cad55cee6 Move hit windows lookup to DrawableRuleset 2019-09-03 13:05:03 +09:00
Dean Herbert
444419b2e6 Update resources 2019-09-03 12:04:49 +09:00
Dean Herbert
4a8bdbd014 Merge remote-tracking branch 'upstream/master' into play-to-gameplay 2019-09-03 12:04:46 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay 2019-09-03 11:42:15 +09:00
smoogipoo
eab06995d0 Add some whitespace 2019-09-03 11:37:56 +09:00
smoogipoo
ec8726e163 Merge remote-tracking branch 'origin/master' into background-beat 2019-09-03 11:35:20 +09:00
jorolf
3b769128a8 Add a 60bpm beat when no beatmap is playing 2019-09-03 00:57:29 +02:00
iiSaLMaN
de6dba9716 Use float type for chat overlay height 2019-09-03 01:50:52 +03:00
iiSaLMaN
cb55159b28 Use float types for cursor sizes 2019-09-03 01:28:51 +03:00
Joehu
ce446826e8 Match web's max diff icon number 2019-09-02 11:00:12 -07:00
Joehu
5d3f3b7cc2 Add spacing to diff icons on direct panels 2019-09-02 10:59:43 -07:00
Joehu
6ca17bdfd5 Center icon and text using anchor and origin instead of margin 2019-09-02 10:42:21 -07:00
Bartłomiej Dach
53c254c6a5 Replace Array.IndexOf() with Contains() 2019-09-02 19:01:36 +02:00
Dean Herbert
09097f7680
Merge branch 'master' into iskincomponent 2019-09-02 22:38:57 +09:00
Dean Herbert
3443a9517f
Merge pull request #5953 from peppy/fix-direct-panel-unbind-nullref
Fix potential null reference on DirectPanel unbind
2019-09-02 21:35:17 +09:00
Dean Herbert
1e7528c2b3 Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements 2019-09-02 19:13:00 +09:00
Dean Herbert
b460f76fa6 Adjust file spacing slightly 2019-09-02 19:01:43 +09:00
Dean Herbert
0bfe4650c3 Early return if no change occurred in looping value 2019-09-02 19:01:17 +09:00
Dean Herbert
f08b523abf Name tuple items 2019-09-02 18:20:30 +09:00
Dean Herbert
9c53430a0f Only initialise when required 2019-09-02 18:18:59 +09:00
Dean Herbert
eaeecfb300 Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound 2019-09-02 18:15:17 +09:00
smoogipoo
f20e07136a Add attribute to catch potential future nullrefs 2019-09-02 17:48:41 +09:00
Dean Herbert
be5baef386
Merge pull request #5778 from EVAST9919/kudosu-info
Add kudosu history to UserProfileOverlay
2019-09-02 17:22:53 +09:00
smoogipoo
f6102b4d92 Adjust xmldoc 2019-09-02 17:15:36 +09:00
smoogipoo
0c73c5acf3 Expose full hitobject rather than hit windows 2019-09-02 17:14:40 +09:00
Dean Herbert
841da7d691 Fix potential null reference on DirectPanel unbind 2019-09-02 17:12:32 +09:00
Dean Herbert
d21d68b36c Refactor to match web implementation 1:1 2019-09-02 17:04:38 +09:00
smoogipoo
f2bdf94a1d Add HitWindows to JudgementResult to indicate timing errors 2019-09-02 16:28:14 +09:00
smoogipoo
0a89603e79 Fix hit error potentially not displaying with null hitwindows 2019-09-02 16:07:16 +09:00
Dean Herbert
0985b1679f Move enum to response class 2019-09-02 15:57:55 +09:00
Dean Herbert
3d551b08a9 Rename legacy actions 2019-09-02 15:57:23 +09:00
Dean Herbert
da45070373 Group common prefixes together 2019-09-02 15:44:21 +09:00
Dean Herbert
c06908adf7 Fix spacing specifications 2019-09-02 15:37:38 +09:00
Dean Herbert
13fadec6ec Merge remote-tracking branch 'upstream/master' into kudosu-info 2019-09-02 15:25:41 +09:00
Dan Balasescu
daa2007b41
Merge branch 'master' into fix-switching-ruleset-unpauses-beatmap 2019-09-02 15:24:01 +09:00
Dean Herbert
e1e4c00a15
Merge branch 'master' into improve-scrolling-ruleset-performance 2019-09-02 15:09:48 +09:00
smoogipoo
d74e1b9b64 Remove from dictionary on Remove() 2019-09-02 15:06:43 +09:00
smoogipoo
8f8d35bd15 Delay initial hitobject state computation 2019-09-02 15:06:34 +09:00
Dean Herbert
f9fcf1562f Merge remote-tracking branch 'upstream/master' into iskincomponent 2019-09-02 14:21:02 +09:00
Dean Herbert
81e8290caf
Merge pull request #5334 from stanriders/beatmapset-genre-language
Add genre and language sections to beatmapset overlay

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-02 14:16:55 +09:00
Dean Herbert
78f753d919
Merge pull request #5949 from smoogipoo/fix-swell-timeoffset
Fix taiko swell tick judgements having non-zero time offsets
2019-09-02 13:46:37 +09:00
Dean Herbert
043034a6ce Merge remote-tracking branch 'upstream/master' into beatmapset-genre-language 2019-09-02 13:45:25 +09:00
Dean Herbert
d4c12881f5 Remove unnecessary over-complication and fix transitions 2019-09-02 13:45:13 +09:00
Dean Herbert
6603cbd74d No language doesn't mean "Other" 2019-09-02 13:41:14 +09:00
smoogipoo
fc668d8a74 Move autoplay mod to a less overridable location 2019-09-02 13:24:39 +09:00
smoogipoo
2945fef62d Expose HasCompleted from ScoreProcessor 2019-09-02 13:04:30 +09:00
smoogipoo
cad68bb82f Add autoplay helper property 2019-09-02 12:54:59 +09:00
Dean Herbert
e479be3fba
Merge pull request #5894 from smoogipoo/accessible-beatdivisor-colours
Move beat divisor colour retrieval to BindableBeatDivisor
2019-09-02 12:41:19 +09:00
Dan Balasescu
31645a5834
Merge branch 'master' into channel-topic-serach 2019-09-02 12:07:11 +09:00
Dean Herbert
7ca51d3866 Fix resume overlay being drawn below cursor
Closes #5905.
2019-09-02 11:20:55 +09:00
Bartłomiej Dach
fc48b190fe Fix inaccurate xmldoc 2019-09-01 13:32:53 +02:00
Bartłomiej Dach
c4dc34eefd Consolidate HoverClickSounds constructors
As suggested in review, merge both HoverClickSounds constructors into
one accepting optional arguments. Due to existing usages the parameter
is added as second and supplied by name in ModButton.
2019-09-01 13:10:11 +02:00
Dean Herbert
d1eafafa51 Allow searching channels by topics
Closes #5939
2019-09-01 19:57:12 +09:00
Dean Herbert
f182fb158c
Fix some spelling mistakes on code comments (#5927)
Fix some spelling mistakes on code comments
2019-09-01 13:32:56 +09:00
iiSaLMaN
a155814bc4 Implement instant movement properly 2019-09-01 06:07:25 +03:00
iiSaLMaN
7d955839be Instantly move rank graph tooltip 2019-09-01 04:22:24 +03:00
iiSaLMaN
aff4dab9aa Ensure playing track of beatmap selected only if a track change occurred 2019-09-01 03:17:55 +03:00
Bartłomiej Dach
658e0edc3e Handle other button clicks in HoverClickSounds
As suggested in review, remove previously introduced HoverMouseUpSounds
and instead change effect playing logic in HoverClickSounds by moving it
out of OnClick() to OnMouseUp().

Users of the class can either use the existing constructor to play
the effect only on left click or use the newly introduced constructor
with the MouseButton[] parameter to specify which button clicks should
trigger the sound.
2019-08-31 20:16:16 +02:00
Bartłomiej Dach
a1c72db5f6 Fix inconsistent sound effects on mod buttons
Because HoverClickSounds.OnClick() does not fire upon right clicking
on mod buttons, the sound effects that play on left and right click
were inconsistent. Introduce HoverMouseUpSounds drawable that allows
to play the click sound effect upon mouse up events for an arbitrary
set of mouse buttons and use it on mod buttons.
2019-08-31 17:01:12 +02:00
pi1024e
5695bb670e change back to queuing 2019-08-31 10:55:05 -04:00
pi1024e
1b4ae5a4a4 Spelling fixes 2019-08-31 10:55:05 -04:00
Andrei Zavatski
94512fea8e Apply naming suggestions 2019-08-31 16:20:33 +03:00
Andrei Zavatski
d2f7a653a8 Fix nullref 2019-08-31 16:10:07 +03:00
Andrei Zavatski
d9beee926a Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-08-31 15:54:28 +03:00
Dean Herbert
691b89ae19
Merge pull request #5911 from peppy/fix-skin-configuration-fallback
Fix ruleset skins incorrectly providing configuration defaults
2019-08-31 21:50:14 +09:00
Andrei Zavatski
c10d2302dc Remove video property from migrations 2019-08-31 15:49:57 +03:00
Andrei Zavatski
28b19e8d54 Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video 2019-08-31 15:49:21 +03:00
smoogipoo
cbbc6aad6e Make method static 2019-08-31 21:32:02 +09:00
Dean Herbert
d2a3e0581b Fix legacy decoder using wrong configuration 2019-08-31 13:27:03 +09:00
Dean Herbert
12eeec36fc Fix ruleset skins incorrectly providing configuration defaults 2019-08-31 12:33:29 +09:00
Dean Herbert
1ddf292ad6 Fix vertical alignment of hit error display ticks
Wasn't correctly centered before.
2019-08-31 12:20:50 +09:00
Andrei Zavatski
d4291556ee Remove unused using 2019-08-31 02:57:14 +03:00
Andrei Zavatski
fd958ec1ab Remove unused property accessor 2019-08-31 02:56:41 +03:00
Andrei Zavatski
fa3591e5ec Add setting to turn on/off the video 2019-08-31 00:42:20 +03:00
Andrei Zavatski
5dd688a51b Fix video doesn't use gameplay clock 2019-08-31 00:09:23 +03:00
Andrei Zavatski
d55be4d59c Implement DimmableVideo component 2019-08-30 23:48:38 +03:00
Andrei Zavatski
58a0b4e19b Add basic layout for player 2019-08-30 23:19:55 +03:00
Andrei Zavatski
6e5cb8a318 implement video parsing 2019-08-30 23:19:34 +03:00
Dean Herbert
8f5dc06d55 Merge remote-tracking branch 'upstream/master' into accuracy-bar 2019-08-30 20:18:25 +09:00
Dean Herbert
f1db6c7039 Fix likely nullref 2019-08-30 20:18:21 +09:00
smoogipoo
fc813347ac Make JudgementLine private 2019-08-30 19:54:36 +09:00
smoogipoo
dfccc60361 Reorder HitErrorDisplay 2019-08-30 19:53:38 +09:00
smoogipoo
fab12fa9cd Centre align the icons
Seems to look better this way.
2019-08-30 19:53:38 +09:00
Dean Herbert
665fc95d49 Handle no hitobjects / no hitwindows (osu!catch) 2019-08-30 19:37:20 +09:00
Dean Herbert
394208afc5 Merge remote-tracking branch 'upstream/master' into accuracy-bar 2019-08-30 19:27:35 +09:00
Dan Balasescu
ff599ba623
Merge branch 'master' into add-ruleset-legacy-skin 2019-08-30 19:23:34 +09:00
Dean Herbert
80671cefd7 Final visual polish 2019-08-30 19:14:07 +09:00
Dean Herbert
c3abf0ccb7 Improve visuals 2019-08-30 18:50:38 +09:00
dependabot-preview[bot]
171f88da40
Bump ppy.osu.Framework from 2019.830.0 to 2019.830.1
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.830.0 to 2019.830.1.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.830.0...2019.830.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 09:47:18 +00:00
Dean Herbert
8fc177b743 Fix namespacing and hitwindow source 2019-08-30 18:46:42 +09:00
Dean Herbert
741bd0a5cf Fix incorrect colour sizes and simplify alignment specification 2019-08-30 18:35:17 +09:00
smoogipoo
40729356fa Move beat divisor colour retrieval to BindableBeatDivisor 2019-08-30 17:34:58 +09:00
Dean Herbert
54696eef39 Reverse display, add animation and reduce width 2019-08-30 17:06:23 +09:00
Dean Herbert
a73d672c2f Tidy up judgement line logic (and fix it displaying at the wrong place) 2019-08-30 16:40:39 +09:00
Andrei Zavatski
72dbeaec16 Fix the comment 2019-08-30 10:26:11 +03:00
Andrei Zavatski
71c844facd Remove unwanted spacings 2019-08-30 10:22:49 +03:00
Andrei Zavatski
b03b520818 Move Absing from the APIKudosuHistory 2019-08-30 10:13:21 +03:00
Andrei Zavatski
b7a75ef5e1 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-30 10:09:00 +03:00
Dean Herbert
6640161bc1 Simplify event propagation 2019-08-30 15:51:36 +09:00
Dean Herbert
bdbfa7bd2f Fix class naming 2019-08-30 15:32:47 +09:00
Dean Herbert
3aa2ece49b Merge branch 'iskincomponent' into play-to-gameplay 2019-08-30 15:29:55 +09:00
Dean Herbert
fe90e194e3 Remove redundant qualifier 2019-08-30 15:29:44 +09:00
Dean Herbert
835ee0aa2f Code quality fixes 2019-08-30 15:29:13 +09:00
Dean Herbert
1d77e3764d
Merge branch 'master' into accuracy-bar 2019-08-30 15:21:32 +09:00
Dean Herbert
70e417533f Update naming 2019-08-30 15:13:29 +09:00
Dean Herbert
a7c94c3883 Simplify hit result lookups 2019-08-30 15:12:03 +09:00
Dean Herbert
a15828ab25 Introduce the concept of SkinComponents
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +09:00
Dean Herbert
8f9fe99237 Move SliderFollowCircle implementation 2019-08-30 14:40:36 +09:00
Dean Herbert
71192791d5 Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-30 14:12:56 +09:00
Dean Herbert
c389a5c798 Move remaining osu-specific implementations to OsuLegacySkin 2019-08-30 13:42:29 +09:00
Dean Herbert
7bba8ca14b Split out nested classes 2019-08-30 13:04:11 +09:00
Dean Herbert
84e4748268 Remove duplicate getAnimation function and improve namespacing 2019-08-30 12:59:58 +09:00
Dean Herbert
dc1046bf0c Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-30 12:53:05 +09:00
Dean Herbert
9c622680e3 Update framework 2019-08-30 12:35:53 +09:00
Dean Herbert
8fe37d0c43 Update resources 2019-08-30 12:35:44 +09:00
Dean Herbert
d17cfe20c2 Merge remote-tracking branch 'upstream/master' into add-legacy-default 2019-08-30 11:54:49 +09:00
Dean Herbert
bfbec067b1 Remove remnants of user skin PR 2019-08-30 11:54:36 +09:00
Dean Herbert
3f500131d4 Add basic xmldoc 2019-08-30 11:33:50 +09:00
iiSaLMaN
06224a7d4e Fix build issue 2019-08-29 15:38:33 +03:00
iiSaLMaN
ec6a40af33 Add adjustments on channel creation if there is 2019-08-29 15:32:21 +03:00
smoogipoo
ae0a5504d7 Revert unnecessary change 2019-08-29 19:43:33 +09:00
smoogipoo
6641811125 Add EditorWorkingBeatmap for reuse of the playable beatmap 2019-08-29 19:41:12 +09:00
smoogipoo
6ab2b20c70 Add an interface for working beatmaps 2019-08-29 19:38:44 +09:00
StanR
c1c1c7874b Nullcheck 2019-08-29 13:25:05 +03:00
StanR
68ee7346b2 Remove usings 2019-08-29 12:49:44 +03:00
StanR
d303083179 Update to match api 2019-08-29 12:29:31 +03:00
Dan Balasescu
d8a48a37d1
Merge branch 'master' into editor-refactor 2019-08-29 18:22:42 +09:00
smoogipoo
714ee312da Rename DrawableEditRuleset -> DrawableEditRulesetWrapper 2019-08-29 18:20:43 +09:00
Dean Herbert
98626018fd
Encapsulate editor hitobject additions/removals (#5878)
Encapsulate editor hitobject additions/removals
2019-08-29 18:20:24 +09:00
smoogipoo
87e28ab1f9 Remove non-generic DrawableEditRuleset 2019-08-29 18:12:29 +09:00
smoogipoo
59296d12f3 Refactor HitObjectComposer 2019-08-29 18:02:50 +09:00
smoogipoo
0fbdcabb6f Re-use a single beatmap processor 2019-08-29 17:21:52 +09:00
smoogipoo
b40143cb73 Remove unnecessary comment 2019-08-29 17:18:34 +09:00
Dean Herbert
40c1c6072e Add "osu!classic" as a bundled skin choice 2019-08-29 16:39:42 +09:00
smoogipoo
b04a8ae856 Add xmldocs 2019-08-29 16:31:43 +09:00
smoogipoo
dad0fa2dca Bind disposal 2019-08-29 16:31:40 +09:00
smoogipoo
5db813b7a4 Add secondary interface for further abstraction 2019-08-29 16:26:39 +09:00
smoogipoo
7927b684d3 Hook up + use editor beatmap 2019-08-29 16:06:40 +09:00
smoogipoo
840f224619 Remove typed events to reduce complexity 2019-08-29 16:05:44 +09:00
StanR
3347ee8170 Merge branch 'master' into beatmapset-genre-language 2019-08-29 09:57:53 +03:00
smoogipoo
6949c96aaa Add initial EditorBeatmap structure 2019-08-29 15:17:27 +09:00
Dean Herbert
03a4acaf4c Fix drags outside of overlay container bounds not hiding overlay 2019-08-29 12:07:58 +09:00
Joehu
73fd3cf03c Fix gameplay menu button initial hover animation 2019-08-28 19:00:01 -07:00
Dean Herbert
6295fb4171 Merge remote-tracking branch 'upstream/master' into relative-beat-lengths 2019-08-28 22:11:27 +09:00
Dean Herbert
c6e757fdae Remove redundant qualifier 2019-08-28 22:11:23 +09:00
Dean Herbert
3c03d36694
Merge pull request #5530 from nyquillerium/humanizer-fallback
Add a fallback for humanizer localization lookup failures
2019-08-28 21:45:01 +09:00
iiSaLMaN
3d62003382 Add null check 2019-08-28 15:39:45 +03:00
Dean Herbert
1597cf874e
Merge branch 'master' into relative-beat-lengths 2019-08-28 20:26:20 +09:00
Dean Herbert
720908ba22
Merge pull request #5865 from peppy/fix-osu-hitobject-fade-in
Fix osu! approach circles fading in too late
2019-08-28 20:25:49 +09:00
Dean Herbert
f6ad95018a Centralise default beat length specification 2019-08-28 20:22:16 +09:00
Dean Herbert
ecfcbe3723 Merge remote-tracking branch 'upstream/master' into relative-beat-lengths 2019-08-28 20:21:56 +09:00
smoogipoo
348d88846d Add IBeatmap<T> interface for typed hitobject retrieval 2019-08-28 20:19:22 +09:00
Dean Herbert
dfdf3f5e96 Merge remote-tracking branch 'upstream/master' into humanizer-fallback 2019-08-28 20:15:32 +09:00
Dean Herbert
c7e20b34ba Cleanup 2019-08-28 20:15:28 +09:00
Dean Herbert
01aede3e29 Add comprehensive skin fallback integration testing 2019-08-28 19:57:17 +09:00
iiSaLMaN
2f3fb8cf88 Add Stop + RemoveAdjustment functions 2019-08-28 13:10:11 +03:00
iiSaLMaN
cb8fe89b8b Allow setting looping to existing channels 2019-08-28 13:09:53 +03:00
iiSaLMaN
d1cbd11d28 Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound 2019-08-28 13:09:07 +03:00
Dean Herbert
4c2a6b755f Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-28 18:44:23 +09:00
Dean Herbert
9a98f39f06 Share logic with other rulesets (and make default) 2019-08-28 18:12:47 +09:00
Dean Herbert
bb22c2d6e4 Tidy up text construction 2019-08-28 17:29:18 +09:00
Dean Herbert
b1f523dae3 Merge remote-tracking branch 'upstream/master' into kudosu-info 2019-08-28 17:13:57 +09:00
Dean Herbert
fcf770c744 Merge branch 'master' into update-framework 2019-08-28 17:04:44 +09:00
Dean Herbert
70da25cfca Update framework 2019-08-28 17:03:54 +09:00
Dean Herbert
7ea55a5cdd Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-28 16:36:20 +09:00
Dean Herbert
bef44b8e58 item -> model 2019-08-28 13:31:12 +09:00
Dean Herbert
3942c83c18 Simplify schedule layout 2019-08-28 13:28:57 +09:00
Dean Herbert
27633c8dbd T -> TModel 2019-08-28 13:28:21 +09:00
Dean Herbert
f18b5a3c02 Remove "AllowCreate" function by instead handling nulls 2019-08-28 13:27:44 +09:00
Dean Herbert
c4aaab20c7 Merge remote-tracking branch 'upstream/master' into simplify-paginated-container 2019-08-28 13:15:57 +09:00
Dean Herbert
1aa09ff05c
Merge pull request #5795 from iiSaLMaN/allow-fallback-to-samples-without-bank
Try retrieving samples without bank names
2019-08-28 13:12:51 +09:00
Dean Herbert
4add1727b7 Fix hitsounds not updating immediately after switching skins 2019-08-28 03:25:57 +09:00
iiSaLMaN
18431a42e6 Resolve merge conflicts 2019-08-27 20:06:17 +03:00
iiSaLMaN
4ef991b973 Loop over lookup names on default-samples retrieval 2019-08-27 19:42:17 +03:00
Andrei Zavatski
5fd43d42f4 CI fixes 2019-08-27 16:09:37 +03:00
Andrei Zavatski
9a383eee1a Add AllowCreate function 2019-08-27 15:58:57 +03:00
Andrei Zavatski
22ee7db805 Refactor PaginatedContainer to avoid code duplication 2019-08-27 15:47:37 +03:00
Andrei Zavatski
ed827d514f Add comments 2019-08-27 15:36:08 +03:00
Andrei Zavatski
f49b58c102 Simplify text building 2019-08-27 15:30:41 +03:00
Andrei Zavatski
7f0a4fbef9 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-27 15:11:55 +03:00
Dean Herbert
b59973c712 Update in line with framework changes 2019-08-27 18:43:58 +09:00
Dean Herbert
0fba446c01
Obsolete legacy UpdateState() method (#5853)
Obsolete legacy UpdateState() method
2019-08-27 18:34:16 +09:00
Dean Herbert
7ccc409df7 Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin 2019-08-27 18:27:26 +09:00
Dean Herbert
7aeeb65ae7 Tidy up Player's container loading logic
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
Dean Herbert
0ea10a4922 Fix skin sample reading failing 2019-08-27 17:18:32 +09:00
smoogipoo
9e926d44c0 Obsolete legacy UpdateState() method 2019-08-27 16:09:47 +09:00
Dean Herbert
66223b9954
Merge branch 'master' into allow-fallback-to-samples-without-bank 2019-08-27 14:44:16 +09:00
Dean Herbert
7885c79467 Make bindables private 2019-08-27 14:31:34 +09:00
Dean Herbert
69145eb83a
Merge branch 'master' into select-filters-persistence 2019-08-27 14:12:59 +09:00
smoogipoo
6368189d46 Refactor 2019-08-27 11:59:25 +09:00
Dean Herbert
6aab7168d4
Merge branch 'master' into relative-beat-lengths 2019-08-27 10:59:52 +09:00
Andrei Zavatski
9321f20884 Move arrow to the first line 2019-08-26 14:32:27 +03:00
Andrei Zavatski
fd0f42eee4 Fix filtered grouped difficulty items in DrawableCarouselBeatmapSet aren't hidden on first load 2019-08-26 14:11:24 +03:00
Dean Herbert
07380af877
Merge branch 'master' into scrolling-lifetime-safety 2019-08-26 19:07:05 +09:00
Dean Herbert
0422c19c2f Group lifetime setters together 2019-08-26 19:06:23 +09:00
Dean Herbert
dffb2d6474
Merge branch 'master' into relative-beat-lengths 2019-08-26 18:59:50 +09:00
Dean Herbert
28dc51279a
Allow RulesetConfigCache to return null configs (#5835)
Allow RulesetConfigCache to return null configs
2019-08-26 18:59:26 +09:00
Dean Herbert
b41bed8ba0
Add nullref safety to FrameStablePlayback boolean (#5834)
Add nullref safety to FrameStablePlayback boolean
2019-08-26 18:58:27 +09:00
Dean Herbert
62641c149d Fx component lookups being incorrect for non-databased legacy skins 2019-08-26 18:20:45 +09:00
smoogipoo
fd4c6e08ca Merge remote-tracking branch 'origin/master' 2019-08-26 17:37:06 +09:00
smoogipoo
fb1cd9e5e7 Add a sane default lifetime end for scrolling hitobjects 2019-08-26 16:47:23 +09:00
smoogipoo
6dfe95db74 Allow RulesetConfigCache to return null configs 2019-08-26 16:34:12 +09:00
smoogipoo
6596d7fc46 Add nullref safety to FrameStablePlayback boolean 2019-08-26 16:33:24 +09:00
smoogipoo
1cfe2b7de8 Fix timing points beyond the end time potentially becoming dominant 2019-08-26 16:31:34 +09:00
Dean Herbert
289bd8e6b0 Don't return DefaultSkin on beatmap skin parsing failure 2019-08-26 14:25:35 +09:00
smoogipoo
d99c60adc7 Provide a way to scale beat lengths relative to each other 2019-08-26 12:51:13 +09:00
Dean Herbert
5e362d10b1 Add ruleset-specific legacy skin providers
This moves implementation of osu! skinnables to OsuLegacySkin.
2019-08-26 12:21:49 +09:00
Dean Herbert
de2c6aa23d Rename and expand usability of SkinProvidingContainer 2019-08-26 12:21:11 +09:00
Dean Herbert
9881d3677d Simplify icon creation 2019-08-25 12:05:46 +09:00
Dean Herbert
ef397434f6 use GroupBy instead of Distinct+FindAll 2019-08-25 12:00:06 +09:00
Dean Herbert
1d34124667 Revert all DifficultyIcon changes 2019-08-25 11:56:07 +09:00
Dean Herbert
2e21fbcf6a Fix incorrect colour usage 2019-08-25 11:44:56 +09:00
Dean Herbert
a19a9b90ed Simplify group filter display 2019-08-25 11:39:26 +09:00
Dean Herbert
524547adbf
Merge branch 'master' into implement-grouped-difficulty-icons 2019-08-24 17:34:58 +09:00
Lucas A
b204e4419a Rename SelectSortingMode & SelectGroupingMode -> SongSelectSortingMode & SongSelectGroupingMode 2019-08-24 10:34:54 +02:00
Dean Herbert
c4d203cb5c
Merge branch 'master' into allow-contents-in-difficulty-icon 2019-08-24 17:22:24 +09:00
iiSaLMaN
af4adb6339 Add xmldoc 2019-08-24 09:43:55 +03:00
iiSaLMaN
0bcd323d17 Remove unnecessary string literal 2019-08-24 09:30:43 +03:00
iiSaLMaN
008e39b738 Remove redundant using directive 2019-08-24 01:40:40 +03:00
iiSaLMaN
8ccbe84f67 Loop on distinct rulesets of beatmap instead of all 2019-08-24 01:30:33 +03:00
iiSaLMaN
f6feef6b56 Remove redundant using directive 2019-08-24 00:33:14 +03:00
iiSaLMaN
87340061e1 Add logic to create grouped difficulty icons in carousel beatmap set 2019-08-24 00:06:28 +03:00
iiSaLMaN
63e6aca61b Add logic to create grouped difficulty icons in direct panel 2019-08-23 23:40:41 +03:00
iiSaLMaN
83b6e0f30c Implement grouped difficulty icon 2019-08-23 23:36:23 +03:00
iiSaLMaN
d4236c574f Allow difficulty icon to be updateable 2019-08-23 23:30:54 +03:00
iiSaLMaN
f639df849f Allow for difficulty icon to contain content 2019-08-23 23:11:36 +03:00
iiSaLMaN
1295ec490f Fix difficulty icon not wrapping correctly in beatmap set overlay 2019-08-23 17:57:31 +03:00
Lucas A
ce5ee095b9 Fetch config bindables in BDL. 2019-08-23 14:03:56 +02:00
iiSaLMaN
da72806693 Remove lookup logic from SkinnableSound 2019-08-23 14:55:38 +03:00
iiSaLMaN
b6b050d5e9 Add sample path to the lookup names 2019-08-23 14:55:06 +03:00
iiSaLMaN
7b04fb1690 StoryboardSample -> StoryboardSampleInfo 2019-08-23 14:54:39 +03:00
Andrei Zavatski
0cde0982e5 Use cansellation token 2019-08-23 14:52:26 +03:00
Andrei Zavatski
7e34afeab8 Conver to method group 2019-08-23 14:38:18 +03:00
iiSaLMaN
d8535574d1 Pass sample info to Skin.GetSample 2019-08-23 14:32:43 +03:00
Lucas A
6bf31e8f91 Make song select grouping & sorting filters persistent 2019-08-23 13:15:38 +02:00
Andrei Zavatski
45c0826314 Remove repetitive code 2019-08-23 14:14:39 +03:00
Andrei Zavatski
050130e159 Refactor PaginatedContainer to centralise repetitive logic 2019-08-23 14:11:21 +03:00
Andrei Zavatski
9616eedcfc Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-23 13:53:48 +03:00
Dean Herbert
0f4d79b5d9
Merge branch 'master' into dependabot/nuget/ppy.osu.Game.Resources-2019.823.0 2019-08-23 19:24:58 +09:00
Andrei Zavatski
87379a42c8 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-23 13:05:19 +03:00
dependabot-preview[bot]
c836ef5721
Bump ppy.osu.Game.Resources from 2019.809.0 to 2019.823.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.809.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.809.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 10:04:00 +00:00
dependabot-preview[bot]
11a61b953b
Bump ppy.osu.Framework from 2019.821.0 to 2019.823.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.821.0 to 2019.823.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.821.0...2019.823.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-23 09:43:34 +00:00
Dean Herbert
a502cd4b63 Merge remote-tracking branch 'upstream/master' into fix-mute-button-alignment-and-size 2019-08-23 17:43:12 +09:00
Dean Herbert
c55d237db6 Use BindValueChanged 2019-08-23 17:42:40 +09:00
Joehu
c41b1e9eb4 Fix alignment and size of mute button 2019-08-22 21:36:21 -07:00
Dean Herbert
900df5d72f Fix crash on closing game 2019-08-23 13:02:50 +09:00
smoogipoo
a30567394e Remove bottom margin from show more button 2019-08-23 12:39:33 +09:00
Andrei Zavatski
f4d2bb036b Expand KudosuAction list 2019-08-22 16:50:54 +03:00
Andrei Zavatski
67e0a2e35e Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-22 16:33:25 +03:00
iiSaLMaN
66d8440167 Move non-bank samples logic to LegacySkin 2019-08-22 12:50:47 +03:00
Dean Herbert
82209aed82
Merge branch 'master' into humanizer-fallback 2019-08-22 17:58:40 +09:00
Shane Woolcock
f19b5ba570
Merge branch 'master' into fix-decoding-loop 2019-08-22 17:02:13 +09:30
Dean Herbert
8018aba852
Merge branch 'master' into kudosu-info 2019-08-22 14:30:26 +09:00
Dean Herbert
db1ff6d211 Fix video decoding loop running permanently in the background 2019-08-22 13:48:27 +09:00
Dean Herbert
4f98361da3 One more offset removed 2019-08-21 22:22:03 +09:00
Dean Herbert
acc07c1d65 Remove mod icon offset 2019-08-21 22:18:29 +09:00
Dean Herbert
7bf430afd5 Add padding back to difficulty icons on carousel 2019-08-21 21:16:06 +09:00
iiSaLMaN
87f3184fcc Try retrieving samples without bank names
Fallback for spinner bonus samples
2019-08-21 15:14:33 +03:00
Dean Herbert
6797f92b96
Merge branch 'master' into dependabot/nuget/SharpCompress-0.24.0 2019-08-21 20:15:23 +09:00
Andrei Zavatski
727a6abaf7 Simplify caching 2019-08-21 12:16:30 +03:00
dependabot-preview[bot]
fb8d8f9438
Bump SharpCompress from 0.23.0 to 0.24.0
Bumps [SharpCompress](https://github.com/adamhathcock/sharpcompress) from 0.23.0 to 0.24.0.
- [Release notes](https://github.com/adamhathcock/sharpcompress/releases)
- [Commits](https://github.com/adamhathcock/sharpcompress/compare/0.23...0.24)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-21 08:27:56 +00:00
Andrei Zavatski
0ccfaeb8d9 Simplify moving average 2019-08-21 10:13:59 +03:00
Andrei Zavatski
a5acc913ea CI fixes 2019-08-21 09:58:47 +03:00
Andrei Zavatski
a994ad9c84 Use moving average to calculate arrow position 2019-08-21 09:40:15 +03:00
Andrei Zavatski
336f979480 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 09:39:28 +03:00
Dean Herbert
fd26ef739a Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-08-21 15:23:54 +09:00
Andrei Zavatski
71cbc3525d Add/remove displays only if necessary 2019-08-21 09:16:09 +03:00
Andrei Zavatski
ed2002f717 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 09:15:48 +03:00
Dean Herbert
28dfe072a5 Update one more blending mode change post-master merge 2019-08-21 15:11:46 +09:00
Dean Herbert
4186d2566a Remove unnecessary null checks 2019-08-21 15:11:33 +09:00
Dean Herbert
745bd58f37 Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 15:10:08 +09:00
Dean Herbert
8917f7cc95
Merge pull request #5776 from peppy/animated-slider-ball
Add slider ball animation support

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-21 15:02:35 +09:00
Dean Herbert
444f2b9387 Specify font size in a saner way 2019-08-21 15:01:50 +09:00
Andrei Zavatski
ab1586ff33 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-21 08:56:34 +03:00
Dean Herbert
6a48819055 Merge branch 'master' into update-framework-blending 2019-08-21 14:27:57 +09:00
Dean Herbert
66a2eecb7a Merge remote-tracking branch 'upstream/master' into music-playback-improvements 2019-08-21 14:01:11 +09:00
Dean Herbert
724365c6d1 Minor tidying 2019-08-21 14:01:07 +09:00
Dean Herbert
cca64771dd Add comment about placement of default loading 2019-08-21 13:56:49 +09:00
Dean Herbert
aa8b7b60de Merge remote-tracking branch 'upstream/master' into update-framework-blending 2019-08-21 13:30:24 +09:00
Dean Herbert
62218613da Merge remote-tracking branch 'smoogipoo/spritetext-glyph-rework' into update-framework-blending 2019-08-21 13:30:19 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Dan Balasescu
33083bcf40
Merge branch 'master' into animated-slider-ball 2019-08-21 13:15:45 +09:00
Dan Balasescu
82fe506f97
Merge branch 'master' into animated-legacy-skins 2019-08-21 13:03:11 +09:00
Dan Balasescu
758f10b9fd
Merge branch 'master' into fix-skin-test-regression 2019-08-21 12:45:47 +09:00
iiSaLMaN
439d825dd1 Disallow adding bonus judgements' result to statistics 2019-08-20 18:39:29 +03:00
Andrei Zavatski
426c7a4898 Fix incorrect templates 2019-08-20 16:19:21 +03:00
Andrei Zavatski
5c7cb4dc21 Simplify text creation 2019-08-20 16:11:59 +03:00
Andrei Zavatski
c4344f3f7c CI fixes 2019-08-20 15:29:32 +03:00
Andrei Zavatski
f1d02d8169 Update design in line with web 2019-08-20 15:00:14 +03:00
smoogipoo
0de219dda4 Update with spritetext text builder changes 2019-08-20 19:03:57 +09:00
Lucas A
33946f0458 Fix CI issues and update comments. 2019-08-20 11:18:41 +02:00
Dean Herbert
4bffb0df84 Merge branch 'animated-legacy-skins' into animated-slider-ball 2019-08-20 18:14:17 +09:00
Dean Herbert
1616b4528d
Merge branch 'master' into animated-legacy-skins 2019-08-20 17:40:18 +09:00
Dean Herbert
6dd638b327 Further improve legibility of texture lookup 2019-08-20 17:39:24 +09:00
Andrei Zavatski
f72edb8bf8 Add missing blank line 2019-08-20 09:03:31 +03:00
Dean Herbert
84530b7839 Colour the correct layer 2019-08-20 15:02:07 +09:00
Andrei Zavatski
596ee150c6 Add xmldoc for not obvious const 2019-08-20 08:51:41 +03:00
Andrei Zavatski
9f64e09625 Move HitErrorDisplayOverlay back to the HUD 2019-08-20 08:45:51 +03:00
Dean Herbert
f7ce7c7d99 Merge branch 'fix-skin-test-regression' into animated-slider-ball 2019-08-20 14:09:53 +09:00
Andrei Zavatski
d337f9b482 DefaultHitErrorDisplay -> BarHitErrorDisplay 2019-08-20 08:03:17 +03:00
Andrei Zavatski
c4251d512e Simplify bar building 2019-08-20 08:00:09 +03:00
Dean Herbert
3b7cee2d45 Fix LegacySkin not checking for @2x hitcircle when deciding sizing 2019-08-20 13:50:16 +09:00
Dean Herbert
b5cb59faf2 Add default skin sprites and specular/diffuse layer support 2019-08-20 13:19:32 +09:00
Dean Herbert
caf8354f50
Merge branch 'master' into music-playback-improvements 2019-08-20 11:49:39 +09:00
Andrei Zavatski
415f180261 Delete extra semicolon 2019-08-19 22:53:28 +03:00
Andrei Zavatski
50c47568e4 Don't present Meh hit windows if it has no value 2019-08-19 22:45:27 +03:00
Andrei Zavatski
f1c3a60660 Add ability to select side 2019-08-19 22:04:27 +03:00
Andrei Zavatski
1bff103d32 CI fixes 2019-08-19 21:25:14 +03:00
Andrei Zavatski
6d3aa0520b Make HitErrorDisplay an abstract class 2019-08-19 20:44:06 +03:00
Andrei Zavatski
70084b5553 Move HitErrorDisplay outside of the HUD 2019-08-19 20:28:03 +03:00
Andrei Zavatski
f70a7abea3 Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-19 19:36:28 +03:00
Andrei Zavatski
6b8fbf0eb1 Change link format back
Due to unavaliability to handle round brackets
2019-08-19 17:59:55 +03:00
Andrei Zavatski
daeefc449c Use another link format to avoid representation issues 2019-08-19 17:49:53 +03:00
Desconocidosmh
b3556403aa Make GetNextObject() a virtual method 2019-08-19 16:18:25 +02:00
Andrei Zavatski
fd21e06389 Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-19 17:16:50 +03:00
Dean Herbert
d0766fa1cd Add slider ball animation support 2019-08-19 19:55:47 +09:00
Dean Herbert
539a27a557 Refactor texture lookup code 2019-08-19 19:23:54 +09:00
Dean Herbert
d02b8d14f7 Avoid unnecessary texture retrieval for non-animated sprites 2019-08-19 17:47:59 +09:00
Dean Herbert
d224405bc6 Rename const and make more available 2019-08-19 17:46:05 +09:00
Dean Herbert
4356f2ef9f Add sample usage of looping skinnable 2019-08-19 17:45:54 +09:00
Dean Herbert
9ea4921e2b
Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip
Add tooltips to difficulty icons with extra details
2019-08-19 17:23:13 +09:00
Dan Balasescu
18ee2f5e99
Merge branch 'master' into centre-beatmap-panels 2019-08-19 13:27:40 +09:00
Dean Herbert
be51fde292 Centre beatmap panels in profile overlay 2019-08-19 13:22:32 +09:00
Dan Balasescu
9c069f6f22
Merge branch 'master' into unpause-on-selection-change 2019-08-19 13:15:46 +09:00
Dan Balasescu
01df3c982a
Merge branch 'master' into fix-tooltips-not-displaying 2019-08-19 12:51:06 +09:00
Ganendra Afrasya
7143497441 Match up tooltip background color with OsuTooltipContainer 2019-08-19 10:32:01 +07:00
Dan Balasescu
0f9c47686f
Merge branch 'master' into difficulty-icon-tooltip 2019-08-19 12:21:23 +09:00
Dan Balasescu
f20085df54
Merge branch 'master' into refactor-difficulty-colours 2019-08-19 11:39:19 +09:00
Dean Herbert
1f00793891 Unpause music when changing selection at song select 2019-08-19 11:30:04 +09:00
Dean Herbert
a51fbfa31b Fix osu! default tooltips not displaying 2019-08-19 10:46:28 +09:00
Andrei Zavatski
015406f4d2 Fix link parser 2019-08-18 22:02:59 +03:00
Andrei Zavatski
4c9b621f43 Fix some user links can't be opened inside the game 2019-08-18 22:01:36 +03:00
Andrei Zavatski
be97804180 Implement text formatting 2019-08-18 21:28:07 +03:00
Andrei Zavatski
2393bbc69b Expand APIKudosuHistory 2019-08-18 21:27:53 +03:00
Lucas A
3fcd786198 Take lease on WorkingBeatmap during intro screens to prevent weird interactions with Playback control. 2019-08-18 19:32:56 +02:00
Andrei Zavatski
550dcee60d Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info 2019-08-18 17:14:34 +03:00
Andrei Zavatski
4c817b18b7 Use direct cast 2019-08-18 17:03:11 +03:00
Andrei Zavatski
dd6351b8ca Apply suggested changes 2019-08-18 16:51:16 +03:00
Andrei Zavatski
6c60db550f Fix crash if ruleset has no Meh hit windows 2019-08-18 16:24:13 +03:00
Andrei Zavatski
55cd1cecdf Add missing blank line 2019-08-18 15:53:42 +03:00
Andrei Zavatski
8740ebd13f Simplify layout 2019-08-18 15:45:18 +03:00
Andrei Zavatski
a59a14c9e6 Add setting to enable/disable hit error visibility 2019-08-18 15:01:04 +03:00
Andrei Zavatski
ee5568e596 Use Queue instead of List for stored Judgements 2019-08-18 14:43:34 +03:00
Andrei Zavatski
50133ba863 naming adjustments 2019-08-18 02:57:12 +03:00
Andrei Zavatski
906984ad95 Fix the math 2019-08-18 02:49:07 +03:00
Andrei Zavatski
f7024b513e Visual improvements 2019-08-18 01:43:43 +03:00
Andrei Zavatski
94dbd6386f Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar 2019-08-18 01:14:27 +03:00
Dean Herbert
ecc04baf14 Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip 2019-08-17 15:35:28 +09:00
Dean Herbert
87dc6499fa Fix json decoding being a bit too eager to consume 2019-08-17 15:34:02 +09:00
Dean Herbert
097763bb1c Add auto size duration 2019-08-17 15:29:39 +09:00
Dean Herbert
50046d5f69 Use new tooltip style 2019-08-17 15:20:27 +09:00
Dean Herbert
3dc81bdad5 Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip 2019-08-17 15:19:46 +09:00
Dean Herbert
4fa9abeece Replace DifficultyColouredContainer with a more scalable solution 2019-08-17 15:16:24 +09:00
Dean Herbert
f552de6ebc
Merge branch 'master' into difficulty-icon-tooltip 2019-08-17 13:45:20 +09:00
Salman Ahmed
7bbacb6ba1
Merge branch 'master' into add-adjustment-function-for-skinnable-sound 2019-08-17 02:48:30 +03:00
Dean Herbert
0484caf430
Merge branch 'master' into animated-legacy-skins 2019-08-16 21:12:59 +09:00
Dean Herbert
8258c4a80a
Merge pull request #5734 from smoogipoo/non-frame-stable-editor
Disable frame-stable playback in the editor

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-08-16 21:12:25 +09:00
Dean Herbert
152df9f3d5 Remove accidental blank line 2019-08-16 20:23:09 +09:00
Dean Herbert
d11b896148 Move FrameStablePlayback handling to early return 2019-08-16 20:21:00 +09:00
Dean Herbert
58d2268b9e Combine conditionals that provide the same behaviour 2019-08-16 19:52:35 +09:00
Dean Herbert
132d51a2cc Update tooltip implementation 2019-08-16 19:47:35 +09:00
Dean Herbert
536e7d8757 Update framework 2019-08-16 19:32:17 +09:00
Dean Herbert
d771c271a3 Merge remote-tracking branch 'upstream/master' into fix-checkbox-sounds 2019-08-16 19:32:01 +09:00
Dan Balasescu
059d90bc42
Merge branch 'master' into reduce-hold-to-confirm-delay 2019-08-16 14:00:43 +09:00
Dean Herbert
d732d276b1 Make activation delay customisable 2019-08-16 13:21:41 +09:00
Dean Herbert
b57298406f Fix right click blocking not resetting correctly 2019-08-15 19:25:33 +09:00
Dean Herbert
fc05cab050 Merge remote-tracking branch 'upstream/master' into fix-song-select-context-menus 2019-08-15 18:27:49 +09:00
Dean Herbert
0f4bada21e Fix right click absolute scrolling interfering with context menus 2019-08-15 18:27:45 +09:00
smoogipoo
8c67f58e2d Disable frame-stable playback in the editor 2019-08-15 18:25:31 +09:00
Dean Herbert
ef5ed915e5 Reduce delay for hold-to-confirm controls 2019-08-15 17:14:00 +09:00
Dean Herbert
8f63887972 Make use of existing null check 2019-08-15 14:38:49 +09:00
Dean Herbert
9e13a6aeae Fix newlines being considered in user profile content 2019-08-15 14:38:04 +09:00
Dean Herbert
f7a92487ef Fix checkbox sounds playing too often 2019-08-15 14:09:30 +09:00
Dean Herbert
e73a9c2748 Fix song select context menus displaying off-screen 2019-08-15 14:06:29 +09:00
Dean Herbert
f355cff8bc Apply reviews 2019-08-15 12:11:54 +09:00
Dean Herbert
7e74953784 Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip 2019-08-15 11:54:59 +09:00
iiSaLMaN
cfa569b226 Add looping field and fix build 2019-08-15 05:35:47 +03:00
iiSaLMaN
07e7e1187c Add adjustment function in SkinnableSound 2019-08-15 05:30:35 +03:00
dependabot-preview[bot]
3379672a43
Bump ppy.osu.Framework from 2019.813.0 to 2019.814.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.813.0 to 2019.814.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.813.0...2019.814.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-14 12:17:17 +00:00
smoogipoo
3a79a4149a Disable music controls when beatmap is disabled 2019-08-14 15:19:21 +09:00
Dean Herbert
52f42ddade Use child instead of children 2019-08-14 10:53:47 +09:00
Dean Herbert
b6bc84af2c Fix chat context menus displaying out-of-bounds 2019-08-14 10:52:26 +09:00
Dean Herbert
5886420a5d
Merge branch 'master' into back-button-part-2 2019-08-13 21:38:31 +09:00
Dean Herbert
8ce2c876bf
Merge branch 'master' into multi-room-update 2019-08-13 21:03:03 +09:00
Dean Herbert
5963f7d914 Update comment 2019-08-13 19:52:40 +09:00
Dean Herbert
ea18a8dd12
Merge branch 'master' into music-controller-hotkeys 2019-08-13 19:08:52 +09:00
smoogipoo
e356cc8d9e Refactor MatchBeatmapPanel for thread safety 2019-08-13 17:57:16 +09:00
dependabot-preview[bot]
f2e596de16
Bump ppy.osu.Framework from 2019.809.0 to 2019.813.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.809.0 to 2019.813.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.809.0...2019.813.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-13 08:54:17 +00:00
smoogipoo
7c9c9f1ce1 Simplify caching 2019-08-13 17:38:21 +09:00
smoogipoo
92c2dafa12 Tighten accessibility 2019-08-13 17:34:16 +09:00
smoogipoo
6b57c9801d Cull some unnecessary whitespace 2019-08-13 17:32:43 +09:00
smoogipoo
2b155e5407 Merge remote-tracking branch 'origin/master' into multi-room-update 2019-08-13 17:03:44 +09:00
Dan Balasescu
77fca7b04a
Merge branch 'master' into split-out-music-controller 2019-08-13 17:03:15 +09:00
Dean Herbert
4948e7d31c
Merge branch 'master' into split-out-music-controller 2019-08-13 16:43:56 +09:00
Dan Balasescu
f6e1df8952
Merge branch 'master' into triangles 2019-08-13 16:34:08 +09:00
Dean Herbert
6a70849acb Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 15:08:33 +09:00
Dean Herbert
b942192e00 Fix remaining nullref 2019-08-13 15:04:04 +09:00
Dean Herbert
81f8b5f325 Fix merge issue 2019-08-13 14:52:51 +09:00
Dean Herbert
5898198da6 Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:48:14 +09:00
Dean Herbert
2cbdf8c01c Update public methods in line with future usage 2019-08-13 14:46:57 +09:00
Dean Herbert
de1ab56a2c Fix potential nullref on disposal 2019-08-13 14:45:27 +09:00
Dean Herbert
9aac5efa4e Move logic out of OsuGame 2019-08-13 14:42:59 +09:00
Dean Herbert
8d23cda51a Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:33:35 +09:00
Dean Herbert
ad24265730 Split visual component out of MusicController 2019-08-13 14:30:18 +09:00
Dan Balasescu
9c43021c28
Merge branch 'master' into previous-usernames 2019-08-13 14:21:44 +09:00
smoogipoo
8d3f2f7645 Drop container from name 2019-08-13 14:09:10 +09:00
smoogipoo
5681d1097c Move into components namespace 2019-08-13 14:07:40 +09:00
Dean Herbert
5dbde38a6b Group key bindings together 2019-08-13 12:40:20 +09:00
David Zhao
4a28bdd384 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-08-13 12:26:12 +09:00
Dean Herbert
f3380c9372 Remove "jukebox" terminology 2019-08-13 12:06:57 +09:00
Dean Herbert
6328fd9363 Merge remote-tracking branch 'upstream/master' into music-controller-hotkeys 2019-08-13 11:57:18 +09:00
Dean Herbert
4ccac60337 Merge remote-tracking branch 'upstream/master' into refactor-osd 2019-08-13 11:35:54 +09:00
Dean Herbert
5447e7cf22 Fix file ordering 2019-08-13 11:34:45 +09:00
Dean Herbert
bc49164cc1
Merge branch 'master' into animated-legacy-skins 2019-08-13 00:40:20 +09:00
Dean Herbert
433b701df3 Make line slightly thicker (to display better at low resolutions)
Also tidies up code.
2019-08-13 00:21:52 +09:00
Dean Herbert
a7ae0e6677 Merge remote-tracking branch 'upstream/master' into beatmap-scope-selector 2019-08-13 00:16:53 +09:00
Dean Herbert
c0f0fbbaa9 Rename variable and add xmldoc 2019-08-13 00:14:37 +09:00
iiSaLMaN
883102ee5d Move score multiplier logic inside score calculation 2019-08-12 16:40:52 +03:00
Andrei Zavatski
9c36cb4af4 Use existing AccentColour logic instead of weird BoxColour 2019-08-12 14:33:30 +03:00
Andrei Zavatski
ba49a4c2da Use existing PageTabControl for layout 2019-08-12 13:16:57 +03:00
Lucas A
6533f114d4 Apply review suggestions 2019-08-12 12:09:09 +02:00
Andrei Zavatski
fc521ac93b Expose BoxColour property 2019-08-12 13:08:15 +03:00
Andrei Zavatski
144d41f143 Add ability to not add all the items if enum 2019-08-12 12:33:01 +03:00
Andrei Zavatski
2bbac7cdfc Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-scope-selector 2019-08-12 12:18:32 +03:00
Lucas A
9c15024014 Reword and add missing xmldoc to OnScreenDisplay 2019-08-12 10:53:06 +02:00
dependabot-preview[bot]
1bbd0ca54e
Bump ppy.osu.Game.Resources from 2019.731.1 to 2019.809.0
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.731.1 to 2019.809.0.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.731.1...2019.809.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-12 08:30:26 +00:00
Andrei Zavatski
982066dfdf Convert to method group 2019-08-12 10:38:34 +03:00
Dean Herbert
75cb0d093b Use description correctly
Required for localisation
2019-08-12 16:10:48 +09:00
Andrei Zavatski
cb910a6518 Replace if/else statement 2019-08-12 10:02:45 +03:00
Andrei Zavatski
5b68a2f34a Rename trackManager to previewTrackManager 2019-08-12 09:50:49 +03:00
Dean Herbert
a83afd00b5
Merge branch 'master' into beatmap-scope-selector 2019-08-12 15:48:53 +09:00
Andrei Zavatski
520924b440 Don't create a new request if onlineId is null 2019-08-12 09:45:21 +03:00
Andrei Zavatski
6095480a54 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-12 09:36:15 +03:00
Dean Herbert
d0f2d22995
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim 2019-08-12 05:46:15 +09:00
Dean Herbert
ea4a97ebd9
Merge branch 'master' into refactor-osd 2019-08-12 02:27:02 +09:00
Dean Herbert
9ac4870a21
Merge branch 'master' into triangles 2019-08-12 02:24:45 +09:00
Lucas A
e4eed83d85 Add dual bindings for Jukebox hotkeys 2019-08-11 19:14:49 +02:00
Dean Herbert
359261d4a4 Fix game not starting if intro music is disabled 2019-08-12 02:04:06 +09:00
Dean Herbert
ff4b271f64 Add extra quotations around output 2019-08-12 01:42:05 +09:00
Dean Herbert
ce62f6b56e ToString should never return null 2019-08-12 01:40:11 +09:00
Andrei Zavatski
e7964c165f Make judgement lines alive for a bit longer 2019-08-11 19:09:50 +03:00
Andrei Zavatski
3136d46c7f Do not generate new judgement line on miss 2019-08-11 19:04:56 +03:00
Andrei Zavatski
5e0ac28ca8 Add basic colours 2019-08-11 18:30:03 +03:00
Andrei Zavatski
177a317a48 rename AccuracyBar to HitErrorDisplay 2019-08-11 18:11:49 +03:00
Andrei Zavatski
2a35c3c3e2 Calculate real position for judgement lines 2019-08-11 18:04:54 +03:00
Unknown
cc4ee2df05 add ToString() override to Beatmap class 2019-08-11 16:41:56 +02:00
Andrei Zavatski
0a255fe4d1 Add moving arrow 2019-08-11 16:38:03 +03:00
Andrei Zavatski
ed409d113b Add judgement lines generator 2019-08-11 15:53:15 +03:00
Andrei Zavatski
fd334e0319 Implement basic layout for AccuracyBar 2019-08-11 14:57:21 +03:00
Dean Herbert
684c37bf05 Rename class to better match usage 2019-08-11 16:19:40 +09:00
Dean Herbert
c2e2c1e67e
Merge branch 'master' into refactor-osd 2019-08-11 13:13:12 +09:00
Lucas A
7825923cb6 Use media keys as default bindings for jukebox. 2019-08-10 16:33:16 +02:00
Lucas A
fdf76be967 Merge branch 'master' into music-controller-hotkeys 2019-08-10 16:29:02 +02:00
Lucas A
8c630b4f4c Merge branch 'refactor-osd' into music-controller-hotkeys 2019-08-10 16:25:59 +02:00
Lucas A
d55f9404da Fix CI issues 2019-08-10 14:23:37 +02:00
Lucas A
8eb3409a64 Add missing licence header 2019-08-10 14:03:44 +02:00
Lucas A
b0a7177987 Add ScreenTitleIcon class, used for displaying custom specific icons on overlays. 2019-08-10 13:26:19 +02:00
Lucas A
fc4c0cc2e7 Fix visual discrepancies with master 2019-08-10 10:52:37 +02:00
Dean Herbert
caf13ae52d Update framework 2019-08-09 23:29:32 +09:00
Dean Herbert
8e6a3162ab Update resources 2019-08-09 20:05:36 +09:00
Dean Herbert
cb0cd7ed58 Add triangles intro 2019-08-09 20:05:28 +09:00
Dean Herbert
90b1fe81f3 Update cached usage in line with framework changes 2019-08-09 19:12:29 +09:00
Andrei Zavatski
093359c13b fix incorrect json property 2019-08-09 11:19:14 +03:00
Andrei Zavatski
cf2a9db8e0 Implement basic layout for kudosu history 2019-08-09 11:14:38 +03:00
Andrei Zavatski
5073bce2dc Basic request implementation 2019-08-09 10:47:52 +03:00
smoogipoo
5486c77362 Remove explicit autosize 2019-08-09 15:25:42 +09:00
Dean Herbert
29870c773c
Merge branch 'master' into stop-counting-to-score-after-fail 2019-08-09 14:16:34 +09:00
smoogipoo
a9c4b5ac4e Add tests 2019-08-09 14:04:56 +09:00
smoogipoo
33f4b628a5 Make HasFailed private set 2019-08-09 13:42:02 +09:00
smoogipoo
88fa06efba Refactor as proposed 2019-08-09 13:38:04 +09:00
dependabot-preview[bot]
ca33efead4
Bump ppy.osu.Game.Resources from 2019.702.0 to 2019.731.1
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources) from 2019.702.0 to 2019.731.1.
- [Release notes](https://github.com/ppy/osu-resources/releases)
- [Commits](https://github.com/ppy/osu-resources/compare/2019.702.0...2019.731.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-09 03:58:06 +00:00
Dean Herbert
dbb3b583cf
Log error for invalid beatmap/storyboard events instead of thro… (#5611)
Log error for invalid beatmap/storyboard events instead of throwing

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-08-09 12:56:47 +09:00
Dean Herbert
7e9c100c9b Apply new resharper refactors 2019-08-09 12:29:33 +09:00
iiSaLMaN
565034e658 Remove unnecessary using directive 2019-08-08 22:14:51 +03:00
iiSaLMaN
0fcc6c1676 Add DimLevel property 2019-08-08 22:13:48 +03:00
Dean Herbert
c02d83e72a
Merge branch 'master' into fix-async-score-imports 2019-08-08 23:34:31 +09:00
iiSaLMaN
a3d90da7d4 Remove unnecessary check 2019-08-08 17:29:52 +03:00
iiSaLMaN
bedb744a2e Add parentheses 2019-08-08 17:11:26 +03:00
iiSaLMaN
88b9942b2a Move EnableUserDim check to defualt value of ShowDimContent 2019-08-08 17:07:06 +03:00
iiSaLMaN
566d874641 Prevent failing when reverting to a hasFailedAtJudgement 2019-08-08 15:25:07 +03:00
Dan Balasescu
bb90a273ac
Merge branch 'master' into system-user-color 2019-08-08 19:02:24 +09:00
smoogipoo
3ebfa0505c Don't share single scheduler across all model managers 2019-08-08 18:26:07 +09:00
Andrei Zavatski
9ab132520c Testcase improvements 2019-08-08 12:25:46 +03:00
Andrei Zavatski
e9b5c91690 Fade out existing panel on beatmap change 2019-08-08 12:08:51 +03:00
Andrei Zavatski
08a92c38d7 adjust naming 2019-08-08 12:04:44 +03:00
Andrei Zavatski
1b559c1585 Use async loading 2019-08-08 12:01:33 +03:00
Andrei Zavatski
0ec45e2a8b Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-08 11:54:11 +03:00
Dan Balasescu
0cd6ba2950
Merge branch 'master' into score-processor-xmldoc 2019-08-08 17:32:14 +09:00
Dean Herbert
a3dbaef4ca Adjust background gradient 2019-08-08 17:29:50 +09:00
Dean Herbert
a76d3f1218
Add chat /join command (#5602)
Add chat /join command
2019-08-08 17:11:44 +09:00
Dean Herbert
6d5a7041fd Move system user colour assignment to ensure consistency 2019-08-08 17:10:06 +09:00
Max Hübner
0bed3bfece formatting inspection 2 2019-08-08 09:02:09 +02:00
Max Hübner
bcd443a3aa remove /j 2019-08-08 08:56:52 +02:00
Andrei Zavatski
8668bce25d Fix preview can be played on start 2019-08-08 09:52:42 +03:00
Andrei Zavatski
cbcdc28900 Fix hard crash when clicking on a preview button 2019-08-08 09:04:24 +03:00
Andrei Zavatski
f5cd0eae48 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-08 09:04:06 +03:00
smoogipoo
de4ad1f625 Fix bad log message 2019-08-08 14:44:49 +09:00
smoogipoo
ac2060f1cf Throw exceptions and let LegacyDecoder handle them 2019-08-08 14:44:04 +09:00
Dan Balasescu
54ee0cabd8
Merge branch 'master' into beatmap-events 2019-08-08 14:25:41 +09:00
Dean Herbert
2172c5a52b
Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 14:24:52 +09:00
Dean Herbert
a345955f45 Add mentions linking ScoreProcessor apply/revert methods together 2019-08-08 13:57:04 +09:00
Andrei Zavatski
4a38c4f9d1 Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update 2019-08-08 07:36:53 +03:00
Dean Herbert
f774c46f57
Remove linq usage in BreakOverlay update (#5641)
Remove linq usage in BreakOverlay update
2019-08-08 13:33:23 +09:00
Joehu
77df6a0cb7 Remove unused direct placeholder screen 2019-08-07 21:16:36 -07:00
Andrei Zavatski
a4459972b6 Remove ViewBeatmapButton 2019-08-08 07:15:30 +03:00
Andrei Zavatski
ffed642929 Implement MatchBeatmapPanel 2019-08-08 07:08:51 +03:00
Dean Herbert
7d42561da9 Remove linq usage in BreakOverlay update 2019-08-08 12:58:20 +09:00
Salman Ahmed
3f9f9e7bc9
Merge branch 'master' into use-bindable-break-time-in-player 2019-08-08 05:36:45 +03:00
Dean Herbert
99f5ca07ce Remove redundant comment 2019-08-08 10:42:54 +09:00
Dean Herbert
40a33b3382 Move IsLoaded check to more correct place 2019-08-08 10:41:23 +09:00
Dean Herbert
a2e3ab6463
Merge branch 'master' into add-bindable-for-break-times 2019-08-08 10:13:14 +09:00
iiSaLMaN
d5b26b86da Fix storyboard not showing on disabled user dim 2019-08-07 22:18:10 +03:00
iiSaLMaN
c77e6074f6 Disallow adding to score after the player has failed 2019-08-07 19:58:26 +03:00
iiSaLMaN
ba269a49ee Expose break fade duration and add it in the calculation 2019-08-07 16:59:35 +03:00
iiSaLMaN
d3657d82cd Simplify final check for break time 2019-08-07 16:28:16 +03:00
iiSaLMaN
c2b3c28c79 Use IsBreakTime for checking if currently in a break
Rather than iterating over all breaks to find which is in current time
2019-08-07 16:15:53 +03:00
Dean Herbert
ab252b27d5
Merge branch 'master' into update-framework 2019-08-07 21:27:02 +09:00
Dan Balasescu
1454c1320f
Merge branch 'master' into fix-cursor-scale 2019-08-07 20:05:24 +09:00
Dean Herbert
754fbf3acf
Merge branch 'master' into update-framework 2019-08-07 19:58:37 +09:00
Dean Herbert
2ab2889027 Update framework 2019-08-07 19:56:17 +09:00
David Zhao
bde89adcb7 show exception message 2019-08-07 19:45:29 +09:00
Dan Balasescu
df784e1d8e
Merge branch 'master' into mod-icon-improvements 2019-08-07 19:43:52 +09:00
David Zhao
b8ccba02f2 Log to runtime instead 2019-08-07 19:33:54 +09:00
David Zhao
15a592e25e Just assert doesn't throw and don't catch at LegacyDecoder 2019-08-07 19:25:40 +09:00
Dean Herbert
ec13143ab3 Add further xmldoc 2019-08-07 18:45:56 +09:00
David Zhao
da15e19912 return on storyboard side 2019-08-07 18:40:58 +09:00
Dan Balasescu
18ac5b31a1
Merge branch 'master' into move-quadbatch-local 2019-08-07 18:01:56 +09:00
Dean Herbert
b0e0659715 Dispose instead 2019-08-07 17:33:30 +09:00
David Zhao
7bcec31ea3 mention that the event was the type 2019-08-07 17:08:41 +09:00
Dean Herbert
c6d481238d Move QuadBatch to a local variable to stop resharper complaining 2019-08-07 16:56:22 +09:00
David Zhao
669c2462ec Don't consider the type 2019-08-07 16:25:38 +09:00
Andrei Zavatski
67e009b000 Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded 2019-08-07 09:08:58 +03:00
David Zhao
cf9a5baafa Explicity dispose osuGame instances 2019-08-07 14:51:24 +09:00
Andrei Zavatski
1d42f0959a ModIcon improvements 2019-08-07 08:46:27 +03:00
Andrei Zavatski
b064df91a7 Initial implementation 2019-08-07 08:33:55 +03:00
Andrei Zavatski
b9384d7a53 Remove unnecessary null check 2019-08-07 07:00:50 +03:00
Andrei Zavatski
2c9ce4335c Merge remote-tracking branch 'refs/remotes/ppy/master' into fix-scores-loading 2019-08-07 06:59:26 +03:00
Andrei Zavatski
b1c78c43f3 Simplify target string 2019-08-07 06:57:46 +03:00
Andrei Zavatski
2e3deb46d5 Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded 2019-08-07 06:51:11 +03:00
Andrei Zavatski
24f9872315 Fix unnecessary scores loading 2019-08-07 06:45:39 +03:00
Dean Herbert
6ed9c983ff Rename shear variable 2019-08-07 12:36:00 +09:00
Andrei Zavatski
c16e84e5e6 Fix unability to get local user with specific ruleset 2019-08-07 06:35:57 +03:00
Dean Herbert
f2861c0c7d Merge remote-tracking branch 'upstream/master' into fix-back-button-hover-sounds 2019-08-07 12:34:30 +09:00
Andrei Zavatski
2d0f555048 Merge remote-tracking branch 'refs/remotes/ppy/master' into requests-expanded 2019-08-07 06:33:54 +03:00