1
0
mirror of https://github.com/ppy/osu.git synced 2024-10-01 23:37:30 +08:00
Commit Graph

22026 Commits

Author SHA1 Message Date
Andrei Zavatski
9a81a44134 Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-sorting 2019-09-19 03:22:53 +03:00
Dean Herbert
3710c7bdc4
Merge pull request #6041 from miterosan/removenotneededandroidnativelibraryitemgroup
Remove unnecessary AndroidNativeLibrary specification
2019-09-19 01:55:36 +09:00
Dean Herbert
52fcd834ab
Bump ppy.osu.Framework.iOS from 2019.911.0 to 2019.918.0 (#6158)
Bump ppy.osu.Framework.iOS from 2019.911.0 to 2019.918.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-09-19 00:50:57 +09:00
dependabot-preview[bot]
5dc5181c90
Bump ppy.osu.Framework.iOS from 2019.911.0 to 2019.918.0
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 15:27:39 +00:00
Dean Herbert
66c28b4c27
Merge pull request #6154 from ppy/dependabot/nuget/ppy.osu.Framework.Android-2019.918.0
Bump ppy.osu.Framework.Android from 2019.911.0 to 2019.918.0
2019-09-18 23:58:15 +09:00
Dean Herbert
bc2c47f8c9
Merge pull request #6155 from ppy/dependabot/nuget/ppy.osu.Framework-2019.918.0
Bump ppy.osu.Framework from 2019.911.0 to 2019.918.0
2019-09-18 23:58:08 +09:00
dependabot-preview[bot]
1d7377df65
Bump ppy.osu.Framework from 2019.911.0 to 2019.918.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 14:51:01 +00:00
dependabot-preview[bot]
646a64792a
Bump ppy.osu.Framework.Android from 2019.911.0 to 2019.918.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 14:36:31 +00:00
Dan Balasescu
096a007e68
Merge pull request #6087 from peppy/key-counter-fixes
Key counter improvements
2019-09-18 18:18:09 +09:00
Dean Herbert
61b396f235
Remove redundant length check 2019-09-18 17:09:43 +09:00
Dean Herbert
e17cd9e964 Reduce length of tests 2019-09-18 16:14:31 +09:00
Dean Herbert
381daffe52 Generate better temporary frames to support framed handling flaws 2019-09-18 16:09:48 +09:00
Dean Herbert
2046f64b22 Revert clamping logic 2019-09-18 16:07:02 +09:00
Dean Herbert
b4a396885d Merge remote-tracking branch 'upstream/master' into key-counter-fixes 2019-09-18 14:08:40 +09:00
Dean Herbert
2db1e236a7 Fix frame count dependent tests regressing 2019-09-18 14:08:09 +09:00
Dan Balasescu
a1db5c32a6
Merge pull request #6146 from peppy/fix-long-combo-test
Fix HitCircleLongCombo test stacking off-screen
2019-09-18 12:52:48 +09:00
Dan Balasescu
834111c488
Merge branch 'master' into fix-long-combo-test 2019-09-18 12:41:43 +09:00
Dean Herbert
38245c5c3b
Move menu cursor rotation to more appropriate settings section (#6142)
Move menu cursor rotation to more appropriate settings section
2019-09-18 11:33:50 +09:00
Dean Herbert
adc2dfa6c6 Fix HitCircleLongCombo test stacking off-screen 2019-09-18 03:00:17 +09:00
Dean Herbert
b5b29a21e7 Move menu cursor rotation to more appropriate settings section 2019-09-18 02:15:18 +09:00
Dean Herbert
ec5f420818
Merge branch 'master' into key-counter-fixes 2019-09-17 22:56:34 +09:00
Dean Herbert
057c4aa795 Remove unused using statement 2019-09-17 22:42:20 +09:00
Dean Herbert
77947e8309 Fix rewind tests failing 2019-09-17 22:33:27 +09:00
Dean Herbert
38d85e44be Merge branch 'master' into key-counter-fixes 2019-09-17 22:33:15 +09:00
Dean Herbert
fd3e2375bb
Fix disclaimer potentially pushing a null screen (#6137)
Fix disclaimer potentially pushing a null screen
2019-09-17 16:39:04 +09:00
Dean Herbert
7af194e5ed
Debounce user-requested replay seeks (#6138)
Debounce user-requested replay seeks
2019-09-17 16:38:29 +09:00
smoogipoo
f0bcb2b933 Debounce user-requested replay seeks 2019-09-17 16:12:18 +09:00
smoogipoo
efedfefe63 Fix disclaimer potentially pushing a null screen 2019-09-17 15:54:11 +09:00
Dean Herbert
e5149b4be9
Fix Perfect/SuddenDeath legacy mod conversion during score impo… (#6128)
Fix Perfect/SuddenDeath legacy mod conversion during score import
2019-09-16 12:22:33 +09:00
Bartłomiej Dach
a407e267a2 Fix PF/SD legacy mod conversion
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.

Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
Dean Herbert
089488b295
Specify Rider analysis rules explicitly (#6127)
Specify Rider analysis rules explicitly
2019-09-16 02:29:59 +09:00
HoLLy-HaCKeR
43760bdfcd Specify Rider analysis rules explicitly 2019-09-15 18:29:14 +02:00
Dean Herbert
52843d95c3
Fix aspect ratio of video not being enforced (#6105)
Fix aspect ratio of video not being enforced

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-16 00:37:44 +09:00
Dean Herbert
2381b4c003 Move video behind storyboard 2019-09-16 00:20:56 +09:00
Dean Herbert
e1de0b0537 Merge remote-tracking branch 'upstream/master' into fix-video-fill-mode 2019-09-16 00:19:30 +09:00
Dean Herbert
fedbac74e4
Wait for cursor hiding using ManualResetEventSlim (#6112)
Wait for cursor hiding using ManualResetEventSlim
2019-09-15 15:00:38 +09:00
Dean Herbert
1f67b222dc
Merge pull request #6116 from EVAST9919/allow-flag-placeholder
Fix DrawableFlag not showing fallback texture if no flag is available
2019-09-15 13:03:41 +09:00
Andrei Zavatski
96453d8197 Remove redundant string interpolation 2019-09-15 02:46:28 +03:00
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
Roman Kapustin
8456861b8d Wait for cursor hiding using ManualResetEventSlim 2019-09-14 17:08:56 +03:00
Dean Herbert
bc2a1c91a1
Merge pull request #6106 from EVAST9919/fix-header-dropdown
Fix RankingsHeader dropdown can be clickable when not visible
2019-09-14 13:45:06 +09: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
ac6fffd834
Recreate beatmap video on each consumption (#6098)
Recreate beatmap video on each consumption
2019-09-14 00:23:38 +09: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
Dan Balasescu
1583cead83
Merge pull request #6097 from peppy/catch-replay-key-trigger-correction
Change osu!catch key trigger to occur on frame before positional change
2019-09-13 23:26:07 +09:00