1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 06:52:55 +08:00
Commit Graph

28552 Commits

Author SHA1 Message Date
Craftplacer
8446fa98b5 Merge remote-tracking branch 'upstream/master' into taiko-don 2020-04-22 15:21:54 +02:00
Craftplacer
617d27ace9 Restart branch 2020-04-22 15:19:29 +02:00
Dan Balasescu
e91018bce2
Merge pull request #8830 from iiSaLMaN/replace-catcher-construction-with-static-calculation-methods
Add static internal catcher calculation methods for CatchDifficultyCalculator
2020-04-22 19:15:31 +09:00
Dan Balasescu
402fba131b
Merge branch 'master' into replace-catcher-construction-with-static-calculation-methods 2020-04-22 18:29:16 +09:00
Salman Ahmed
883788dd5a
Privatize externally-unused methods 2020-04-22 07:37:49 +03:00
Salman Ahmed
fccb30e031
Adjust documents
*whoops*
2020-04-22 07:36:59 +03:00
Salman Ahmed
f841eb7e06
Replace constructing a whole Catcher with static calculation methods 2020-04-22 07:27:15 +03:00
Dean Herbert
aaa0f908d5
Merge pull request #8818 from smoogipoo/fix-beatmap-encoder
Fix beatmap encoder by enabling untested test cases
2020-04-22 13:03:56 +09:00
Dean Herbert
e035a493c8
Merge pull request #8607 from Game4all/rulesetstore-ruleset-dir
Load user rulesets from the game data directory
2020-04-22 11:42:09 +09:00
smoogipoo
07a73ba83c Merge branch 'master' into rulesetstore-ruleset-dir 2020-04-22 10:23:04 +09:00
Dan Balasescu
8ebe50c779
Merge pull request #8828 from peppy/fix-empty-version-brackets-string
Fix beatmap string output having empty brackets when pieces are missing
2020-04-22 10:20:28 +09:00
Dean Herbert
360c9f8e38 Add test coverage and handle null creator 2020-04-22 09:19:34 +09:00
Dean Herbert
0c74f1aaa9 Fix now playing output showing empty brackets when no difficulty specified 2020-04-22 09:08:33 +09:00
smoogipoo
d27ca725f9 Use IEnumerable<T> instead 2020-04-22 09:04:44 +09:00
smoogipoo
516e6a4bb1 Fix overlapping control points not written correctly 2020-04-22 09:04:44 +09:00
smoogipoo
1421e876b1 Remove implicit new combo from spinners 2020-04-22 09:04:44 +09:00
smoogipoo
d8d85e5b08 Don't output certain properties if they don't exist 2020-04-22 09:04:44 +09:00
smoogipoo
3093c3e185 Fix custom sample set not being written correctly 2020-04-22 09:04:44 +09:00
smoogipoo
a702a521f8 Fix not being able to serialise converted beatmaps 2020-04-22 09:04:44 +09:00
smoogipoo
21949ac499 Add osu! test beatmap 2020-04-22 09:04:44 +09:00
smoogipoo
1e7e7417ed Fix testing relying on control point order 2020-04-22 09:04:44 +09:00
smoogipoo
8ea76244a2 Fix only single beatmap being tested 2020-04-22 09:04:44 +09:00
smoogipoo
9713d90388 Always apply beatmap converter/processor 2020-04-22 09:04:44 +09:00
smoogipoo
e9a2e92adf Fix incorrect beatmap comments 2020-04-22 09:04:44 +09:00
Dean Herbert
01a5e401d4
Merge pull request #8825 from peppy/update-framework
Update framework
2020-04-21 21:43:51 +09:00
Dean Herbert
6193b80589 Update framework 2020-04-21 21:20:57 +09:00
Dean Herbert
231a2b9f81
Merge pull request #8821 from peppy/replace-direct-overlay
Replace direct overlay with new beatmaplisting overlay
2020-04-21 21:19:33 +09:00
Dean Herbert
ed9663985b Rename panels 2020-04-21 20:55:33 +09:00
Dan Balasescu
5f60071541
Merge pull request #8820 from peppy/fix-beatmap-listing-focus
Fix BeatmapListingOverlay not taking focus
2020-04-21 20:27:28 +09:00
Dan Balasescu
813a4d6494
Merge pull request #8819 from peppy/fix-relax-replays
Fix relax replays playing back incorrectly
2020-04-21 20:20:14 +09:00
Dan Balasescu
986fa4416b
Merge pull request #8824 from peppy/taiko-hittarget-skinning
Add support for taiko hit target skinning
2020-04-21 20:10:24 +09:00
Dan Balasescu
6e68728ade
Merge branch 'master' into fix-beatmap-listing-focus 2020-04-21 20:05:13 +09:00
Dan Balasescu
e19a56764b
Merge branch 'master' into fix-relax-replays 2020-04-21 19:51:48 +09:00
Dean Herbert
bfc17bf4c0 Add taiko hit target skinning 2020-04-21 19:06:43 +09:00
Dean Herbert
e74f902483 Add playfield test scene 2020-04-21 18:40:18 +09:00
Dean Herbert
d1c701a997 Rename existing test to something more relevant 2020-04-21 18:34:56 +09:00
Dean Herbert
7662cdd3c6
Merge pull request #8822 from smoogipoo/columnlinewidth-skinning
Implement ColumnLineWidth skinning
2020-04-21 17:45:43 +09:00
smoogipoo
4642a6093c Add test 2020-04-21 17:15:13 +09:00
smoogipoo
a41ac50e2f Line widths should not receive scale factor 2020-04-21 17:15:06 +09:00
smoogipoo
0a2b585c65 Apply missing scale 2020-04-21 17:14:49 +09:00
smoogipoo
b8a1831d98 Read line widths from skin 2020-04-21 17:14:04 +09:00
Dean Herbert
9b9b710ded Move and rename remaining direct classes 2020-04-21 16:41:07 +09:00
Dean Herbert
1cec0575b7 Remove unused classes and replace overlay in game 2020-04-21 16:38:47 +09:00
Dean Herbert
594cef1473 Fix BeatmapListingOverlay not taking focus 2020-04-21 16:35:24 +09:00
Dean Herbert
c3b36d8f20
Merge pull request #7924 from EVAST9919/beatmap-listing-expanded
Implement sorting by genre and language in BeatmapListingOverlay
2020-04-21 16:34:59 +09:00
Dean Herbert
aa153290a9
Merge pull request #8815 from smoogipoo/fix-controlpoint-decode
Fix control point overriding working incorrectly
2020-04-21 16:18:50 +09:00
Dean Herbert
1f0b7465e2 Add back missing line 2020-04-21 16:06:40 +09:00
Dan Balasescu
b2d766ad2d
Merge pull request #8772 from peppy/fix-select-new-from-sub-screen
Fix carousel not correctly updating when selection changes to a new beatmap from a child screen
2020-04-21 15:52:38 +09:00
Dean Herbert
eeb7612010 Update DirectOverlay implementation 2020-04-21 15:40:10 +09:00
Dean Herbert
c2ed6491a9 Move and shorten enum names 2020-04-21 15:39:15 +09:00