1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 14:37:30 +08:00
Commit Graph

24139 Commits

Author SHA1 Message Date
Dean Herbert
9f4c8db395 Add xmldoc 2019-12-06 12:17:41 +09:00
Ganendra Afrasya
8be6abf607 Add param to let function return lighter colour for some diff 2019-12-06 10:07:16 +07:00
Dean Herbert
28400aa865 Update test scene 2019-12-06 11:27:24 +09:00
Dean Herbert
12a9843835 Move thickness to a constant 2019-12-06 10:48:18 +09:00
Dean Herbert
e76f8bdd64 Fix warnings 2019-12-05 23:31:21 +09:00
Dean Herbert
d8620a70fb Make work in editor 2019-12-05 20:12:25 +09:00
Dean Herbert
e225b0032a Add basic hitobject display to timeline 2019-12-05 19:31:40 +09:00
Dean Herbert
e213b338ce
Merge pull request #7068 from peppy/update-framework
Update framework
2019-12-05 18:31:34 +09:00
Dean Herbert
2419077c07 Update framework 2019-12-05 18:31:13 +09:00
Ganendra Afrasya
0e97871461 Change colour if difficulty is ExpertPlus 2019-12-05 14:53:01 +07:00
Dean Herbert
aa69038be0
Merge pull request #7063 from peppy/decouple-api-room-scoreinfo
Fix multiplayer aggregate score inheriting from ScoreInfo
2019-12-05 15:11:07 +09:00
Dan Balasescu
36c734c4c2
Merge branch 'master' into decouple-api-room-scoreinfo 2019-12-05 12:43:43 +09:00
Dan Balasescu
1622a537c0
Merge pull request #7064 from peppy/eager-skip-filters
Optimise song select filter application to avoid unnecessary property retrieval
2019-12-05 12:43:32 +09:00
Dan Balasescu
f18519965c
Merge branch 'master' into eager-skip-filters 2019-12-05 12:27:42 +09:00
Dean Herbert
48287459a0 Optimise filters to avoid property retrieval
Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.
2019-12-05 01:52:22 +09:00
Dean Herbert
36224dca13 Fix multiplayer aggregate score inheriting from ScoreInfo 2019-12-05 01:45:28 +09:00
Dean Herbert
5c1305a3e7
Make player block exit if pausable (#6992)
Make player block exit if pausable

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-05 01:39:52 +09:00
Dean Herbert
5b8ca8f84a Remove test ignore rules 2019-12-05 01:17:11 +09:00
Dean Herbert
9ac0ac0944
Merge branch 'master' into fix-pause-testcase 2019-12-05 01:00:27 +09:00
Dean Herbert
bb00b4166e
Implement CatchModRelax (#4756)
Implement CatchModRelax

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-05 00:59:55 +09:00
Dean Herbert
0ea2c55651
Update framework (#7060)
Update framework
2019-12-05 00:49:12 +09:00
Dean Herbert
15ee65b8e9
Merge branch 'master' into ctb-relax 2019-12-04 23:35:55 +09:00
Dean Herbert
0734b52483 Update framework 2019-12-04 23:33:26 +09:00
Dean Herbert
ca1f3417a3
Merge pull request #7046 from smoogipoo/fix-replay-button
Fix replay download button not working
2019-12-04 23:00:40 +09:00
Dan Balasescu
8dbb46d083
Merge pull request #7047 from peppy/decouple-legacy-score-info
Decouple LegacyScoreInfo/APILegacyScoreInfo from ScoreInfo
2019-12-04 12:24:32 +09:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info 2019-12-04 11:47:27 +09:00
Dan Balasescu
5d7c40da6e
Merge pull request #7010 from peppy/add-missing-long-running
Add some more missing LongRunningLoad flags
2019-12-04 11:47:10 +09:00
Dan Balasescu
242e1b0b2e
Merge branch 'master' into add-missing-long-running 2019-12-04 11:29:25 +09:00
Dan Balasescu
5e56e91fe2
Merge pull request #7050 from huoyaoyuan/equals
Remove some remaining untyped boxing calls
2019-12-04 11:27:41 +09:00
Huo Yaoyuan
6a58509f41 Fix format. 2019-12-03 20:59:42 +08:00
Huo Yaoyuan
46c9bdcf62 Replace Convert.ChangeType with IConvertible. 2019-12-03 20:49:41 +08:00
Huo Yaoyuan
9ddfdab27a Remove meaningless Convert calls. 2019-12-03 20:47:00 +08:00
Huo Yaoyuan
5375af7820 Remove other Equals(object) calls. 2019-12-03 20:23:27 +08:00
Huo Yaoyuan
05cfef92f9 Don't compare spans with null. 2019-12-03 20:09:58 +08:00
Huo Yaoyuan
a42f9447e6 Don't use Equals(object) on T?. 2019-12-03 20:07:22 +08:00
Dean Herbert
a225a35f91 Fix failing tests 2019-12-03 16:18:36 +09:00
Dean Herbert
e2591f154b Only parse statistics when not null 2019-12-03 16:16:46 +09:00
Dean Herbert
1ce6a5ceb3 Rename class 2019-12-03 15:38:57 +09:00
Dean Herbert
f0d49d0cdf Decouple APILegacyScoreInfo from ScoreInfo 2019-12-03 15:31:11 +09:00
smoogipoo
aadbbb1af3 Fix replay download button not working 2019-12-03 13:33:42 +09:00
Shane Woolcock
8a6b2e681a
Merge pull request #7041 from recapitalverb/master
Fix spelling in comment on SearchTextBox.OnPressed
2019-12-02 23:53:44 +10:30
recapitalverb
1ec11946c6
Fix spelling in comment on SearchTextBox.OnPressed 2019-12-02 18:45:57 +07:00
Dan Balasescu
149c284ef3
Merge pull request #7040 from peppy/fix-cross-thread-callback
Fix currentTrackCompleted not being run on main thread
2019-12-02 18:48:46 +09:00
Dean Herbert
6893ec22bb Fix currenTrackCompleted not being run on main thread 2019-12-02 18:26:45 +09:00
Dean Herbert
2805ea4c95
Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 2.9.7 to 2.… (#7037)
Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 2.9.7 to 2.9.8

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-12-02 16:40:10 +09:00
dependabot-preview[bot]
59f956bb01
Bump Microsoft.CodeAnalysis.BannedApiAnalyzers from 2.9.7 to 2.9.8
Bumps [Microsoft.CodeAnalysis.BannedApiAnalyzers](https://github.com/dotnet/roslyn-analyzers) from 2.9.7 to 2.9.8.
- [Release notes](https://github.com/dotnet/roslyn-analyzers/releases)
- [Changelog](https://github.com/dotnet/roslyn-analyzers/blob/master/PostReleaseActivities.md)
- [Commits](https://github.com/dotnet/roslyn-analyzers/compare/v2.9.7...v2.9.8)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-02 07:18:54 +00:00
Dan Balasescu
5d4cfd81ec
Merge pull request #7034 from Joehuu/fix-overlays-drag-closing
Fix overlays closing when dragging from in/out or out/in
2019-12-02 14:31:05 +09:00
Dan Balasescu
700fe5162d
Merge branch 'master' into fix-overlays-drag-closing 2019-12-02 14:12:37 +09:00
Dan Balasescu
427122bdd1
Merge pull request #7011 from peppy/hide-mouse-in-playfield
Hide the menu cursor while inside the playfield by default
2019-12-02 14:00:42 +09:00
Dan Balasescu
133c25f4c1
Merge branch 'master' into hide-mouse-in-playfield 2019-12-02 13:29:32 +09:00