h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-20 07:32:55 +08:00
Code Issues Releases Wiki Activity
22,028 Commits 3 Branches 657 Tags 366 MiB
647433a8d1
Commit Graph

13988 Commits

Author SHA1 Message Date
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
Andrei Zavatski
3227dc87fb Don't use CancelDelayedTasks to avoid cancelling unwanted tasks 2019-09-06 22:56:46 +03:00
Andrei Zavatski
157502339e Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-sorting 2019-09-06 22:30:10 +03: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
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